From aa5a0cfc4454164637abeff1511101ce67a04357 Mon Sep 17 00:00:00 2001 From: robvde Date: Sun, 5 Apr 2015 08:13:57 +0800 Subject: [PATCH] Sharepoitn 2013 Fix up methods --- .../HostedSharePointServersProxy.cs | 29 +++++++++++++++++ .../esHostedSharePointServersEnt.asmx.cs | 32 +++++++++---------- WebsitePanel/Sources/generate_es_proxies.bat | 4 +-- 3 files changed, 47 insertions(+), 18 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/HostedSharePointServersProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/HostedSharePointServersProxy.cs index 0a2fb384..63534afd 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/HostedSharePointServersProxy.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/HostedSharePointServersProxy.cs @@ -1,3 +1,32 @@ +// Copyright (c) 2015, Outercurve Foundation. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, +// are permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this +// list of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// +// - Neither the name of the Outercurve Foundation nor the names of its +// contributors may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServersEnt.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServersEnt.asmx.cs index e5b51f35..3837ca4c 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServersEnt.asmx.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServersEnt.asmx.cs @@ -58,7 +58,7 @@ namespace WebsitePanel.EnterpriseServer /// Resource group name. /// Site collections in raw format. [WebMethod] - public SharePointSiteCollectionListPaged GetSiteCollectionsPaged(int packageId, int organizationId, + public SharePointSiteCollectionListPaged Enterprise_GetSiteCollectionsPaged(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) { return HostedSharePointServerEntController.GetSiteCollectionsPaged(packageId, organizationId, filterColumn, filterValue, @@ -70,7 +70,7 @@ namespace WebsitePanel.EnterpriseServer /// /// List of supported languages [WebMethod] - public int[] GetSupportedLanguages(int packageId) + public int[] Enterprise_GetSupportedLanguages(int packageId) { return HostedSharePointServerEntController.GetSupportedLanguages(packageId); } @@ -83,13 +83,13 @@ namespace WebsitePanel.EnterpriseServer /// Resource group name. /// List of found site collections. [WebMethod] - public List GetSiteCollections(int packageId, bool recursive) + public List Enterprise_GetSiteCollections(int packageId, bool recursive) { return HostedSharePointServerEntController.GetSiteCollections(packageId, recursive); } [WebMethod] - public int SetStorageSettings(int itemId, int maxStorage, int warningStorage, bool applyToSiteCollections) + public int Enterprise_SetStorageSettings(int itemId, int maxStorage, int warningStorage, bool applyToSiteCollections) { return HostedSharePointServerEntController.SetStorageSettings(itemId, maxStorage, warningStorage, applyToSiteCollections ); } @@ -100,7 +100,7 @@ namespace WebsitePanel.EnterpriseServer /// Site collection id within metabase. /// Site collection. [WebMethod] - public SharePointSiteCollection GetSiteCollection(int itemId) + public SharePointSiteCollection Enterprise_GetSiteCollection(int itemId) { return HostedSharePointServerEntController.GetSiteCollection(itemId); } @@ -113,10 +113,10 @@ namespace WebsitePanel.EnterpriseServer /// Domain name. /// SharePoint site collection or null. [WebMethod] - public SharePointSiteCollection GetSiteCollectionByDomain(int organizationId, string domain) + public SharePointSiteCollection Enterprise_GetSiteCollectionByDomain(int organizationId, string domain) { DomainInfo domainInfo = ServerController.GetDomain(domain); - SharePointSiteCollectionListPaged existentSiteCollections = this.GetSiteCollectionsPaged(domainInfo.PackageId, organizationId, "ItemName", String.Format("%{0}", domain), String.Empty, 0, Int32.MaxValue); + SharePointSiteCollectionListPaged existentSiteCollections = this.Enterprise_GetSiteCollectionsPaged(domainInfo.PackageId, organizationId, "ItemName", String.Format("%{0}", domain), String.Empty, 0, Int32.MaxValue); foreach (SharePointSiteCollection existentSiteCollection in existentSiteCollections.SiteCollections) { Uri existentSiteCollectionUri = new Uri(existentSiteCollection.Name); @@ -136,7 +136,7 @@ namespace WebsitePanel.EnterpriseServer /// Resource group name. /// Created site collection id within metabase. [WebMethod] - public int AddSiteCollection(SharePointSiteCollection item) + public int Enterprise_AddSiteCollection(SharePointSiteCollection item) { return HostedSharePointServerEntController.AddSiteCollection(item); } @@ -147,7 +147,7 @@ namespace WebsitePanel.EnterpriseServer /// Site collection id within metabase. /// ? [WebMethod] - public int DeleteSiteCollection(int itemId) + public int Enterprise_DeleteSiteCollection(int itemId) { return HostedSharePointServerEntController.DeleteSiteCollection(itemId); } @@ -158,7 +158,7 @@ namespace WebsitePanel.EnterpriseServer /// Site collection id within metabase. /// ? [WebMethod] - public int DeleteSiteCollections(int organizationId) + public int Enterprise_DeleteSiteCollections(int organizationId) { HostedSharePointServerEntController.DeleteSiteCollections(organizationId); return 0; @@ -175,7 +175,7 @@ namespace WebsitePanel.EnterpriseServer /// Local folder to store downloaded backup. /// Created backup file name. [WebMethod] - public string BackupSiteCollection(int itemId, string fileName, bool zipBackup, bool download, string folderName) + public string Enterprise_BackupSiteCollection(int itemId, string fileName, bool zipBackup, bool download, string folderName) { return HostedSharePointServerEntController.BackupSiteCollection(itemId, fileName, zipBackup, download, folderName); } @@ -188,7 +188,7 @@ namespace WebsitePanel.EnterpriseServer /// /// [WebMethod] - public int RestoreSiteCollection(int itemId, string uploadedFile, string packageFile) + public int Enterprise_RestoreSiteCollection(int itemId, string uploadedFile, string packageFile) { return HostedSharePointServerEntController.RestoreSiteCollection(itemId, uploadedFile, packageFile); } @@ -202,7 +202,7 @@ namespace WebsitePanel.EnterpriseServer /// Binary data chunk length. /// Binary data chunk read from file. [WebMethod] - public byte[] GetBackupBinaryChunk(int itemId, string path, int offset, int length) + public byte[] Enterprise_GetBackupBinaryChunk(int itemId, string path, int offset, int length) { return HostedSharePointServerEntController.GetBackupBinaryChunk(itemId, path, offset, length); } @@ -216,20 +216,20 @@ namespace WebsitePanel.EnterpriseServer /// Binary data chunk to append to. /// Path to file that was appended with chunk. [WebMethod] - public string AppendBackupBinaryChunk(int itemId, string fileName, string path, byte[] chunk) + public string Enterprise_AppendBackupBinaryChunk(int itemId, string fileName, string path, byte[] chunk) { return HostedSharePointServerEntController.AppendBackupBinaryChunk(itemId, fileName, path, chunk); } [WebMethod] - public SharePointSiteDiskSpace[] CalculateSharePointSitesDiskSpace(int itemId, out int errorCode) + public SharePointSiteDiskSpace[] Enterprise_CalculateSharePointSitesDiskSpace(int itemId, out int errorCode) { return HostedSharePointServerEntController.CalculateSharePointSitesDiskSpace(itemId, out errorCode); } [WebMethod] - public void UpdateQuota(int itemId, int siteCollectionId, int maxSize, int warningSize) + public void Enterprise_UpdateQuota(int itemId, int siteCollectionId, int maxSize, int warningSize) { HostedSharePointServerEntController.UpdateQuota(itemId, siteCollectionId, maxSize, warningSize); } diff --git a/WebsitePanel/Sources/generate_es_proxies.bat b/WebsitePanel/Sources/generate_es_proxies.bat index ebfa40a4..b80218a8 100644 --- a/WebsitePanel/Sources/generate_es_proxies.bat +++ b/WebsitePanel/Sources/generate_es_proxies.bat @@ -35,8 +35,8 @@ REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ecStorefrontProxy.cs REM %WSDL% %SERVER_URL%/ecStorehouse.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ecStorehouseProxy.cs /namespace:WebsitePanel.Ecommerce.EnterpriseServer /type:webClient REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ecStorehouseProxy.cs -%WSDL% %SERVER_URL%/esExchangeServer.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ExchangeServerProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient -%WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ExchangeServerProxy.cs +REM %WSDL% %SERVER_URL%/esExchangeServer.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ExchangeServerProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient +REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ExchangeServerProxy.cs REM %WSDL% %SERVER_URL%/esExchangeHostedEdition.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ExchangeHostedEditionProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ExchangeHostedEditionProxy.cs