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

Few build issues fixed

Browse source
This commit is contained in:
robvde 2012-07-13 07:50:12 +04:00
parent c1e2aa8477
commit 2619378153
2 changed files with 43 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
WebsitePanel/Sources/Tools/WebsitePanel.Import.CsvBulk/ExchangeImport.cs
View file

@ -527,7 +527,7 @@ namespace WebsitePanel.Import.CsvBulk
//create mailbox //create mailbox
//ES.Services.ExchangeServer. //ES.Services.ExchangeServer.
string accountName = string.Empty; string accountName = string.Empty;
int accountId = ES.Services.ExchangeServer.CreateMailbox(orgId, 0, ExchangeAccountType.Mailbox, accountName, displayName, name, domain, password, false, string.Empty); int accountId = ES.Services.ExchangeServer.CreateMailbox(orgId, 0, ExchangeAccountType.Mailbox, accountName, displayName, name, domain, password, false, string.Empty, 0, string.Empty);
if (accountId < 0) if (accountId < 0)
{ {
string errorMessage = GetErrorMessage(accountId); string errorMessage = GetErrorMessage(accountId);
@ -558,12 +558,13 @@ namespace WebsitePanel.Import.CsvBulk
//update mailbox //update mailbox
/*
ES.Services.ExchangeServer.SetMailboxGeneralSettings(orgId, accountId, mailbox.DisplayName, ES.Services.ExchangeServer.SetMailboxGeneralSettings(orgId, accountId, mailbox.DisplayName,
null, mailbox.HideFromAddressBook, mailbox.Disabled, mailbox.FirstName, mailbox.Initials, null, mailbox.HideFromAddressBook, mailbox.Disabled, mailbox.FirstName, mailbox.Initials,
mailbox.LastName, mailbox.Address, mailbox.City, mailbox.State, mailbox.Zip, mailbox.Country, mailbox.LastName, mailbox.Address, mailbox.City, mailbox.State, mailbox.Zip, mailbox.Country,
mailbox.JobTitle, mailbox.Company, mailbox.Department, mailbox.Office, null, mailbox.BusinessPhone, mailbox.JobTitle, mailbox.Company, mailbox.Department, mailbox.Office, null, mailbox.BusinessPhone,
mailbox.Fax, mailbox.HomePhone, mailbox.MobilePhone, mailbox.Pager, mailbox.WebPage, mailbox.Notes); mailbox.Fax, mailbox.HomePhone, mailbox.MobilePhone, mailbox.Pager, mailbox.WebPage, mailbox.Notes);
*/
ret = true; ret = true;
} }
catch (Exception ex) catch (Exception ex)
@ -672,7 +673,7 @@ namespace WebsitePanel.Import.CsvBulk
string name = emailAddress.Substring(0, emailAddress.IndexOf("@")); string name = emailAddress.Substring(0, emailAddress.IndexOf("@"));
string domain = emailAddress.Substring(emailAddress.IndexOf("@") + 1); string domain = emailAddress.Substring(emailAddress.IndexOf("@") + 1);
string accountName = string.Empty; string accountName = string.Empty;
int accountId = ES.Services.Organizations.CreateUser(orgId, displayName, name, domain, password, false, string.Empty); int accountId = ES.Services.Organizations.CreateUser(orgId, displayName, name, domain, password, string.Empty,false, string.Empty);
if (accountId < 0) if (accountId < 0)
{ {
@ -703,12 +704,13 @@ namespace WebsitePanel.Import.CsvBulk
user.Notes = notes; user.Notes = notes;
//update //update
/*
ES.Services.Organizations.SetUserGeneralSettings(orgId, accountId, user.DisplayName, ES.Services.Organizations.SetUserGeneralSettings(orgId, accountId, user.DisplayName,
null, false, user.Disabled, user.Locked, user.FirstName, user.Initials, null, false, user.Disabled, user.Locked, user.FirstName, user.Initials,
user.LastName, user.Address, user.City, user.State, user.Zip, user.Country, user.LastName, user.Address, user.City, user.State, user.Zip, user.Country,
user.JobTitle, user.Company, user.Department, user.Office, null, user.BusinessPhone, user.JobTitle, user.Company, user.Department, user.Office, null, user.BusinessPhone,
user.Fax, user.HomePhone, user.MobilePhone, user.Pager, user.WebPage, user.Notes, user.ExternalEmail); user.Fax, user.HomePhone, user.MobilePhone, user.Pager, user.WebPage, user.Notes, user.ExternalEmail);
*/
ret = true; ret = true;
} }
catch (Exception ex) catch (Exception ex)

