zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Virtuworks 2013-01-08 18:24:48 -05:00
commit 3380419d7d
19 changed files with 142 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.Designer.cs generated
View file

@ -26,7 +26,7 @@ namespace WebsitePanel.Installer.Core.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
[global::System.Configuration.DefaultSettingValueAttribute("http://www.websitepanel.net/Services/InstallerService.asmx")]
[global::System.Configuration.DefaultSettingValueAttribute("http://www.websitepanel.net/Services/InstallerService-2.0.asmx")]
public string WebsitePanel_Installer_Core_InstallerService_InstallerService {
get {
return ((string)(this["WebsitePanel_Installer_Core_InstallerService_InstallerService"]));

2
WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.settings
View file

@ -3,7 +3,7 @@
<Profiles />
<Settings>
<Setting Name="WebsitePanel_Installer_Core_InstallerService_InstallerService" Type="(Web Service URL)" Scope="Application">
<Value Profile="(Default)">http://www.websitepanel.net/Services/InstallerService.asmx</Value>
<Value Profile="(Default)">http://www.websitepanel.net/Services/InstallerService-2.0.asmx</Value>
</Setting>
</Settings>
</SettingsFile>

2
WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/ServiceProviderProxy.cs
View file

@ -48,7 +48,7 @@ namespace WebsitePanel.Installer.Core
}
else
{
webService.Url = "http://www.websitepanel.net/Services/InstallerService.asmx";
webService.Url = "http://www.websitepanel.net/Services/InstallerService-2.0.asmx";
}
// check if we need to add a proxy to access Internet

6
WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.disco
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
<contractRef ref="http://www.websitepanel.net/Services/InstallerService.asmx?wsdl" docRef="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
<soap address="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
<soap address="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
<contractRef ref="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?wsdl" docRef="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
<soap address="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
<soap address="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
</discovery>

4
WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.wsdl
View file

@ -294,10 +294,10 @@
</wsdl:binding>
<wsdl:service name="InstallerService">
<wsdl:port name="InstallerServiceSoap" binding="tns:InstallerServiceSoap">
<soap:address location="http://www.websitepanel.net/Services/InstallerService.asmx" />
<soap:address location="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" />
</wsdl:port>
<wsdl:port name="InstallerServiceSoap12" binding="tns:InstallerServiceSoap12">
<soap12:address location="http://www.websitepanel.net/Services/InstallerService.asmx" />
<soap12:address location="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>

4
WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/Reference.map
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Results>
<DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://www.websitepanel.net/Services/InstallerService.asmx?wsdl" filename="InstallerService.wsdl" />
<DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://www.websitepanel.net/Services/InstallerService.asmx?disco" filename="InstallerService.disco" />
<DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?wsdl" filename="InstallerService.wsdl" />
<DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?disco" filename="InstallerService.disco" />
</Results>
</DiscoveryClientResultsFile>

4
WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/WebsitePanel.Installer.Core.csproj
View file

@ -110,10 +110,10 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
<WebReferenceUrl Include="http://www.websitepanel.net/Services/InstallerService.asmx">
<WebReferenceUrl Include="http://www.websitepanel.net/Services/InstallerService-2.0.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\InstallerService\</RelPath>
<UpdateFromURL>http://www.websitepanel.net/Services/InstallerService.asmx</UpdateFromURL>
<UpdateFromURL>http://www.websitepanel.net/Services/InstallerService-2.0.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>

2
WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config
View file

@ -13,7 +13,7 @@
<WebsitePanel.Installer.Core.Properties.Settings>
<setting name="WebsitePanel_Installer_Core_InstallerService_InstallerService"
serializeAs="String">
<value>http://www.websitepanel.net/Services/InstallerService.asmx</value>
<value>http://www.websitepanel.net/Services/InstallerService-2.0.asmx</value>
</setting>
</WebsitePanel.Installer.Core.Properties.Settings>
</applicationSettings>

6
WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.disco
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
<contractRef ref="http://localhost/WebsitePanelSite/Services/InstallerService.asmx?wsdl" docRef="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
<soap address="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
<soap address="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
<contractRef ref="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx?wsdl" docRef="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
<soap address="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
<soap address="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
</discovery>

4
WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.wsdl
View file

@ -145,10 +145,10 @@
</wsdl:binding>
<wsdl:service name="InstallerService">
<wsdl:port name="InstallerServiceSoap" binding="tns:InstallerServiceSoap">
<soap:address location="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" />
<soap:address location="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" />
</wsdl:port>
<wsdl:port name="InstallerServiceSoap12" binding="tns:InstallerServiceSoap12">
<soap12:address location="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" />
<soap12:address location="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>

2
WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.cs
View file

@ -40,7 +40,7 @@ namespace WebsitePanel.Updater.Services {
/// <remarks/>
public InstallerService() {
this.Url = "http://localhost/WebsitePanelSite/Services/InstallerService.asmx";
this.Url = "http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx";
if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
this.UseDefaultCredentials = true;
this.useDefaultCredentialsSetExplicitly = false;

4
WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.map
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Results>
<DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost/WebsitePanelSite/Services/InstallerService.asmx?disco" filename="InstallerService.disco" />
<DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/WebsitePanelSite/Services/InstallerService.asmx?wsdl" filename="InstallerService.wsdl" />
<DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx?disco" filename="InstallerService.disco" />
<DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx?wsdl" filename="InstallerService.wsdl" />
</Results>
</DiscoveryClientResultsFile>

4
WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
View file

@ -107,10 +107,10 @@
<WebReferences Include="Web References\" />
</ItemGroup>
<ItemGroup>
<WebReferenceUrl Include="http://localhost/WebsitePanelSite/Services/InstallerService.asmx">
<WebReferenceUrl Include="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx">
<UrlBehavior>Static</UrlBehavior>
<RelPath>Web References\Services\</RelPath>
<UpdateFromURL>http://localhost/WebsitePanelSite/Services/InstallerService.asmx</UpdateFromURL>
<UpdateFromURL>http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>

1
WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx Normal file
View file

@ -0,0 +1 @@
<%@ WebService Language="C#" CodeBehind="InstallerService-2.0.asmx.cs" Class="WebsitePanel.WebSite.Services.InstallerService_20" %>

53
WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.0.asmx.cs Normal file
View file

@ -0,0 +1,53 @@
/* Copyright (c) 2011, SMB SAAS Systems Inc. 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 SMB SAAS Systems Inc. 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.
*/
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Services;
using System.Data;
namespace WebsitePanel.WebSite.Services
{
/// <summary>
/// Summary description for InstallerService_Beta
/// </summary>
[WebService(Namespace = "http://websitepanel.net/services")]
[WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
[System.ComponentModel.ToolboxItem(false)]
// To allow this Web Service to be called from script, using ASP.NET AJAX, uncomment the following line.
// [System.Web.Script.Services.ScriptService]
public class InstallerService_20 : InstallerServiceBase
{
public InstallerService_20()
{
RELEASES_FEED_PATH = "~/Data/ProductReleasesFeed-2.0.xml";
}
}
}

1
WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx Normal file
View file

@ -0,0 +1 @@
<%@ WebService Language="C#" CodeBehind="InstallerService-2.1.asmx.cs" Class="WebsitePanel.WebSite.Services.InstallerService_21" %>

53
WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/Services/InstallerService-2.1.asmx.cs Normal file
View file

@ -0,0 +1,53 @@
/* Copyright (c) 2011, SMB SAAS Systems Inc. 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 SMB SAAS Systems Inc. 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.
*/
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Services;
using System.Data;
namespace WebsitePanel.WebSite.Services
{
/// <summary>
/// Summary description for InstallerService_Beta
/// </summary>
[WebService(Namespace = "http://websitepanel.net/services")]
[WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
[System.ComponentModel.ToolboxItem(false)]
// To allow this Web Service to be called from script, using ASP.NET AJAX, uncomment the following line.
// [System.Web.Script.Services.ScriptService]
public class InstallerService_21 : InstallerServiceBase
{
public InstallerService_21()
{
RELEASES_FEED_PATH = "~/Data/ProductReleasesFeed-2.1.xml";
}
}
}

8
WebsitePanel.WebSite/Sources/WebsitePanel.WebSite/WebsitePanel.WebSite.csproj
View file

@ -77,6 +77,8 @@
<Content Include="Data\ProductReleasesFeed.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="Services\InstallerService-2.1.asmx" />
<Content Include="Services\InstallerService-2.0.asmx" />
<Content Include="Services\InstallerService-Staging.asmx" />
<Content Include="Services\InstallerService-Beta.asmx" />
<Content Include="Services\InstallerService.asmx" />
@ -86,6 +88,12 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Services\InstallerService-2.1.asmx.cs">
<DependentUpon>InstallerService-2.1.asmx</DependentUpon>
</Compile>
<Compile Include="Services\InstallerService-2.0.asmx.cs">
<DependentUpon>InstallerService-2.0.asmx</DependentUpon>
</Compile>
<Compile Include="Services\InstallerService-Staging.asmx.cs">
<DependentUpon>InstallerService-Staging.asmx</DependentUpon>
</Compile>

6
WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs
View file

@ -5060,9 +5060,9 @@ namespace WebsitePanel.Providers.HostedSolution
string path = AddADPrefix(id);
//Command cmd = new Command("Update-OfflineAddressBook");
//cmd.Parameters.Add("Identity", id);
//ExecuteShellCommand(runSpace, cmd);
//Command cmd = new Command("Update-OfflineAddressBook");
//cmd.Parameters.Add("Identity", id);
//ExecuteShellCommand(runSpace, cmd);
AdjustADSecurity(path, securityGroup, true);