You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/09/18 22:40:09 UTC
svn commit: r1524560 - in /manifoldcf/trunk: ./ connectors/sharepoint/
connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/
connectors/sharepoint/wsdls/
Author: kwright
Date: Wed Sep 18 20:40:09 2013
New Revision: 1524560
URL: http://svn.apache.org/r1524560
Log:
Fix CONNECTORS-772 a second time, and in a totally different way.
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/sharepoint/ (props changed)
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
manifoldcf/trunk/connectors/sharepoint/wsdls/DspSts.wsdl
manifoldcf/trunk/connectors/sharepoint/wsdls/Lists.wsdl
manifoldcf/trunk/connectors/sharepoint/wsdls/MCPermissions.wsdl
manifoldcf/trunk/connectors/sharepoint/wsdls/Permissions.wsdl
manifoldcf/trunk/connectors/sharepoint/wsdls/usergroup.wsdl
manifoldcf/trunk/connectors/sharepoint/wsdls/versions.wsdl
manifoldcf/trunk/connectors/sharepoint/wsdls/webs.wsdl
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-772:r1523842-1524559
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1524560&r1=1524559&r2=1524560&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Sep 18 20:40:09 2013
@@ -3,6 +3,13 @@ $Id$
======================= 1.4-dev =====================
+CONNECTORS-772: SharePoint connector wasn't working against
+certain SharePoint instances. The reason was that some paths
+were relative and some absolute. Fixed ALL path management to
+have stronger check logic so bad paths are detected, warned, and
+skipped.
+(Dmitry Goldenberg, Karl Wright)
+
CONNECTORS-775: Use httpclient 4.2.6.
(Karl Wright)
@@ -12,11 +19,6 @@ CONNECTORS-774: Add support for proxies
CONNECTORS-773: Add support for proxies to Jira connectors.
(Karl Wright)
-CONNECTORS-772: SharePoint connector wasn't working against
-AWS SharePoint instances. Added a new AWS pulldown selection
-to deal with the funky configuration there.
-(Dmitry Goldenberg, Karl Wright)
-
CONNECTORS-770: Java7 no longer allows an interface to be
interchangeable with a class. Modified FileNet stub accordingly.
(Yann Barraud, Karl Wright)
Propchange: manifoldcf/trunk/connectors/sharepoint/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-772/connectors/sharepoint:r1523842-1524559
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java?rev=1524560&r1=1524559&r2=1524560&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java Wed Sep 18 20:40:09 2013
@@ -589,21 +589,6 @@ public class SPSProxyHelper {
Object node = nodeDocs.get(j);
Logging.connectors.debug( node.toString() );
String relPath = docs.getData( docs.getElement( node, "FileRef" ) );
-
- // This relative path is apparently from the domain on down; if there's a location offset we therefore
- // need to get rid of it before checking the document against the site/library tuples. The recorded
- // document identifier should also not include it.
-
- if (!relPath.toLowerCase().startsWith(serverLocation.toLowerCase()))
- {
- // Unexpected processing error; the path to the folder or document did not start with the location
- // offset, so throw up.
- throw new ManifoldCFException("Internal error: Relative path '"+relPath+"' was expected to start with '"+
- serverLocation+"'");
- }
-
- relPath = relPath.substring(serverLocation.length());
-
fileStream.addFile( relPath );
}
}
@@ -649,9 +634,6 @@ public class SPSProxyHelper {
{
resultCount++;
String relPath = result.getAttribute("FileRef");
-
- relPath = "/" + relPath;
-
fileStream.addFile( relPath );
}
}
@@ -768,6 +750,7 @@ public class SPSProxyHelper {
}
}
+
/**
*
* @param parentSite
@@ -776,7 +759,7 @@ public class SPSProxyHelper {
* @throws ManifoldCFException
* @throws ServiceInterruption
*/
- public String getDocLibID(String parentSite, String parentSiteDecoded, String docLibrary, boolean fullListPaths)
+ public String getDocLibID(String parentSite, String parentSiteDecoded, String docLibrary)
throws ServiceInterruption, ManifoldCFException
{
long currentTime;
@@ -815,7 +798,7 @@ public class SPSProxyHelper {
nodeList.clear();
doc.processPath(nodeList, "*", parent); // <ns1:Lists>
- int chuckIndex = fullListPaths?decodedServerLocation.length() + parentSiteDecoded.length():0;
+ String prefixPath = decodedServerLocation + parentSiteDecoded + "/";
int i = 0;
while (i < nodeList.size())
@@ -833,22 +816,29 @@ public class SPSProxyHelper {
// If it has no view url, we don't have any idea what to do with it
if (urlPath != null && urlPath.length() > 0)
{
- if (urlPath.length() < chuckIndex)
- throw new ManifoldCFException("Library view url is not in the expected form: '"+urlPath+"'");
- urlPath = urlPath.substring(chuckIndex);
+ // Normalize conditionally
if (!urlPath.startsWith("/"))
- throw new ManifoldCFException("Library view url without site is not in the expected form: '"+urlPath+"'");
- // We're at the library name. Figure out where the end of it is.
- int index = urlPath.indexOf("/",1);
- if (index == -1)
- throw new ManifoldCFException("Bad library view url without site: '"+urlPath+"'");
- String pathpart = urlPath.substring(1,index);
+ urlPath = prefixPath + urlPath;
+ // Get rid of what we don't want, unconditionally
+ if (urlPath.startsWith(prefixPath))
+ {
+ urlPath = urlPath.substring(prefixPath.length());
+ // We're at the library name. Figure out where the end of it is.
+ int index = urlPath.indexOf("/");
+ if (index == -1)
+ throw new ManifoldCFException("Bad library view url without site: '"+urlPath+"'");
+ String pathpart = urlPath.substring(0,index);
- if ( pathpart.equals(docLibrary) )
+ if ( pathpart.equals(docLibrary) )
+ {
+ // We found it!
+ // Return its ID
+ return doc.getValue( o, "ID" );
+ }
+ }
+ else
{
- // We found it!
- // Return its ID
- return doc.getValue( o, "ID" );
+ Logging.connectors.warn("SharePoint: Library view url is not in the expected form: '"+urlPath+"'; it should start with '"+prefixPath+"'; skipping");
}
}
}
@@ -965,7 +955,7 @@ public class SPSProxyHelper {
* @throws ManifoldCFException
* @throws ServiceInterruption
*/
- public String getListID(String parentSite, String parentSiteDecoded, String listName, boolean fullListPaths)
+ public String getListID(String parentSite, String parentSiteDecoded, String listName)
throws ServiceInterruption, ManifoldCFException
{
long currentTime;
@@ -1004,7 +994,7 @@ public class SPSProxyHelper {
nodeList.clear();
doc.processPath(nodeList, "*", parent); // <ns1:Lists>
- int chuckIndex = fullListPaths?decodedServerLocation.length() + parentSiteDecoded.length():0;
+ String prefixPath = decodedServerLocation + parentSiteDecoded + "/";
int i = 0;
while (i < nodeList.size())
@@ -1022,29 +1012,36 @@ public class SPSProxyHelper {
// If it has no view url, we don't have any idea what to do with it
if (urlPath != null && urlPath.length() > 0)
{
- if (urlPath.length() < chuckIndex)
- throw new ManifoldCFException("List view url is not in the expected form: '"+urlPath+"'");
- urlPath = urlPath.substring(chuckIndex);
+ // Normalize conditionally
if (!urlPath.startsWith("/"))
- throw new ManifoldCFException("List view url without site is not in the expected form: '"+urlPath+"'");
- // We're at the /Lists/listname part of the name. Figure out where the end of it is.
- int index = urlPath.indexOf("/",1);
- if (index == -1)
- throw new ManifoldCFException("Bad list view url without site: '"+urlPath+"'");
- String pathpart = urlPath.substring(1,index);
- if("Lists".equals(pathpart))
+ urlPath = prefixPath + urlPath;
+ // Get rid of what we don't want, unconditionally
+ if (urlPath.startsWith(prefixPath))
{
- int k = urlPath.indexOf("/",index+1);
- if (k == -1)
- throw new ManifoldCFException("Bad list view url without 'Lists': '"+urlPath+"'");
- pathpart = urlPath.substring(index+1,k);
- }
+ urlPath = urlPath.substring(prefixPath.length());
+ // We're at the Lists/listname part of the name. Figure out where the end of it is.
+ int index = urlPath.indexOf("/");
+ if (index == -1)
+ throw new ManifoldCFException("Bad list view url without site: '"+urlPath+"'");
+ String pathpart = urlPath.substring(0,index);
+ if("Lists".equals(pathpart))
+ {
+ int k = urlPath.indexOf("/",index+1);
+ if (k == -1)
+ throw new ManifoldCFException("Bad list view url without 'Lists': '"+urlPath+"'");
+ pathpart = urlPath.substring(index+1,k);
+ }
- if ( pathpart.equals(listName) )
+ if ( pathpart.equals(listName) )
+ {
+ // We found it!
+ // Return its ID
+ return doc.getValue( o, "ID" );
+ }
+ }
+ else
{
- // We found it!
- // Return its ID
- return doc.getValue( o, "ID" );
+ Logging.connectors.warn("SharePoint: List view url is not in the expected form: '"+urlPath+"'; expected something beginning with '"+prefixPath+"'; skipping");
}
}
}
@@ -1455,14 +1452,9 @@ public class SPSProxyHelper {
{
// The web service allows us to get acls for a site, so that's what we will attempt
- // This fails:
MCPermissionsWS aclService = new MCPermissionsWS( baseUrl + site, userName, password, configuration, httpClient );
com.microsoft.sharepoint.webpartpages.PermissionsSoap aclCall = aclService.getPermissionsSoapHandler( );
- // This works:
- //PermissionsWS aclService = new PermissionsWS( baseUrl + site, userName, password, myFactory, configuration );
- //com.microsoft.schemas.sharepoint.soap.directory.PermissionsSoap aclCall = aclService.getPermissionsSoapHandler( );
-
aclCall.getPermissionCollection( "/", "Web" );
}
@@ -1499,7 +1491,7 @@ public class SPSProxyHelper {
else if (httpErrorCode.equals("403"))
throw new ManifoldCFException("Http error "+httpErrorCode+" while reading from "+baseUrl+site+" - check IIS and SharePoint security settings! "+e.getMessage(),e);
else if (httpErrorCode.equals("302"))
- throw new ManifoldCFException("ManifoldCF's MCPermissions web service may not be installed on the target SharePoint server. MCPermissions service is needed for SharePoint repositories version 3.0 or higher, to allow access to security information for files and folders. Consult your system administrator.");
+ throw new ManifoldCFException("The correct version of ManifoldCF's MCPermissions web service may not be installed on the target SharePoint server. MCPermissions service is needed for SharePoint repositories version 3.0 or higher, to allow access to security information for files and folders. Consult your system administrator.");
else
throw new ManifoldCFException("Unexpected http error code "+httpErrorCode+" accessing SharePoint at "+baseUrl+site+": "+e.getMessage(),e);
}
@@ -1944,14 +1936,15 @@ public class SPSProxyHelper {
* @param parentSite the site to search for subsites, empty string for root
* @return lists of sites as an arraylist of NameValue objects
*/
- public ArrayList getSites( String parentSite )
+ public List<NameValue> getSites( String parentSite )
throws ManifoldCFException, ServiceInterruption
{
long currentTime;
try
{
- ArrayList result = new ArrayList();
+ ArrayList<NameValue> result = new ArrayList<NameValue>();
+ // Call the webs service
if ( parentSite.equals( "/") ) parentSite = "";
WebsWS webService = new WebsWS( baseUrl + parentSite, userName, password, configuration, httpClient );
WebsSoap webCall = webService.getWebsSoapHandler();
@@ -1986,7 +1979,7 @@ public class SPSProxyHelper {
// Leave here for now
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Subsite list: '"+url+"', '"+title+"'");
-
+
// A full path to the site is tacked on the front of each one of these. However, due to nslookup differences, we cannot guarantee that
// the server name part of the path will actually match what got passed in. Therefore, we want to look only at the last path segment, whatever that is.
if (url != null && url.length() > 0)
@@ -2004,7 +1997,7 @@ public class SPSProxyHelper {
}
}
}
-
+
return result;
}
catch (java.net.MalformedURLException e)
@@ -2068,13 +2061,13 @@ public class SPSProxyHelper {
* @param parentSite the site to search for document libraries, empty string for root
* @return lists of NameValue objects, representing document libraries
*/
- public ArrayList getDocumentLibraries( String parentSite, String parentSiteDecoded, boolean fullListPaths )
+ public List<NameValue> getDocumentLibraries( String parentSite, String parentSiteDecoded )
throws ManifoldCFException, ServiceInterruption
{
long currentTime;
try
{
- ArrayList result = new ArrayList();
+ ArrayList<NameValue> result = new ArrayList<NameValue>();
String parentSiteRequest = parentSite;
@@ -2107,7 +2100,7 @@ public class SPSProxyHelper {
nodeList.clear();
doc.processPath(nodeList, "*", parent); // <ns1:Lists>
- int chuckIndex = fullListPaths?decodedServerLocation.length() + parentSiteDecoded.length():0;
+ String prefixPath = decodedServerLocation + parentSiteDecoded + "/";
int i = 0;
while (i < nodeList.size())
@@ -2131,22 +2124,29 @@ public class SPSProxyHelper {
// It's a library. If it has no view url, we don't have any idea what to do with it
if (urlPath != null && urlPath.length() > 0)
{
- if (urlPath.length() < chuckIndex)
- throw new ManifoldCFException("Library view url is not in the expected form: '"+urlPath+"'");
- urlPath = urlPath.substring(chuckIndex);
+ // Normalize conditionally
if (!urlPath.startsWith("/"))
- throw new ManifoldCFException("Library view url without site is not in the expected form: '"+urlPath+"'");
- // We're at the library name. Figure out where the end of it is.
- int index = urlPath.indexOf("/",1);
- if (index == -1)
- throw new ManifoldCFException("Bad library view url without site: '"+urlPath+"'");
- String pathpart = urlPath.substring(1,index);
+ urlPath = prefixPath + urlPath;
+ // Get rid of what we don't want, unconditionally
+ if (urlPath.startsWith(prefixPath))
+ {
+ urlPath = urlPath.substring(prefixPath.length());
+ // We're at the library name. Figure out where the end of it is.
+ int index = urlPath.indexOf("/");
+ if (index == -1)
+ throw new ManifoldCFException("Bad library view url without site: '"+urlPath+"'");
+ String pathpart = urlPath.substring(0,index);
- if ( pathpart.length() != 0 && !pathpart.equals("_catalogs"))
+ if ( pathpart.length() != 0 && !pathpart.equals("_catalogs"))
+ {
+ if (title == null || title.length() == 0)
+ title = pathpart;
+ result.add( new NameValue(pathpart, title) );
+ }
+ }
+ else
{
- if (title == null || title.length() == 0)
- title = pathpart;
- result.add( new NameValue(pathpart, title) );
+ Logging.connectors.warn("SharePoint: Library view url is not in the expected form: '"+urlPath+"'; expected something beginning with '"+prefixPath+"'; skipping");
}
}
}
@@ -2212,13 +2212,13 @@ public class SPSProxyHelper {
* @param parentSite the site to search for lists, empty string for root
* @return lists of NameValue objects, representing lists
*/
- public ArrayList getLists( String parentSite, String parentSiteDecoded, boolean fullListPaths )
+ public List<NameValue> getLists( String parentSite, String parentSiteDecoded )
throws ManifoldCFException, ServiceInterruption
{
long currentTime;
try
{
- ArrayList result = new ArrayList();
+ ArrayList<NameValue> result = new ArrayList<NameValue>();
String parentSiteRequest = parentSite;
@@ -2251,7 +2251,7 @@ public class SPSProxyHelper {
nodeList.clear();
doc.processPath(nodeList, "*", parent); // <ns1:Lists>
- int chuckIndex = fullListPaths?decodedServerLocation.length() + parentSiteDecoded.length():0;
+ String prefixPath = decodedServerLocation + parentSiteDecoded + "/";
int i = 0;
while (i < nodeList.size())
@@ -2275,30 +2275,37 @@ public class SPSProxyHelper {
// If it has no view url, we don't have any idea what to do with it
if (urlPath != null && urlPath.length() > 0)
{
- if (urlPath.length() < chuckIndex)
- throw new ManifoldCFException("List view url is not in the expected form: '"+urlPath+"'");
- urlPath = urlPath.substring(chuckIndex);
+ // Normalize conditionally
if (!urlPath.startsWith("/"))
- throw new ManifoldCFException("List view url without site is not in the expected form: '"+urlPath+"'");
- // We're at the /Lists/listname part of the name. Figure out where the end of it is.
- int index = urlPath.indexOf("/",1);
- if (index == -1)
- throw new ManifoldCFException("Bad list view url without site: '"+urlPath+"'");
- String pathpart = urlPath.substring(1,index);
-
- if("Lists".equals(pathpart))
+ urlPath = prefixPath + urlPath;
+ // Get rid of what we don't want, unconditionally
+ if (urlPath.startsWith(prefixPath))
{
- int k = urlPath.indexOf("/",index+1);
- if (k == -1)
- throw new ManifoldCFException("Bad list view url without 'Lists': '"+urlPath+"'");
- pathpart = urlPath.substring(index+1,k);
- }
+ urlPath = urlPath.substring(prefixPath.length());
+ // We're at the /Lists/listname part of the name. Figure out where the end of it is.
+ int index = urlPath.indexOf("/");
+ if (index == -1)
+ throw new ManifoldCFException("Bad list view url without site: '"+urlPath+"'");
+ String pathpart = urlPath.substring(0,index);
+
+ if("Lists".equals(pathpart))
+ {
+ int k = urlPath.indexOf("/",index+1);
+ if (k == -1)
+ throw new ManifoldCFException("Bad list view url without 'Lists': '"+urlPath+"'");
+ pathpart = urlPath.substring(index+1,k);
+ }
- if ( pathpart.length() != 0 && !pathpart.equals("_catalogs"))
+ if ( pathpart.length() != 0 && !pathpart.equals("_catalogs"))
+ {
+ if (title == null || title.length() == 0)
+ title = pathpart;
+ result.add( new NameValue(pathpart, title) );
+ }
+ }
+ else
{
- if (title == null || title.length() == 0)
- title = pathpart;
- result.add( new NameValue(pathpart, title) );
+ Logging.connectors.warn("SharePoint: List view url is not in the expected form: '"+urlPath+"'; expected something beginning with '"+prefixPath+"'; skipping");
}
}
}
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1524560&r1=1524559&r2=1524560&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java Wed Sep 18 20:40:09 2013
@@ -85,7 +85,6 @@ public class SharePointRepository extend
private boolean supportsItemSecurity = false;
private boolean dspStsWorks = true;
- private boolean fullListPaths = true;
private String serverProtocol = null;
private String serverUrl = null;
@@ -146,8 +145,7 @@ public class SharePointRepository extend
if (serverVersion == null)
serverVersion = "2.0";
supportsItemSecurity = !serverVersion.equals("2.0");
- dspStsWorks = !(serverVersion.equals("4.0") || serverVersion.equals("4.0AWS"));
- fullListPaths = !serverVersion.equals("4.0AWS");
+ dspStsWorks = !serverVersion.equals("4.0");
serverProtocol = params.getParameter( "serverProtocol" );
if (serverProtocol == null)
@@ -514,13 +512,19 @@ public class SharePointRepository extend
try
{
String sitePath = command.substring("sites/".length());
- ArrayList sites = getSites(sitePath);
+ List<NameValue> sites = getSites(sitePath);
int i = 0;
while (i < sites.size())
{
- String site = (String)sites.get(i++);
+ NameValue site = sites.get(i++);
ConfigurationNode node = new ConfigurationNode("site");
- node.setValue(site);
+ ConfigurationNode child;
+ child = new ConfigurationNode("name");
+ child.setValue(site.getValue());
+ node.addChild(node.getChildCount(),child);
+ child = new ConfigurationNode("display_name");
+ child.setValue(site.getPrettyName());
+ node.addChild(node.getChildCount(),child);
output.addChild(output.getChildCount(),node);
}
}
@@ -538,13 +542,19 @@ public class SharePointRepository extend
try
{
String sitePath = command.substring("libraries/".length());
- ArrayList libs = getDocLibsBySite(sitePath);
+ List<NameValue> libs = getDocLibsBySite(sitePath);
int i = 0;
while (i < libs.size())
{
- String lib = (String)libs.get(i++);
+ NameValue lib = libs.get(i++);
ConfigurationNode node = new ConfigurationNode("library");
- node.setValue(lib);
+ ConfigurationNode child;
+ child = new ConfigurationNode("name");
+ child.setValue(lib.getValue());
+ node.addChild(node.getChildCount(),child);
+ child = new ConfigurationNode("display_name");
+ child.setValue(lib.getPrettyName());
+ node.addChild(node.getChildCount(),child);
output.addChild(output.getChildCount(),node);
}
}
@@ -562,13 +572,19 @@ public class SharePointRepository extend
try
{
String sitePath = command.substring("lists/".length());
- ArrayList libs = getListsBySite(sitePath);
+ List<NameValue> libs = getListsBySite(sitePath);
int i = 0;
while (i < libs.size())
{
- String lib = (String)libs.get(i++);
+ NameValue lib = libs.get(i++);
ConfigurationNode node = new ConfigurationNode("list");
- node.setValue(lib);
+ ConfigurationNode child;
+ child = new ConfigurationNode("name");
+ child.setValue(lib.getValue());
+ node.addChild(node.getChildCount(),child);
+ child = new ConfigurationNode("display_name");
+ child.setValue(lib.getPrettyName());
+ node.addChild(node.getChildCount(),child);
output.addChild(output.getChildCount(),node);
}
}
@@ -759,7 +775,7 @@ public class SharePointRepository extend
String listID = listIDMap.get(decodedListPath);
if (listID == null)
{
- listID = proxy.getListID(encodedSitePath, sitePath, list, fullListPaths);
+ listID = proxy.getListID(encodedSitePath, sitePath, list);
if (listID != null)
listIDMap.put(decodedListPath,listID);
}
@@ -914,7 +930,7 @@ public class SharePointRepository extend
String libID = libIDMap.get(decodedLibPath);
if (libID == null)
{
- libID = proxy.getDocLibID(encodedSitePath, sitePath, lib, fullListPaths);
+ libID = proxy.getDocLibID(encodedSitePath, sitePath, lib);
if (libID != null)
libIDMap.put(decodedLibPath,libID);
}
@@ -1231,13 +1247,10 @@ public class SharePointRepository extend
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug( "SharePoint: Document identifier is a list: '" + siteListPath + "'" );
- // Calculate the start of the path part that would contain the list item name
- int listItemPathIndex = site.length() + 1 + listName.length();
-
- String listID = proxy.getListID( encodePath(site), site, listName, fullListPaths );
+ String listID = proxy.getListID( encodePath(site), site, listName );
if (listID != null)
{
- ListItemStream fs = new ListItemStream( activities, listItemPathIndex, spec );
+ ListItemStream fs = new ListItemStream( activities, encodedServerLocation, site, siteListPath, spec );
boolean success = proxy.getChildren( fs, encodePath(site) , listID, dspStsWorks );
if (!success)
{
@@ -1329,7 +1342,7 @@ public class SharePointRepository extend
String listID = listIDMap.get(decodedListPath);
if (listID == null)
{
- listID = proxy.getListID( encodePath(site), site, listName, fullListPaths );
+ listID = proxy.getListID( encodePath(site), site, listName );
if (listID == null)
listID = "";
listIDMap.put(decodedListPath,listID);
@@ -1404,13 +1417,10 @@ public class SharePointRepository extend
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug( "SharePoint: Document identifier is a library: '" + siteLibPath + "'" );
- // Calculate the start of the path part that would contain the folders/file
- int foldersFilePathIndex = encodedServerLocation.length() + site.length() + 1 + libName.length();
-
- String libID = proxy.getDocLibID( encodePath(site), site, libName, fullListPaths );
+ String libID = proxy.getDocLibID( encodePath(site), site, libName );
if (libID != null)
{
- FileStream fs = new FileStream( activities, foldersFilePathIndex, spec );
+ FileStream fs = new FileStream( activities, encodedServerLocation, site, siteLibPath, spec );
boolean success = proxy.getChildren( fs, encodePath(site) , libID, dspStsWorks );
if (!success)
{
@@ -1621,7 +1631,7 @@ public class SharePointRepository extend
String documentLibID = docLibIDMap.get(decodedLibPath);
if (documentLibID == null)
{
- documentLibID = proxy.getDocLibID( encodePath(site), site, libName, fullListPaths );
+ documentLibID = proxy.getDocLibID( encodePath(site), site, libName );
if (documentLibID == null)
documentLibID = "";
docLibIDMap.put(decodedLibPath,documentLibID);
@@ -1726,13 +1736,13 @@ public class SharePointRepository extend
Logging.connectors.debug( "SharePoint: Document identifier is a site: '" + decodedSitePath + "'" );
// Look at subsites
- ArrayList subsites = proxy.getSites( encodePath(decodedSitePath) );
+ List<NameValue> subsites = proxy.getSites( encodePath(decodedSitePath) );
if (subsites != null)
{
int j = 0;
while (j < subsites.size())
{
- NameValue subSiteName = (NameValue)subsites.get(j++);
+ NameValue subSiteName = subsites.get(j++);
String newPath = decodedSitePath + "/" + subSiteName.getValue();
String encodedNewPath = encodePath(newPath);
@@ -1747,13 +1757,13 @@ public class SharePointRepository extend
}
// Look at libraries
- ArrayList libraries = proxy.getDocumentLibraries( encodePath(decodedSitePath), decodedSitePath, fullListPaths );
+ List<NameValue> libraries = proxy.getDocumentLibraries( encodePath(decodedSitePath), decodedSitePath );
if (libraries != null)
{
int j = 0;
while (j < libraries.size())
{
- NameValue library = (NameValue)libraries.get(j++);
+ NameValue library = libraries.get(j++);
String newPath = decodedSitePath + "/" + library.getValue();
if (checkIncludeLibrary(newPath,spec))
@@ -1768,13 +1778,13 @@ public class SharePointRepository extend
}
// Look at lists
- ArrayList lists = proxy.getLists( encodePath(decodedSitePath), decodedSitePath, fullListPaths );
+ List<NameValue> lists = proxy.getLists( encodePath(decodedSitePath), decodedSitePath );
if (lists != null)
{
int j = 0;
while (j < lists.size())
{
- NameValue list = (NameValue)lists.get(j++);
+ NameValue list = lists.get(j++);
String newPath = decodedSitePath + "/" + list.getValue();
if (checkIncludeList(newPath,spec))
@@ -1872,65 +1882,123 @@ public class SharePointRepository extend
protected class FileStream implements IFileStream
{
- protected IProcessActivity activities;
- protected int foldersFilePathIndex;
- protected DocumentSpecification spec;
+ protected final IProcessActivity activities;
+ protected final DocumentSpecification spec;
+ protected final String rootPath;
+ protected final String sitePath;
+ protected final String siteLibPath;
- public FileStream(IProcessActivity activities, int foldersFilePathIndex, DocumentSpecification spec)
+ public FileStream(IProcessActivity activities, String rootPath, String sitePath, String siteLibPath, DocumentSpecification spec)
{
this.activities = activities;
- this.foldersFilePathIndex = foldersFilePathIndex;
this.spec = spec;
+ this.rootPath = rootPath;
+ this.sitePath = sitePath;
+ this.siteLibPath = siteLibPath;
}
public void addFile(String relPath)
throws ManifoldCFException
{
- if ( checkIncludeFile( relPath, spec ) )
+
+ // First, convert the relative path to a full path
+ if ( !relPath.startsWith("/") )
+ {
+ relPath = rootPath + sitePath + "/" + relPath;
+ }
+
+ // Now, strip away what we don't want - namely, the root path. This makes the path relative to the root.
+ if ( relPath.startsWith(rootPath) )
{
- // Since the processing for a file needs to know the library path, we need a way to signal the cutoff between library and folder levels.
- // The way I've chosen to do this is to use a double slash at that point, as a separator.
- if (relPath.length() >= foldersFilePathIndex)
+ relPath = relPath.substring(rootPath.length());
+
+ if ( checkIncludeFile( relPath, spec ) )
{
- String modifiedPath = relPath.substring(0,foldersFilePathIndex) + "/" + relPath.substring(foldersFilePathIndex);
+ // Since the processing for a file needs to know the library path, we need a way to signal the cutoff between library and folder levels.
+ // The way I've chosen to do this is to use a double slash at that point, as a separator.
+ if (relPath.startsWith(siteLibPath))
+ {
+ // Split at the libpath/file boundary
+ String modifiedPath = siteLibPath + "/" + relPath.substring(siteLibPath.length());
- activities.addDocumentReference( modifiedPath );
- }
- else
- {
- Logging.connectors.warn("Sharepoint: Unexpected relPath structure; path is '"+relPath+"', but expected <list/library> length of "+foldersFilePathIndex);
+ activities.addDocumentReference( modifiedPath );
+ }
+ else
+ {
+ Logging.connectors.warn("SharePoint: Unexpected relPath structure; path is '"+relPath+"', but expected to see something beginning with '"+siteLibPath+"'");
+ }
}
}
+ else
+ {
+ Logging.connectors.warn("SharePoint: Unexpected relPath structure; path is '"+relPath+"', but expected to see something beginning with '"+rootPath+"'");
+ }
}
}
protected class ListItemStream implements IFileStream
{
- protected IProcessActivity activities;
- protected int foldersFilePathIndex;
- protected DocumentSpecification spec;
-
- public ListItemStream(IProcessActivity activities, int foldersFilePathIndex, DocumentSpecification spec)
+ protected final IProcessActivity activities;
+ protected final DocumentSpecification spec;
+ protected final String rootPath;
+ protected final String sitePath;
+ protected final String siteListPath;
+
+ public ListItemStream(IProcessActivity activities, String rootPath, String sitePath, String siteListPath, DocumentSpecification spec)
{
this.activities = activities;
- this.foldersFilePathIndex = foldersFilePathIndex;
this.spec = spec;
+ this.rootPath = rootPath;
+ this.sitePath = sitePath;
+ this.siteListPath = siteListPath;
}
public void addFile(String relPath)
throws ManifoldCFException
{
- // First, strip "Lists" from relPath
- if (!relPath.startsWith("/Lists/"))
- throw new ManifoldCFException("Expected path to start with /Lists/");
- relPath = relPath.substring("/Lists".length());
- if ( checkIncludeListItem( relPath, spec ) )
- {
- // Since the processing for a item needs to know the list path, we need a way to signal the cutoff between list and item levels.
- // The way I've chosen to do this is to use a triple slash at that point, as a separator.
- String modifiedPath = relPath.substring(0,foldersFilePathIndex) + "//" + relPath.substring(foldersFilePathIndex);
+ // First, convert the relative path to a full path
+ if ( !relPath.startsWith("/") )
+ {
+ relPath = rootPath + sitePath + "/" + relPath;
+ }
+
+ // Now, strip away what we don't want - namely, the root path. This makes the path relative to the root.
+ if ( relPath.startsWith(rootPath) )
+ {
+ relPath = relPath.substring(rootPath.length());
+
+ if (relPath.startsWith(sitePath))
+ {
+ relPath = relPath.substring(sitePath.length());
+
+ // Now, strip "Lists" from relPath
+ if (!relPath.startsWith("/Lists/"))
+ throw new ManifoldCFException("Expected path to start with /Lists/");
+ relPath = sitePath + relPath.substring("/Lists".length());
+ if ( checkIncludeListItem( relPath, spec ) )
+ {
+ if (relPath.startsWith(siteListPath))
+ {
+ // Since the processing for a item needs to know the list path, we need a way to signal the cutoff between list and item levels.
+ // The way I've chosen to do this is to use a triple slash at that point, as a separator.
+ String modifiedPath = relPath.substring(0,siteListPath.length()) + "//" + relPath.substring(siteListPath.length());
- activities.addDocumentReference( modifiedPath );
+ activities.addDocumentReference( modifiedPath );
+ }
+ else
+ {
+ Logging.connectors.warn("SharePoint: Unexpected relPath structure; site path is '"+relPath+"', but expected to see something beginning with '"+siteListPath+"'");
+ }
+ }
+ }
+ else
+ {
+ Logging.connectors.warn("SharePoint: Unexpected relPath structure; site path is '"+relPath+"', but expected to see something beginning with '"+sitePath+"'");
+ }
+ }
+ else
+ {
+ Logging.connectors.warn("SharePoint: Unexpected relPath structure; path is '"+relPath+"', but expected to see something beginning with '"+rootPath+"'");
}
}
@@ -2143,7 +2211,6 @@ public class SharePointRepository extend
" <option value=\"2.0\" "+((serverVersion.equals("2.0"))?"selected=\"true\"":"")+">SharePoint Services 2.0 (2003)</option>\n"+
" <option value=\"3.0\" "+(serverVersion.equals("3.0")?"selected=\"true\"":"")+">SharePoint Services 3.0 (2007)</option>\n"+
" <option value=\"4.0\" "+(serverVersion.equals("4.0")?"selected=\"true\"":"")+">SharePoint Services 4.0 (2010)</option>\n"+
-" <option value=\"4.0AWS\" "+(serverVersion.equals("4.0AWS")?"selected=\"true\"":"")+">SharePoint Services 4.0 (2010), Amazon version</option>\n"+
" </select>\n"+
" </td>\n"+
" </tr>\n"+
@@ -2844,9 +2911,9 @@ public class SharePointRepository extend
}
// Grab next site list and lib list
- ArrayList childSiteList = null;
- ArrayList childLibList = null;
- ArrayList childListList = null;
+ List<NameValue> childSiteList = null;
+ List<NameValue> childLibList = null;
+ List<NameValue> childListList = null;
String message = null;
if (pathState.equals("site"))
{
@@ -2992,7 +3059,7 @@ public class SharePointRepository extend
int q = 0;
while (q < childSiteList.size())
{
- org.apache.manifoldcf.crawler.connectors.sharepoint.NameValue childSite = (org.apache.manifoldcf.crawler.connectors.sharepoint.NameValue)childSiteList.get(q++);
+ NameValue childSite = childSiteList.get(q++);
out.print(
" <option value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(childSite.getValue())+"\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(childSite.getPrettyName())+"</option>\n"
);
@@ -3012,7 +3079,7 @@ public class SharePointRepository extend
int q = 0;
while (q < childLibList.size())
{
- org.apache.manifoldcf.crawler.connectors.sharepoint.NameValue childLib = (org.apache.manifoldcf.crawler.connectors.sharepoint.NameValue)childLibList.get(q++);
+ NameValue childLib = childLibList.get(q++);
out.print(
" <option value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(childLib.getValue())+"\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(childLib.getPrettyName())+"</option>\n"
);
@@ -3032,7 +3099,7 @@ public class SharePointRepository extend
int q = 0;
while (q < childListList.size())
{
- org.apache.manifoldcf.crawler.connectors.sharepoint.NameValue childList = (org.apache.manifoldcf.crawler.connectors.sharepoint.NameValue)childListList.get(q++);
+ NameValue childList = childListList.get(q++);
out.print(
" <option value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(childList.getValue())+"\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(childList.getPrettyName())+"</option>\n"
);
@@ -3560,9 +3627,9 @@ public class SharePointRepository extend
}
// Grab next site list and lib list
- ArrayList childSiteList = null;
- ArrayList childLibList = null;
- ArrayList childListList = null;
+ List<NameValue> childSiteList = null;
+ List<NameValue> childLibList = null;
+ List<NameValue> childListList = null;
if (message == null && metaPathState.equals("site"))
{
@@ -3700,7 +3767,7 @@ public class SharePointRepository extend
int q = 0;
while (q < childSiteList.size())
{
- org.apache.manifoldcf.crawler.connectors.sharepoint.NameValue childSite = (org.apache.manifoldcf.crawler.connectors.sharepoint.NameValue)childSiteList.get(q++);
+ NameValue childSite = childSiteList.get(q++);
out.print(
" <option value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(childSite.getValue())+"\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(childSite.getPrettyName())+"</option>\n"
);
@@ -3720,7 +3787,7 @@ public class SharePointRepository extend
int q = 0;
while (q < childLibList.size())
{
- org.apache.manifoldcf.crawler.connectors.sharepoint.NameValue childLib = (org.apache.manifoldcf.crawler.connectors.sharepoint.NameValue)childLibList.get(q++);
+ NameValue childLib = childLibList.get(q++);
out.print(
" <option value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(childLib.getValue())+"\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(childLib.getPrettyName())+"</option>\n"
);
@@ -3740,7 +3807,7 @@ public class SharePointRepository extend
int q = 0;
while (q < childListList.size())
{
- org.apache.manifoldcf.crawler.connectors.sharepoint.NameValue childList = (org.apache.manifoldcf.crawler.connectors.sharepoint.NameValue)childListList.get(q++);
+ NameValue childList = childListList.get(q++);
out.print(
" <option value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(childList.getValue())+"\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(childList.getPrettyName())+"</option>\n"
);
@@ -5004,7 +5071,7 @@ public class SharePointRepository extend
throws ServiceInterruption, ManifoldCFException
{
getSession();
- return proxy.getFieldList( encodePath(parentSite), proxy.getDocLibID( encodePath(parentSite), parentSite, docLibrary, fullListPaths ) );
+ return proxy.getFieldList( encodePath(parentSite), proxy.getDocLibID( encodePath(parentSite), parentSite, docLibrary ) );
}
/**
@@ -5017,7 +5084,7 @@ public class SharePointRepository extend
throws ServiceInterruption, ManifoldCFException
{
getSession();
- return proxy.getFieldList( encodePath(parentSite), proxy.getListID( encodePath(parentSite), parentSite, listName, fullListPaths ) );
+ return proxy.getFieldList( encodePath(parentSite), proxy.getListID( encodePath(parentSite), parentSite, listName ) );
}
/**
@@ -5025,7 +5092,7 @@ public class SharePointRepository extend
* @param parentSite the unencoded parent site path to search for subsites, empty for root.
* @return list of the sites
*/
- public ArrayList getSites( String parentSite )
+ public List<NameValue> getSites( String parentSite )
throws ServiceInterruption, ManifoldCFException
{
getSession();
@@ -5037,11 +5104,11 @@ public class SharePointRepository extend
* @param parentSite the unencoded parent site to search for libraries, empty for root.
* @return list of the libraries
*/
- public ArrayList getDocLibsBySite( String parentSite )
+ public List<NameValue> getDocLibsBySite( String parentSite )
throws ManifoldCFException, ServiceInterruption
{
getSession();
- return proxy.getDocumentLibraries( encodePath(parentSite), parentSite, fullListPaths );
+ return proxy.getDocumentLibraries( encodePath(parentSite), parentSite );
}
/**
@@ -5049,11 +5116,11 @@ public class SharePointRepository extend
* @param parentSite the unencoded parent site to search for lists, empty for root.
* @return list of the lists
*/
- public ArrayList getListsBySite( String parentSite )
+ public List<NameValue> getListsBySite( String parentSite )
throws ManifoldCFException, ServiceInterruption
{
getSession();
- return proxy.getLists( encodePath(parentSite), parentSite, fullListPaths );
+ return proxy.getLists( encodePath(parentSite), parentSite );
}
// Protected static methods
Modified: manifoldcf/trunk/connectors/sharepoint/wsdls/DspSts.wsdl
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/wsdls/DspSts.wsdl?rev=1524560&r1=1524559&r2=1524560&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/wsdls/DspSts.wsdl (original)
+++ manifoldcf/trunk/connectors/sharepoint/wsdls/DspSts.wsdl Wed Sep 18 20:40:09 2013
@@ -223,10 +223,10 @@
</wsdl:binding>
<wsdl:service name="StsAdapter">
<wsdl:port name="StsAdapterSoap" binding="tns:StsAdapterSoap">
- <soap:address location="http://www.wssdemo.com/_vti_bin/DspSts.asmx" />
+ <soap:address location="http://localhost/_vti_bin/DspSts.asmx" />
</wsdl:port>
<wsdl:port name="StsAdapterSoap12" binding="tns:StsAdapterSoap12">
- <soap12:address location="http://www.wssdemo.com/_vti_bin/DspSts.asmx" />
+ <soap12:address location="http://localhost/_vti_bin/DspSts.asmx" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified: manifoldcf/trunk/connectors/sharepoint/wsdls/Lists.wsdl
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/wsdls/Lists.wsdl?rev=1524560&r1=1524559&r2=1524560&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/wsdls/Lists.wsdl (original)
+++ manifoldcf/trunk/connectors/sharepoint/wsdls/Lists.wsdl Wed Sep 18 20:40:09 2013
@@ -1772,10 +1772,10 @@
</wsdl:binding>
<wsdl:service name="Lists">
<wsdl:port name="ListsSoap" binding="tns:ListsSoap">
- <soap:address location="http://www.wssdemo.com/_vti_bin/Lists.asmx" />
+ <soap:address location="http://localhost/_vti_bin/Lists.asmx" />
</wsdl:port>
<wsdl:port name="ListsSoap12" binding="tns:ListsSoap12">
- <soap12:address location="http://www.wssdemo.com/_vti_bin/Lists.asmx" />
+ <soap12:address location="http://localhost/_vti_bin/Lists.asmx" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified: manifoldcf/trunk/connectors/sharepoint/wsdls/MCPermissions.wsdl
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/wsdls/MCPermissions.wsdl?rev=1524560&r1=1524559&r2=1524560&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/wsdls/MCPermissions.wsdl (original)
+++ manifoldcf/trunk/connectors/sharepoint/wsdls/MCPermissions.wsdl Wed Sep 18 20:40:09 2013
@@ -115,10 +115,10 @@
</wsdl:binding>
<wsdl:service name="Permissions">
<wsdl:port name="PermissionsSoap" binding="tns:PermissionsSoap">
- <soap:address location="http://win-0hb0c25kl3n:33445/_vti_bin/MCPermissions.asmx" />
+ <soap:address location="http://localhost/_vti_bin/MCPermissions.asmx" />
</wsdl:port>
<wsdl:port name="PermissionsSoap12" binding="tns:PermissionsSoap12">
- <soap12:address location="http://win-0hb0c25kl3n:33445/_vti_bin/MCPermissions.asmx" />
+ <soap12:address location="http://localhost/_vti_bin/MCPermissions.asmx" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file
Modified: manifoldcf/trunk/connectors/sharepoint/wsdls/Permissions.wsdl
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/wsdls/Permissions.wsdl?rev=1524560&r1=1524559&r2=1524560&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/wsdls/Permissions.wsdl (original)
+++ manifoldcf/trunk/connectors/sharepoint/wsdls/Permissions.wsdl Wed Sep 18 20:40:09 2013
@@ -296,10 +296,10 @@
</wsdl:binding>
<wsdl:service name="Permissions">
<wsdl:port name="PermissionsSoap" binding="tns:PermissionsSoap">
- <soap:address location="http://www.wssdemo.com/_vti_bin/Permissions.asmx" />
+ <soap:address location="http://localhost/_vti_bin/Permissions.asmx" />
</wsdl:port>
<wsdl:port name="PermissionsSoap12" binding="tns:PermissionsSoap12">
- <soap12:address location="http://www.wssdemo.com/_vti_bin/Permissions.asmx" />
+ <soap12:address location="http://localhost/_vti_bin/Permissions.asmx" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified: manifoldcf/trunk/connectors/sharepoint/wsdls/usergroup.wsdl
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/wsdls/usergroup.wsdl?rev=1524560&r1=1524559&r2=1524560&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/wsdls/usergroup.wsdl (original)
+++ manifoldcf/trunk/connectors/sharepoint/wsdls/usergroup.wsdl Wed Sep 18 20:40:09 2013
@@ -1977,10 +1977,10 @@
</wsdl:binding>
<wsdl:service name="UserGroup">
<wsdl:port name="UserGroupSoap" binding="tns:UserGroupSoap">
- <soap:address location="http://www.wssdemo.com/_vti_bin/usergroup.asmx" />
+ <soap:address location="http://localhost/_vti_bin/usergroup.asmx" />
</wsdl:port>
<wsdl:port name="UserGroupSoap12" binding="tns:UserGroupSoap12">
- <soap12:address location="http://www.wssdemo.com/_vti_bin/usergroup.asmx" />
+ <soap12:address location="http://localhost/_vti_bin/usergroup.asmx" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified: manifoldcf/trunk/connectors/sharepoint/wsdls/versions.wsdl
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/wsdls/versions.wsdl?rev=1524560&r1=1524559&r2=1524560&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/wsdls/versions.wsdl (original)
+++ manifoldcf/trunk/connectors/sharepoint/wsdls/versions.wsdl Wed Sep 18 20:40:09 2013
@@ -224,10 +224,10 @@
</wsdl:binding>
<wsdl:service name="Versions">
<wsdl:port name="VersionsSoap" binding="tns:VersionsSoap">
- <soap:address location="http://www.wssdemo.com/_vti_bin/versions.asmx" />
+ <soap:address location="http://localhost/_vti_bin/versions.asmx" />
</wsdl:port>
<wsdl:port name="VersionsSoap12" binding="tns:VersionsSoap12">
- <soap12:address location="http://www.wssdemo.com/_vti_bin/versions.asmx" />
+ <soap12:address location="http://localhost/_vti_bin/versions.asmx" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified: manifoldcf/trunk/connectors/sharepoint/wsdls/webs.wsdl
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/wsdls/webs.wsdl?rev=1524560&r1=1524559&r2=1524560&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/wsdls/webs.wsdl (original)
+++ manifoldcf/trunk/connectors/sharepoint/wsdls/webs.wsdl Wed Sep 18 20:40:09 2013
@@ -1024,10 +1024,10 @@
</wsdl:binding>
<wsdl:service name="Webs">
<wsdl:port name="WebsSoap" binding="tns:WebsSoap">
- <soap:address location="http://www.wssdemo.com/_vti_bin/webs.asmx" />
+ <soap:address location="http://localhost/_vti_bin/webs.asmx" />
</wsdl:port>
<wsdl:port name="WebsSoap12" binding="tns:WebsSoap12">
- <soap12:address location="http://www.wssdemo.com/_vti_bin/webs.asmx" />
+ <soap12:address location="http://localhost/_vti_bin/webs.asmx" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>