41
WebsitePanel/build.xml
View file

@ -31,6 +31,7 @@
<ImportCsvSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.CsvBulk\bin\$(BuildConfiguration)</ImportCsvSrc> <ImportCsvSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.CsvBulk\bin\$(BuildConfiguration)</ImportCsvSrc>
<ImportEnterpriseSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.Enterprise\bin\$(BuildConfiguration)</ImportEnterpriseSrc> <ImportEnterpriseSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.Enterprise\bin\$(BuildConfiguration)</ImportEnterpriseSrc>
<AWStatsViewerSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.AWStats.Viewer</AWStatsViewerSrc> <AWStatsViewerSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.AWStats.Viewer</AWStatsViewerSrc>
<WSPTransportAgentSrc>$(TrunkFolder)\Sources\Tools\WSPTransportAgent</WSPTransportAgentSrc>
<ServerBuild>$(BuildFolder)\Server</ServerBuild> <ServerBuild>$(BuildFolder)\Server</ServerBuild>
<EnterpriseServerBuild>$(BuildFolder)\EnterpriseServer</EnterpriseServerBuild> <EnterpriseServerBuild>$(BuildFolder)\EnterpriseServer</EnterpriseServerBuild>
@ -38,8 +39,10 @@
<ImportCsvBuild>$(BuildFolder)\Import.CsvBulk</ImportCsvBuild> <ImportCsvBuild>$(BuildFolder)\Import.CsvBulk</ImportCsvBuild>
<ImportEnterpriseBuild>$(BuildFolder)\Import.Enterprise</ImportEnterpriseBuild> <ImportEnterpriseBuild>$(BuildFolder)\Import.Enterprise</ImportEnterpriseBuild>
<AWStatsViewerBuild>$(BuildFolder)\AWStats.Viewer</AWStatsViewerBuild> <AWStatsViewerBuild>$(BuildFolder)\AWStats.Viewer</AWStatsViewerBuild>
<WSPTransportAgentBuild>$(BuildFolder)\WSPTransportAgent</WSPTransportAgentBuild>
</PropertyGroup>
</PropertyGroup>
<Target Name="GenerateBuildVersionFiles"> <Target Name="GenerateBuildVersionFiles">
<AssemblyInfo CodeLanguage="CS" OutputFile="$(TrunkFolder)\Sources\VersionInfo.cs" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation." <AssemblyInfo CodeLanguage="CS" OutputFile="$(TrunkFolder)\Sources\VersionInfo.cs" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation."
@ -56,7 +59,8 @@
<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.CsvBulk.sln" Properties="Configuration=$(BuildConfiguration)" /> <MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.CsvBulk.sln" Properties="Configuration=$(BuildConfiguration)" />
<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.Enterprise.sln" Properties="Configuration=$(BuildConfiguration)" /> <MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.Enterprise.sln" Properties="Configuration=$(BuildConfiguration)" />
<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.AWStats.Viewer.sln" Properties="Configuration=$(BuildConfiguration)" /> <MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.AWStats.Viewer.sln" Properties="Configuration=$(BuildConfiguration)" />
</Target> <MSBuild Projects="$(TrunkFolder)\Sources\Tools\WSPTransportAgent.sln" Properties="Configuration=$(BuildConfiguration)" />
</Target>
<Target Name="PrepareBuilds" DependsOnTargets="CompileSources"> <Target Name="PrepareBuilds" DependsOnTargets="CompileSources">
<!-- Remove build output folders in reversed order (e.q. root folder removed last) --> <!-- Remove build output folders in reversed order (e.q. root folder removed last) -->
@ -66,6 +70,7 @@
<RemoveDir Directories="$(ImportCsvBuild)"/> <RemoveDir Directories="$(ImportCsvBuild)"/>
<RemoveDir Directories="$(ImportEnterpriseBuild)"/> <RemoveDir Directories="$(ImportEnterpriseBuild)"/>
<RemoveDir Directories="$(AWStatsViewerBuild)"/> <RemoveDir Directories="$(AWStatsViewerBuild)"/>
<RemoveDir Directories="$(WSPTransportAgentBuild)"/>
<RemoveDir Directories="$(BuildFolder)"/> <RemoveDir Directories="$(BuildFolder)"/>
<MakeDir Directories="$(BuildFolder)"/> <MakeDir Directories="$(BuildFolder)"/>
@ -75,6 +80,7 @@
<MakeDir Directories="$(ImportCsvBuild)"/> <MakeDir Directories="$(ImportCsvBuild)"/>
<MakeDir Directories="$(ImportEnterpriseBuild)"/> <MakeDir Directories="$(ImportEnterpriseBuild)"/>
<MakeDir Directories="$(AWStatsViewerBuild)"/> <MakeDir Directories="$(AWStatsViewerBuild)"/>
<MakeDir Directories="$(WSPTransportAgentBuild)"/>
</Target> </Target>
<Target Name="CreateServerBuild" DependsOnTargets="PrepareBuilds"> <Target Name="CreateServerBuild" DependsOnTargets="PrepareBuilds">
@ -184,7 +190,31 @@
<!-- Do nothing --> <!-- Do nothing -->
</Target> </Target>
<!-- Create full distributives --> <Target Name="CreateWSPTransportAgentBuild" DependsOnTargets="CreateImportEnterpriseBuild">
<ItemGroup>
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\.svn\**" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\obj\**" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\bin\*.xml" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\Release\**" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\Debug\**" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.pdb" Condition="'$(BuildConfiguration)' == 'Release'" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.user" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.suo" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.cs" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.csproj" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\Code\**" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.publish.xml" />
<WSPTransportAgentBuildFiles Include="$(WSPTransportAgentSrc)\**\*.*" Exclude="@(WSPTransportAgentBuildExclude)" />
</ItemGroup>
<Copy SourceFiles="@(WSPTransportAgentBuildFiles)" DestinationFolder="$(WSPTransportAgentBuild)\%(RecursiveDir)" />
</Target>
<Target Name="Build" DependsOnTargets="CreateWSPTransportAgentBuild">
<!-- Do nothing -->
</Target>
<!-- Create full distributives -->
<PropertyGroup> <PropertyGroup>
<InstallFolder>$(DeployFolder)\Install</InstallFolder> <InstallFolder>$(DeployFolder)\Install</InstallFolder>
<ServerInstall>$(InstallFolder)\Server</ServerInstall> <ServerInstall>$(InstallFolder)\Server</ServerInstall>
@ -197,6 +227,8 @@
<ImportCsvInstall>$(ToolsFolder)\Import.CsvBulk</ImportCsvInstall> <ImportCsvInstall>$(ToolsFolder)\Import.CsvBulk</ImportCsvInstall>
<ImportEnterpriseInstall>$(ToolsFolder)\Import.Enterprise</ImportEnterpriseInstall> <ImportEnterpriseInstall>$(ToolsFolder)\Import.Enterprise</ImportEnterpriseInstall>
<AWStatsViewerInstall>$(ToolsFolder)\AWStats.Viewer</AWStatsViewerInstall> <AWStatsViewerInstall>$(ToolsFolder)\AWStats.Viewer</AWStatsViewerInstall>
<WSPTransportAgentInstall>$(ToolsFolder)\WSPTransportAgent</WSPTransportAgentInstall>
</PropertyGroup> </PropertyGroup>
<Target Name="PrepareInstalls" DependsOnTargets="Build"> <Target Name="PrepareInstalls" DependsOnTargets="Build">
@ -428,6 +460,7 @@
<Zip Files="@(ImportCsvInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-Import-CsvBulk-$(FileVersion).zip" WorkingDirectory="$(ImportCsvInstall)" /> <Zip Files="@(ImportCsvInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-Import-CsvBulk-$(FileVersion).zip" WorkingDirectory="$(ImportCsvInstall)" />
<Zip Files="@(ImportEnterpriseInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-Import-Enterprise-$(FileVersion).zip" WorkingDirectory="$(ImportEnterpriseInstall)" /> <Zip Files="@(ImportEnterpriseInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-Import-Enterprise-$(FileVersion).zip" WorkingDirectory="$(ImportEnterpriseInstall)" />
<Zip Files="@(AWStatsViewerInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-AWStatsViewer-$(FileVersion).zip" WorkingDirectory="$(AWStatsViewerInstall)" /> <Zip Files="@(AWStatsViewerInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-AWStatsViewer-$(FileVersion).zip" WorkingDirectory="$(AWStatsViewerInstall)" />
</Target> <Zip Files="@(WSPTransportAgentInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(FileVersion).zip" WorkingDirectory="$(WSPTransportAgentInstall)" />
</Target>
</Project> </Project>