From d698a903ebd6b2a67edaf7d29fcbac9369f9d8b6 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 8 Jan 2013 22:29:17 +0000 Subject: [PATCH] Seriously, how hard can it be for AnkhSvn to commit ALL modified files? Major refactoring, renaming Activizr namespace to Swarmops. --- Backend/OneOffs.cs | 44 ++++++++-------- Backend/Program.cs | 45 ++++++++-------- Basic/Types/Communications/BasicAutoMail.cs | 6 +-- Basic/Types/Financial/BasicCashAdvance.cs | 4 +- Basic/Types/Governance/BasicMeeting.cs | 4 +- Basic/Types/Governance/BasicMotion.cs | 4 +- .../Types/Governance/BasicMotionAmendment.cs | 4 +- Basic/Types/Security/BasicAuthority.cs | 2 +- Console/Console.cs | 33 ++++++------ Console/DotNetChartingCrack.cs | 2 +- Site5/Automation/GetGeographyData.asmx | 2 +- Site5/Controls/v5/Base/LanguageSelector.ascx | 2 +- .../Controls/v5/Base/LanguageSelector.ascx.cs | 2 +- Site5/Controls/v5/Pirates/ComboPerson.ascx | 2 +- Site5/Controls/v5/Pirates/ComboPerson.ascx.cs | 12 ++--- .../v5/Pirates/PersonDetailPopup.ascx.cs | 6 +-- .../Json-ExpensableBudgetsTree.aspx.cs | 8 +-- .../v5/Finance/RequestCashAdvance.aspx.cs | 2 +- Site5/Pages/v5/Governance/AddMotion.aspx | 2 +- Site5/Pages/v5/Governance/AddMotion.aspx.cs | 6 +-- .../v5/Governance/AddMotionAmendment.aspx | 2 +- .../v5/Governance/AddMotionAmendment.aspx.cs | 4 +- Site5/Pages/v5/Governance/ListMotions.aspx | 2 +- Site5/Pages/v5/Governance/ListMotions.aspx.cs | 6 +-- Site5/Pages/v5/Governance/ViewMotion.aspx | 2 +- Site5/Pages/v5/Governance/ViewMotion.aspx.cs | 4 +- Site5/Pages/v5/Governance/Vote.aspx | 2 +- Site5/Pages/v5/Governance/Vote.aspx.cs | 4 +- Site5/Pages/v5/Governance/VoteAmendments.aspx | 2 +- .../v5/Governance/VoteAmendments.aspx.cs | 6 +-- Site5/Pages/v5/Init/Default.aspx.cs | 52 +++++++++---------- Site5/Security/Login.aspx | 4 +- Site5/Security/Login.aspx.cs | 10 ++-- Site5/Tests/TestBookkeepingIntegrity.aspx.cs | 4 +- Utility/BotCode/ActivityMailer.cs | 8 +-- .../EventProcessor.Designer.cs | 2 +- Utility/BotCode/BallotComposer.cs | 8 +-- Utility/BotCode/BlogTop50Scraper.cs | 6 +-- Utility/BotCode/BlogWatcher.cs | 8 ++- Utility/BotCode/BotLog.cs | 2 +- Utility/BotCode/EventProcessor.cs | 34 ++++++------ Utility/BotCode/HeartBeater.cs | 4 +- Utility/BotCode/InternalPollMaintenance.cs | 8 +-- Utility/BotCode/InternalPollRandomizer.cs | 4 +- Utility/BotCode/MailProcessor.cs | 30 +++++------ Utility/BotCode/MailResolver.cs | 14 ++--- Utility/BotCode/Mappery.cs | 10 ++-- Utility/BotCode/MediaWatcher.cs | 6 +-- Utility/BotCode/NewsletterChecker.cs | 17 +++--- Utility/BotCode/PressReleaseChecker.cs | 16 +++--- Utility/BotCode/RosterHousekeeping.cs | 22 ++++---- Utility/BotCode/SalaryProcessor.cs | 8 +-- Utility/BotCode/SchulzeProcessor.cs | 4 +- Utility/BotCode/TurnaroundTracker.cs | 14 ++--- Utility/BotCode/UpdateStatsCache.cs | 10 ++-- Utility/ExceptionMail.cs | 10 ++-- Utility/Financial/PaymentGroupMapper.cs | 6 +-- Utility/Financial/PaypalImporter.cs | 12 ++--- Utility/Financial/PaysonImporter.cs | 12 ++--- Utility/Mail/MailTransmitter.cs | 10 ++-- Utility/Mail/Newsletter.cs | 4 +- Utility/Mail/NewsletterTransmitter.cs | 8 +-- Utility/Mail/NewsletterTransmitter3.cs | 10 ++-- Utility/Mail/PressReleaseTransmitter.cs | 8 +-- Utility/Migrations/PeopleOptionalData.cs | 8 +-- Utility/Server/ActiveDirectoryCode.cs | 2 +- Utility/Server/ExchangeCode.cs | 2 +- Utility/Special/Sweden/SupportMailReview.cs | 10 ++-- .../Special/Sweden/SwedishForumMemberCheck.cs | 12 ++--- Utility/Special/UrlTranslator.cs | 2 +- 70 files changed, 322 insertions(+), 325 deletions(-) diff --git a/Backend/OneOffs.cs b/Backend/OneOffs.cs index ae1c95ea..382a9cb0 100644 --- a/Backend/OneOffs.cs +++ b/Backend/OneOffs.cs @@ -3,24 +3,24 @@ using System.Collections.Generic; using System.IO; using System.Net.Mail; using System.Text; -using Activizr.Basic; -using Activizr.Basic.Enums; -using Activizr.Basic.Types; -using Activizr.Database; -using Activizr.Logic.Communications; -using Activizr.Logic.Governance; -using Activizr.Logic.Financial; -using Activizr.Logic.Media; -using Activizr.Logic.Pirates; -using Activizr.Logic.Security; -using Activizr.Logic.Special.Sweden; -using Activizr.Logic.Structure; -using Activizr.Logic.Support; -using Activizr.Utility.BotCode; -using Activizr.Utility.Mail; -using Activizr.Utility.Special.Sweden; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Communications; +using Swarmops.Logic.Financial; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Security; +using Swarmops.Logic.Structure; +using Swarmops.Utility.Special.Sweden; +using Swarmops.Basic; +using Swarmops.Basic.Types; +using Swarmops.Database; +using Swarmops.Logic.Governance; +using Swarmops.Logic.Media; +using Swarmops.Logic.Special.Sweden; +using Swarmops.Logic.Support; +using Swarmops.Utility.BotCode; +using Swarmops.Utility.Mail; -namespace Activizr.Backend +namespace Swarmops.Backend { public class OneOffs @@ -1004,7 +1004,7 @@ namespace Activizr.Backend string password = Logic.Security.Authentication.CreateRandomPassword(16); //MailServerDatabase.SetNewPassword(person.PartyEmail, password); - Activizr.Utility.Mail.MailTransmitter mail = new Activizr.Utility.Mail.MailTransmitter + MailTransmitter mail = new MailTransmitter ("Rick Falkvinge (Piratpartiet)", "rick@piratpartiet.se", "TREDJE lösen till din mail - jag klantade mig", "Ok, jag är extremt klantig. Sorry. När det förra brevet gick ut nyss, så glömde jag ta bort koden som satte ett nytt lösen på allas mailkonton. Lösenordet byttes alltså alldeles nyss utan att du fick reda på det.\r\n\r\n" + @@ -1150,8 +1150,8 @@ namespace Activizr.Backend "Nu gör vi ett kanonresultat i valet 2009, och ser till att chocka etablissemanget ordentligt!\r\n\r\n" + "Hälsningar,\r\nRick\r\n\r\n"; - Activizr.Utility.Mail.MailTransmitter mail = - new Activizr.Utility.Mail.MailTransmitter("Rick Falkvinge (Piratpartiet)", + MailTransmitter mail = + new MailTransmitter("Rick Falkvinge (Piratpartiet)", "rick.falkvinge@piratpartiet.se", "Vill du vara aktiv medlem (\"aktivist\")?", mailBody, membership.Person); @@ -1194,9 +1194,9 @@ namespace Activizr.Backend public static void WriteFirstVolunteersToDb() { - Activizr.Basic.Types.BasicPWEvent[] events = PWEvents.ByType(EventType.NewVolunteer); + BasicPWEvent[] events = PWEvents.ByType(EventType.NewVolunteer); - foreach (Activizr.Basic.Types.BasicPWEvent newEvent in events) + foreach (BasicPWEvent newEvent in events) { Geography geography = Geography.FromIdentity(newEvent.GeographyId); string[] parts = newEvent.ParameterText.Split('|'); diff --git a/Backend/Program.cs b/Backend/Program.cs index af4f663e..3ade74a4 100644 --- a/Backend/Program.cs +++ b/Backend/Program.cs @@ -7,21 +7,22 @@ using System.Threading; using System.Net; using System.Net.Mail; -using Activizr.Basic; -using Activizr.Basic.Enums; -using Activizr.Logic.Financial; -using Activizr.Logic.Pirates; -using Activizr.Logic.Special.Sweden; -using Activizr.Logic.Structure; -using Activizr.Logic.Support; -using Activizr.Utility; -using Activizr.Utility.BotCode; -using Activizr.Utility.Financial; -using Activizr.Utility.Mail; +using Swarmops.Basic; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Financial; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Structure; using System.Diagnostics; -using Activizr.Utility.Special.Sweden; +using Swarmops.Logic.Special.Sweden; +using Swarmops.Logic.Support; +using Swarmops.Utility; +using Swarmops.Utility.BotCode; +using Swarmops.Utility.Financial; +using Swarmops.Utility.Mail; +using Swarmops.Utility.Special; +using Swarmops.Utility.Special.Sweden; -namespace Activizr.Backend +namespace Swarmops.Backend { internal class Program { @@ -60,7 +61,7 @@ namespace Activizr.Backend OnMidnight(); Console.Write("\r\nAll tests run. Waiting for mail queue to flush... "); - while (!Activizr.Utility.Mail.MailTransmitter.CanExit) + while (!MailTransmitter.CanExit) { System.Threading.Thread.Sleep(50); } @@ -110,7 +111,7 @@ namespace Activizr.Backend Console.Write("\r\nWaiting for mail queue to flush... "); - while (!Activizr.Utility.Mail.MailTransmitter.CanExit) + while (!MailTransmitter.CanExit) { System.Threading.Thread.Sleep(50); } @@ -154,7 +155,7 @@ namespace Activizr.Backend BotLog.Write(0, "MainCycle", "BOT STARTING, sending botstart notices"); - Activizr.Utility.Mail.MailTransmitter statusMail = new Activizr.Utility.Mail.MailTransmitter + MailTransmitter statusMail = new MailTransmitter ("PirateWeb-L", "noreply@pirateweb.net", "PirateBot-L starting", string.Empty, Person.FromIdentity(1)); statusMail.Send(); @@ -241,13 +242,13 @@ namespace Activizr.Backend ExceptionMail.Send(new Exception("HeartBeater triggered restart of MonoBot. Will commence after 800 seconds."), false); } - statusMail = new Activizr.Utility.Mail.MailTransmitter + statusMail = new MailTransmitter ("PirateWeb-L", "noreply@pirateweb.net", "PirateBot-L exiting", string.Empty, Person.FromIdentity(1)); statusMail.Send(); BotLog.Write(0, "MainCycle", "...done"); - while (!Activizr.Utility.Mail.MailTransmitter.CanExit) + while (!MailTransmitter.CanExit) { System.Threading.Thread.Sleep(50); } @@ -264,7 +265,7 @@ namespace Activizr.Backend try { TestTrace("Running EventProcessor.Run()..."); - Activizr.Utility.BotCode.EventProcessor.Run(); + EventProcessor.Run(); TestTrace(" done.\r\n"); } catch (Exception e) @@ -403,7 +404,7 @@ namespace Activizr.Backend { TestTrace("Running SupportMailReview.Run()..."); BotLog.Write(1, "FiveMinute", "Running support mail review"); - Activizr.Utility.Special.Sweden.SupportMailReview.Run(); + SupportMailReview.Run(); TestTrace(" done.\r\n"); } catch (Exception e) @@ -660,7 +661,7 @@ namespace Activizr.Backend try { TestTrace("Running SupportMailReview.Run()..."); - Activizr.Utility.Special.Sweden.SupportMailReview.Run(); + SupportMailReview.Run(); TestTrace(" done.\r\n"); } catch (Exception e) @@ -714,7 +715,7 @@ namespace Activizr.Backend { try { - string newUrl = Activizr.Utility.Special.UrlTranslator.Translate(url); + string newUrl = UrlTranslator.Translate(url); UrlTranslations.Set(url, newUrl); } catch (Exception e) diff --git a/Basic/Types/Communications/BasicAutoMail.cs b/Basic/Types/Communications/BasicAutoMail.cs index aa98aa42..73352ac3 100644 --- a/Basic/Types/Communications/BasicAutoMail.cs +++ b/Basic/Types/Communications/BasicAutoMail.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Basic.Enums; -using Activizr.Basic.Interfaces; +using Swarmops.Basic.Enums; +using Swarmops.Basic.Interfaces; -namespace Activizr.Basic.Types.Communications +namespace Swarmops.Basic.Types.Communications { public class BasicAutoMail : IHasIdentity { diff --git a/Basic/Types/Financial/BasicCashAdvance.cs b/Basic/Types/Financial/BasicCashAdvance.cs index 5960d83f..25f53497 100644 --- a/Basic/Types/Financial/BasicCashAdvance.cs +++ b/Basic/Types/Financial/BasicCashAdvance.cs @@ -1,7 +1,7 @@ using System; -using Activizr.Basic.Interfaces; +using Swarmops.Basic.Interfaces; -namespace Activizr.Basic.Types.Financial +namespace Swarmops.Basic.Types.Financial { [Serializable] public class BasicCashAdvance: IHasIdentity diff --git a/Basic/Types/Governance/BasicMeeting.cs b/Basic/Types/Governance/BasicMeeting.cs index b1c0b9f0..88153d67 100644 --- a/Basic/Types/Governance/BasicMeeting.cs +++ b/Basic/Types/Governance/BasicMeeting.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Basic.Interfaces; +using Swarmops.Basic.Interfaces; -namespace Activizr.Basic.Types.Governance +namespace Swarmops.Basic.Types.Governance { public class BasicMeeting: IHasIdentity { diff --git a/Basic/Types/Governance/BasicMotion.cs b/Basic/Types/Governance/BasicMotion.cs index 4a67b7fb..6e6c794f 100644 --- a/Basic/Types/Governance/BasicMotion.cs +++ b/Basic/Types/Governance/BasicMotion.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Basic.Interfaces; +using Swarmops.Basic.Interfaces; -namespace Activizr.Basic.Types.Governance +namespace Swarmops.Basic.Types.Governance { public class BasicMotion: IHasIdentity { diff --git a/Basic/Types/Governance/BasicMotionAmendment.cs b/Basic/Types/Governance/BasicMotionAmendment.cs index 02596520..1ab2ccf5 100644 --- a/Basic/Types/Governance/BasicMotionAmendment.cs +++ b/Basic/Types/Governance/BasicMotionAmendment.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Basic.Interfaces; +using Swarmops.Basic.Interfaces; -namespace Activizr.Basic.Types.Governance +namespace Swarmops.Basic.Types.Governance { public class BasicMotionAmendment: IHasIdentity { diff --git a/Basic/Types/Security/BasicAuthority.cs b/Basic/Types/Security/BasicAuthority.cs index 94661772..43112b55 100644 --- a/Basic/Types/Security/BasicAuthority.cs +++ b/Basic/Types/Security/BasicAuthority.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace Activizr.Basic.Types.Security +namespace Swarmops.Basic.Types.Security { /// /// Container of a person's authority within PirateWeb. diff --git a/Console/Console.cs b/Console/Console.cs index 56f66d33..0adc28c5 100644 --- a/Console/Console.cs +++ b/Console/Console.cs @@ -8,27 +8,28 @@ using System.Text.RegularExpressions; using System.IO; using System.Web; using System.Web.Mail; -using Activizr.Basic.Enums; -using Activizr.Basic.Types; -using Activizr.Database; -using Activizr.Utility.BotCode; -using Activizr.Utility.Mail; -using Activizr.Utility.Special.Sweden; -using Activizr.Basic; -using Activizr.Logic.Governance; -using Activizr.Logic.Financial; -using Activizr.Logic.Pirates; -using Activizr.Logic.Structure; -using Activizr.Logic.Support; -using Activizr.Utility; -using Activizr.Utility.Server; +using Swarmops.Basic.Enums; +using Swarmops.Basic; +using Swarmops.Logic.Financial; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Structure; +using Swarmops.Utility; +using Swarmops.Utility.Server; +using Swarmops.Basic.Types; +using Swarmops.Database; +using Swarmops.Logic.Governance; +using Swarmops.Logic.Special.Sweden; +using Swarmops.Logic.Support; +using Swarmops.Utility.BotCode; +using Swarmops.Utility.Mail; +using Swarmops.Utility.Special.Sweden; /* using ceTe.DynamicPDF; using ceTe.DynamicPDF.PageElements; */ -namespace Activizr +namespace Swarmops { /// /// This class is solely used for one-off operations, like tests or one-time imports, that run @@ -768,7 +769,7 @@ namespace Activizr private static void ValidatePoll (int pollId, Geography geography, DateTime cutoffMembershipDate) { - Dictionary result = Activizr.Logic.Special.Sweden.SwedishForumDatabase.GetDatabase().GetPollVotes (pollId); + Dictionary result = SwedishForumDatabase.GetDatabase().GetPollVotes (pollId); foreach (string pollAlternative in result.Keys) { diff --git a/Console/DotNetChartingCrack.cs b/Console/DotNetChartingCrack.cs index cb02bbc5..0ef5a69b 100644 --- a/Console/DotNetChartingCrack.cs +++ b/Console/DotNetChartingCrack.cs @@ -4,7 +4,7 @@ using System.IO; using System.Security.Cryptography; using System.Text; -namespace Activizr +namespace Swarmops { public class DotNetChartingCrack { diff --git a/Site5/Automation/GetGeographyData.asmx b/Site5/Automation/GetGeographyData.asmx index 64ad3857..4eba5592 100644 --- a/Site5/Automation/GetGeographyData.asmx +++ b/Site5/Automation/GetGeographyData.asmx @@ -4,7 +4,7 @@ using System; using System.Web; using System.Web.Services; using System.Web.Services.Protocols; -using Activizr.Logic.Structure; +using Swarmops.Logic.Structure; [WebService(Namespace = "http://activizr.com/")] [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)] diff --git a/Site5/Controls/v5/Base/LanguageSelector.ascx b/Site5/Controls/v5/Base/LanguageSelector.ascx index dbbb0642..16cf04fa 100644 --- a/Site5/Controls/v5/Base/LanguageSelector.ascx +++ b/Site5/Controls/v5/Base/LanguageSelector.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="LanguageSelector.ascx.cs" Inherits="Activizr.Controls.Base.LanguageSelector" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="LanguageSelector.ascx.cs" Inherits="Swarmops.Controls.Base.LanguageSelector" %>
diff --git a/Site5/Controls/v5/Base/LanguageSelector.ascx.cs b/Site5/Controls/v5/Base/LanguageSelector.ascx.cs index 0c9e4f20..dd2e6598 100644 --- a/Site5/Controls/v5/Base/LanguageSelector.ascx.cs +++ b/Site5/Controls/v5/Base/LanguageSelector.ascx.cs @@ -4,7 +4,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -namespace Activizr.Controls.Base +namespace Swarmops.Controls.Base { public partial class LanguageSelector : System.Web.UI.UserControl diff --git a/Site5/Controls/v5/Pirates/ComboPerson.ascx b/Site5/Controls/v5/Pirates/ComboPerson.ascx index 77d10f9c..11ec639c 100644 --- a/Site5/Controls/v5/Pirates/ComboPerson.ascx +++ b/Site5/Controls/v5/Pirates/ComboPerson.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="ComboPerson.ascx.cs" Inherits="Activizr.Controls.Pirates.ComboPerson" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="ComboPerson.ascx.cs" Inherits="Swarmops.Controls.Pirates.ComboPerson" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="AddMotion.aspx.cs" Inherits="Swarmops.Pages.Governance.AddMotion" %> <%@ Register src="~/Controls/v5/Pirates/ComboPerson.ascx" tagname="ComboPerson" tagprefix="act5" %> diff --git a/Site5/Pages/v5/Governance/AddMotion.aspx.cs b/Site5/Pages/v5/Governance/AddMotion.aspx.cs index b0566fb6..6d9a896f 100644 --- a/Site5/Pages/v5/Governance/AddMotion.aspx.cs +++ b/Site5/Pages/v5/Governance/AddMotion.aspx.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using Activizr.Logic.Governance; -using Activizr.Logic.Pirates; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Governance; -namespace Activizr.Pages.Governance +namespace Swarmops.Pages.Governance { public partial class AddMotion : PageV5Base diff --git a/Site5/Pages/v5/Governance/AddMotionAmendment.aspx b/Site5/Pages/v5/Governance/AddMotionAmendment.aspx index 60eb71ac..ba82db76 100644 --- a/Site5/Pages/v5/Governance/AddMotionAmendment.aspx +++ b/Site5/Pages/v5/Governance/AddMotionAmendment.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="AddMotionAmendment.aspx.cs" Inherits="Activizr.Pages.Governance.AddMotionAmendment" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="AddMotionAmendment.aspx.cs" Inherits="Swarmops.Pages.Governance.AddMotionAmendment" %> <%@ Register src="~/Controls/v5/Pirates/ComboPerson.ascx" tagname="ComboPerson" tagprefix="act5" %> diff --git a/Site5/Pages/v5/Governance/AddMotionAmendment.aspx.cs b/Site5/Pages/v5/Governance/AddMotionAmendment.aspx.cs index 239c7210..0f9bddde 100644 --- a/Site5/Pages/v5/Governance/AddMotionAmendment.aspx.cs +++ b/Site5/Pages/v5/Governance/AddMotionAmendment.aspx.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using Activizr.Logic.Governance; +using Swarmops.Logic.Governance; -namespace Activizr.Pages.Governance +namespace Swarmops.Pages.Governance { public partial class AddMotionAmendment : PageV5Base { diff --git a/Site5/Pages/v5/Governance/ListMotions.aspx b/Site5/Pages/v5/Governance/ListMotions.aspx index a07ff3b9..c28a3079 100644 --- a/Site5/Pages/v5/Governance/ListMotions.aspx +++ b/Site5/Pages/v5/Governance/ListMotions.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="ListMotions.aspx.cs" Inherits="Activizr.Pages.Governance.ListMotions" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="ListMotions.aspx.cs" Inherits="Swarmops.Pages.Governance.ListMotions" %> diff --git a/Site5/Pages/v5/Governance/ListMotions.aspx.cs b/Site5/Pages/v5/Governance/ListMotions.aspx.cs index d2c2c03f..c05b6b98 100644 --- a/Site5/Pages/v5/Governance/ListMotions.aspx.cs +++ b/Site5/Pages/v5/Governance/ListMotions.aspx.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using Activizr.Logic.Governance; +using Swarmops.Logic.Governance; using Telerik.Web.UI; -namespace Activizr.Pages.Governance +namespace Swarmops.Pages.Governance { public partial class ListMotions : PageV5Base { @@ -33,7 +33,7 @@ namespace Activizr.Pages.Governance this.GridMotions.DataBind(); } - ((Activizr.MasterV5) Master).LanguageChanged += new EventHandler(Master_LanguageChanged); + ((Swarmops.MasterV5) Master).LanguageChanged += new EventHandler(Master_LanguageChanged); } diff --git a/Site5/Pages/v5/Governance/ViewMotion.aspx b/Site5/Pages/v5/Governance/ViewMotion.aspx index ff6ccaf7..d8483d4f 100644 --- a/Site5/Pages/v5/Governance/ViewMotion.aspx +++ b/Site5/Pages/v5/Governance/ViewMotion.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="ViewMotion.aspx.cs" Inherits="Activizr.Pages.Governance.ViewMotion" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="ViewMotion.aspx.cs" Inherits="Swarmops.Pages.Governance.ViewMotion" %> diff --git a/Site5/Pages/v5/Governance/ViewMotion.aspx.cs b/Site5/Pages/v5/Governance/ViewMotion.aspx.cs index d8da7b3d..8a07dcb4 100644 --- a/Site5/Pages/v5/Governance/ViewMotion.aspx.cs +++ b/Site5/Pages/v5/Governance/ViewMotion.aspx.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using Activizr.Logic.Governance; +using Swarmops.Logic.Governance; -namespace Activizr.Pages.Governance +namespace Swarmops.Pages.Governance { public partial class ViewMotion : PageV5Base { diff --git a/Site5/Pages/v5/Governance/Vote.aspx b/Site5/Pages/v5/Governance/Vote.aspx index aa141d0b..b55880ba 100644 --- a/Site5/Pages/v5/Governance/Vote.aspx +++ b/Site5/Pages/v5/Governance/Vote.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="Vote.aspx.cs" Inherits="Activizr.Pages.Governance.Vote" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="Vote.aspx.cs" Inherits="Swarmops.Pages.Governance.Vote" %> diff --git a/Site5/Pages/v5/Governance/Vote.aspx.cs b/Site5/Pages/v5/Governance/Vote.aspx.cs index 16aea73c..24cb02d3 100644 --- a/Site5/Pages/v5/Governance/Vote.aspx.cs +++ b/Site5/Pages/v5/Governance/Vote.aspx.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using Activizr.Logic.Governance; +using Swarmops.Logic.Governance; -namespace Activizr.Pages.Governance +namespace Swarmops.Pages.Governance { public partial class Vote : PageV5Base diff --git a/Site5/Pages/v5/Governance/VoteAmendments.aspx b/Site5/Pages/v5/Governance/VoteAmendments.aspx index 29d8d7b3..fef2da1e 100644 --- a/Site5/Pages/v5/Governance/VoteAmendments.aspx +++ b/Site5/Pages/v5/Governance/VoteAmendments.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" EnableEventValidation="false" AutoEventWireup="true" CodeFile="VoteAmendments.aspx.cs" Inherits="Activizr.Pages.Governance.VoteAmendments" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" EnableEventValidation="false" AutoEventWireup="true" CodeFile="VoteAmendments.aspx.cs" Inherits="Swarmops.Pages.Governance.VoteAmendments" %> diff --git a/Site5/Pages/v5/Governance/VoteAmendments.aspx.cs b/Site5/Pages/v5/Governance/VoteAmendments.aspx.cs index 82521b39..1a7c2e4b 100644 --- a/Site5/Pages/v5/Governance/VoteAmendments.aspx.cs +++ b/Site5/Pages/v5/Governance/VoteAmendments.aspx.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using Activizr.Logic.Governance; -using Activizr.Logic.Pirates; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Governance; using Telerik.Web.UI; -namespace Activizr.Pages.Governance +namespace Swarmops.Pages.Governance { public partial class VoteAmendments : PageV5Base { diff --git a/Site5/Pages/v5/Init/Default.aspx.cs b/Site5/Pages/v5/Init/Default.aspx.cs index 9d328cb9..10b15ba3 100644 --- a/Site5/Pages/v5/Init/Default.aspx.cs +++ b/Site5/Pages/v5/Init/Default.aspx.cs @@ -12,13 +12,13 @@ using System.Web.Services.Protocols; using System.Web.SessionState; using System.Web.UI; using System.Web.UI.WebControls; -using Activizr.Basic.Enums; -using Activizr.Basic.Types; -using Activizr.Site.Automation; +using Swarmops.Basic.Enums; +using Swarmops.Basic.Types; +using Swarmops.Site.Automation; using Telerik.Web.UI; -using Activizr.Database; -using Country = Activizr.Logic.Structure.Country; +using Swarmops.Database; +using Country = Swarmops.Logic.Structure.Country; public partial class Pages_v5_Init_Default : System.Web.UI.Page { @@ -292,11 +292,11 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page // Make sure we're uninitialized bool organizationOneExists = false; - Activizr.Logic.Structure.Organization organizationOne = null; + Swarmops.Logic.Structure.Organization organizationOne = null; try { - organizationOne = Activizr.Logic.Structure.Organization.FromIdentity(1); + organizationOne = Swarmops.Logic.Structure.Organization.FromIdentity(1); organizationOneExists = true; } catch (Exception) @@ -329,7 +329,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page // Get the schema and initialize the database structures. Requires ADMIN access to database. - Activizr.Logic.Support.DatabaseMaintenance.FirstInitialization(); + Swarmops.Logic.Support.DatabaseMaintenance.FirstInitialization(); _initProgress = 5; _initMessage = "Getting list of countries from Activizr servers..."; @@ -348,9 +348,9 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page // Get the list of countries - Activizr.Site.Automation.GetGeographyData geoDataFetcher = new GetGeographyData(); + Swarmops.Site.Automation.GetGeographyData geoDataFetcher = new GetGeographyData(); - Activizr.Site.Automation.Country[] countries = geoDataFetcher.GetCountries(); + Swarmops.Site.Automation.Country[] countries = geoDataFetcher.GetCountries(); _initProgress = 7; _initMessage = "Creating all countries on local server..."; @@ -358,7 +358,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page // Create all countries in our own database - foreach (Activizr.Site.Automation.Country country in countries) + foreach (Swarmops.Site.Automation.Country country in countries) { countryIdTranslation[country.Code] = PirateDb.GetDatabaseForWriting().CreateCountry(country.Name, country.Code, @@ -373,7 +373,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page List initializableCountries = new List(); - foreach (Activizr.Site.Automation.Country country in countries) + foreach (Swarmops.Site.Automation.Country country in countries) { if (country.GeographyId != 1) { @@ -393,7 +393,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page _initMessage = "Retrieving geography for " + countryCode + "..."; Thread.Sleep(100); - Activizr.Site.Automation.Geography geography = geoDataFetcher.GetGeographyForCountry(countryCode); + Swarmops.Site.Automation.Geography geography = geoDataFetcher.GetGeographyForCountry(countryCode); _initProgress = 10 + (int) (countryCount*initStepPerCountry + initStepPerCountry/6); _initMessage = "Setting up geography for " + countryCode + "..."; @@ -416,7 +416,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page // Get the postal codes and cities - Activizr.Site.Automation.City[] cities = null; + Swarmops.Site.Automation.City[] cities = null; try { @@ -435,11 +435,11 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page _initMessage = "Retrieving postal codes for " + countryCode + "..."; Thread.Sleep(100); - Activizr.Site.Automation.PostalCode[] postalCodes = geoDataFetcher.GetPostalCodesForCountry(countryCode); + Swarmops.Site.Automation.PostalCode[] postalCodes = geoDataFetcher.GetPostalCodesForCountry(countryCode); // Find which cities are actually used - foreach (Activizr.Site.Automation.PostalCode postalCode in postalCodes) + foreach (Swarmops.Site.Automation.PostalCode postalCode in postalCodes) { cityIdsUsedLookup[postalCode.CityId] = true; } @@ -457,7 +457,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page StringBuilder sqlCityBuild = new StringBuilder("INSERT INTO Cities (CityName, GeographyId, CountryId, Comment) VALUES ", 65536); bool insertComma = false; - foreach (Activizr.Site.Automation.City city in cities) + foreach (Swarmops.Site.Automation.City city in cities) { if (!geographyIdTranslation.ContainsKey(city.GeographyId)) { @@ -493,7 +493,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page StringBuilder sqlBuild = new StringBuilder("INSERT INTO PostalCodes (PostalCode, CityId, CountryId) VALUES ", 65536); insertComma = false; - foreach (Activizr.Site.Automation.PostalCode postalCode in postalCodes) + foreach (Swarmops.Site.Automation.PostalCode postalCode in postalCodes) { if (cityIdsUsedLookup[postalCode.CityId] == false) { @@ -525,9 +525,9 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page // Create the sandbox - Activizr.Logic.Structure.Organization.Create(0, "Sandbox", "Sandbox", "Sandbox", "activizr.com", "Act", + Swarmops.Logic.Structure.Organization.Create(0, "Sandbox", "Sandbox", "Sandbox", "activizr.com", "Act", rootGeographyId, true, - true, 0).EnableEconomy(Activizr.Logic.Financial.Currency.FromCode("EUR")); + true, 0).EnableEconomy(Swarmops.Logic.Financial.Currency.FromCode("EUR")); _initProgress = 100; _initMessage = "Complete."; @@ -535,11 +535,11 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page Thread.Sleep(1000); // give some time for static var to stick and web interface to react before killing thread } - private static void InitDatabaseThreadCreateGeographyChildren(Activizr.Site.Automation.Geography[] children, + private static void InitDatabaseThreadCreateGeographyChildren(Swarmops.Site.Automation.Geography[] children, int parentGeographyId, ref Dictionary geographyIdTranslation) { - foreach (Activizr.Site.Automation.Geography geography in children) + foreach (Swarmops.Site.Automation.Geography geography in children) { int newGeographyId = PirateDb.GetDatabaseForWriting().CreateGeography(geography.Name, parentGeographyId); geographyIdTranslation[geography.GeographyId] = newGeographyId; @@ -632,12 +632,12 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page { // Make sure that no first person exists already, as a security measure - Activizr.Logic.Pirates.Person personOne = null; + Swarmops.Logic.Pirates.Person personOne = null; bool personOneExists = false; try { - personOne = Activizr.Logic.Pirates.Person.FromIdentity(1); + personOne = Swarmops.Logic.Pirates.Person.FromIdentity(1); if (System.Diagnostics.Debugger.IsAttached) { if (personOne.CityName != "Duckville" || personOne.Email != "noreply@example.com") @@ -665,7 +665,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page throw new InvalidOperationException("Cannot run initialization processes again when initialized."); } - Activizr.Logic.Pirates.Person newPerson = Activizr.Logic.Pirates.Person.Create(HttpUtility.UrlDecode(name), HttpUtility.UrlDecode(mail), + Swarmops.Logic.Pirates.Person newPerson = Swarmops.Logic.Pirates.Person.Create(HttpUtility.UrlDecode(name), HttpUtility.UrlDecode(mail), HttpUtility.UrlDecode(password), string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, DateTime.MinValue, PersonGender.Unknown); @@ -684,7 +684,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page return; // Probable hack attempt - fail silently } - Activizr.Logic.Pirates.Person expectedPersonOne = Activizr.Logic.Security.Authentication.Authenticate("1", this.TextFirstUserPassword1.Text); + Swarmops.Logic.Pirates.Person expectedPersonOne = Swarmops.Logic.Security.Authentication.Authenticate("1", this.TextFirstUserPassword1.Text); if (expectedPersonOne != null) { diff --git a/Site5/Security/Login.aspx b/Site5/Security/Login.aspx index cd2a8081..e9131a6c 100644 --- a/Site5/Security/Login.aspx +++ b/Site5/Security/Login.aspx @@ -1,5 +1,5 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Login.aspx.cs" EnableViewState="true" Inherits="Activizr.Pages.Security.Login" %> -<%@ Import Namespace="Activizr.Database" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Login.aspx.cs" EnableViewState="true" Inherits="Swarmops.Pages.Security.Login" %> +<%@ Import Namespace="Swarmops.Database" %> <%@ Import Namespace="Telerik.Web.UI" %> <%@ Register TagPrefix="telerik" Assembly="Telerik.Web.UI" Namespace="Telerik.Web.UI" %> diff --git a/Site5/Security/Login.aspx.cs b/Site5/Security/Login.aspx.cs index 980e20f5..89a4ed26 100644 --- a/Site5/Security/Login.aspx.cs +++ b/Site5/Security/Login.aspx.cs @@ -6,11 +6,11 @@ using System.Web; using System.Web.Security; using System.Web.UI; using System.Web.UI.WebControls; -using Activizr.Basic.Types; -using Activizr.Database; -using Activizr.Logic.Pirates; +using Swarmops.Logic.Pirates; +using Swarmops.Basic.Types; +using Swarmops.Database; -namespace Activizr.Pages.Security +namespace Swarmops.Pages.Security { public partial class Login : System.Web.UI.Page { @@ -51,7 +51,7 @@ namespace Activizr.Pages.Security { try { - BasicPerson authenticatedPerson = Activizr.Logic.Security.Authentication.Authenticate(loginToken, password); + BasicPerson authenticatedPerson = Swarmops.Logic.Security.Authentication.Authenticate(loginToken, password); Person p = Person.FromIdentity(authenticatedPerson.PersonId); if (p.PreferredCulture != Thread.CurrentThread.CurrentCulture.Name) diff --git a/Site5/Tests/TestBookkeepingIntegrity.aspx.cs b/Site5/Tests/TestBookkeepingIntegrity.aspx.cs index 6befe2ac..0e2ece0c 100644 --- a/Site5/Tests/TestBookkeepingIntegrity.aspx.cs +++ b/Site5/Tests/TestBookkeepingIntegrity.aspx.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using Activizr.Basic.Enums; -using Activizr.Logic.Financial; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Financial; public partial class Tests_TestBookkeepingIntegrity : PageV5Base { diff --git a/Utility/BotCode/ActivityMailer.cs b/Utility/BotCode/ActivityMailer.cs index a50ebb2b..cac64bd3 100644 --- a/Utility/BotCode/ActivityMailer.cs +++ b/Utility/BotCode/ActivityMailer.cs @@ -4,11 +4,11 @@ using System.Configuration; using System.Net.Mail; using System.Text; using System.Web; -using Activizr.Basic.Enums; -using Activizr.Logic.Pirates; -using Activizr.Logic.Structure; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Structure; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class ActivityMailer { diff --git a/Utility/BotCode/App_LocalResources/EventProcessor.Designer.cs b/Utility/BotCode/App_LocalResources/EventProcessor.Designer.cs index cdd76fb2..1985baf5 100644 --- a/Utility/BotCode/App_LocalResources/EventProcessor.Designer.cs +++ b/Utility/BotCode/App_LocalResources/EventProcessor.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Activizr.Utility.BotCode.App_LocalResources { +namespace Swarmops.Utility.BotCode.App_LocalResources { using System; diff --git a/Utility/BotCode/BallotComposer.cs b/Utility/BotCode/BallotComposer.cs index feb66eb3..eb020a85 100644 --- a/Utility/BotCode/BallotComposer.cs +++ b/Utility/BotCode/BallotComposer.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Basic.Enums; -using Activizr.Logic.Governance; -using Activizr.Logic.Structure; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Governance; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class BallotComposer { diff --git a/Utility/BotCode/BlogTop50Scraper.cs b/Utility/BotCode/BlogTop50Scraper.cs index 09c7ff7d..9a246b1d 100644 --- a/Utility/BotCode/BlogTop50Scraper.cs +++ b/Utility/BotCode/BlogTop50Scraper.cs @@ -4,10 +4,10 @@ using System.IO; using System.Text; using System.Text.RegularExpressions; using System.Net; -using Activizr.Database; -using Activizr.Logic; +using Swarmops.Logic; +using Swarmops.Database; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class BlogTop50Scraper { diff --git a/Utility/BotCode/BlogWatcher.cs b/Utility/BotCode/BlogWatcher.cs index 1f2c1503..a3010bf0 100644 --- a/Utility/BotCode/BlogWatcher.cs +++ b/Utility/BotCode/BlogWatcher.cs @@ -2,14 +2,12 @@ using System; using System.Collections.Generic; using System.Text; using System.Net; - -using Activizr.Logic.Media; - using NRss; -using Activizr.Logic.Support; +using Swarmops.Logic.Support; +using Swarmops.Logic.Media; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class BlogWatcher { diff --git a/Utility/BotCode/BotLog.cs b/Utility/BotCode/BotLog.cs index e590f655..24955f29 100644 --- a/Utility/BotCode/BotLog.cs +++ b/Utility/BotCode/BotLog.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Text; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class BotLog { diff --git a/Utility/BotCode/EventProcessor.cs b/Utility/BotCode/EventProcessor.cs index cffebe86..3c28b7be 100644 --- a/Utility/BotCode/EventProcessor.cs +++ b/Utility/BotCode/EventProcessor.cs @@ -3,23 +3,23 @@ using System.Collections.Generic; using System.Globalization; using System.Net.Mail; using System.Text; -using Activizr.Basic; -using Activizr.Basic.Enums; -using Activizr.Basic.Types; -using Activizr.Utility.Financial; -using Activizr.Utility.Mail; -using Activizr.Database; -using Activizr.Logic.Communications; -using Activizr.Logic.Governance; -using Activizr.Logic.Financial; -using Activizr.Logic.Pirates; -using Activizr.Logic.Security; -using Activizr.Logic.Special.Mail; -using Activizr.Logic.Structure; -using Activizr.Logic.Support; +using Swarmops.Basic.Enums; +using Swarmops.Database; +using Swarmops.Logic.Communications; +using Swarmops.Logic.Financial; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Security; +using Swarmops.Logic.Structure; using System.Threading; +using Swarmops.Basic; +using Swarmops.Basic.Types; +using Swarmops.Logic.Governance; +using Swarmops.Logic.Special.Mail; +using Swarmops.Logic.Support; +using Swarmops.Utility.Financial; +using Swarmops.Utility.Mail; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class EventProcessor { @@ -1495,8 +1495,8 @@ namespace Activizr.Utility.BotCode string password = Formatting.GeneratePassword(16); - Activizr.Logic.Special.Mail.MailServerDatabase.AddAccount(newAddress, password, 1024); - Activizr.Logic.Special.Mail.MailServerDatabase.StartForwarding(oldAddress, newAddress); + MailServerDatabase.AddAccount(newAddress, password, 1024); + MailServerDatabase.StartForwarding(oldAddress, newAddress); newMailPerson.PartyEmail = newAddress; diff --git a/Utility/BotCode/HeartBeater.cs b/Utility/BotCode/HeartBeater.cs index ba144b7f..38befa90 100644 --- a/Utility/BotCode/HeartBeater.cs +++ b/Utility/BotCode/HeartBeater.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.Text; using System.IO; -using Activizr.Logic.Support; +using Swarmops.Logic.Support; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class HeartBeater { diff --git a/Utility/BotCode/InternalPollMaintenance.cs b/Utility/BotCode/InternalPollMaintenance.cs index 1ba68a32..51e278f0 100644 --- a/Utility/BotCode/InternalPollMaintenance.cs +++ b/Utility/BotCode/InternalPollMaintenance.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Logic.Governance; -using Activizr.Logic.Pirates; -using Activizr.Logic.Structure; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Governance; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class InternalPollMaintenance { diff --git a/Utility/BotCode/InternalPollRandomizer.cs b/Utility/BotCode/InternalPollRandomizer.cs index 949546b8..066b72d0 100644 --- a/Utility/BotCode/InternalPollRandomizer.cs +++ b/Utility/BotCode/InternalPollRandomizer.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Logic.Governance; +using Swarmops.Logic.Governance; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class InternalPollRandomizer { diff --git a/Utility/BotCode/MailProcessor.cs b/Utility/BotCode/MailProcessor.cs index e8c6ca52..fbb1edd4 100644 --- a/Utility/BotCode/MailProcessor.cs +++ b/Utility/BotCode/MailProcessor.cs @@ -5,17 +5,17 @@ using System.IO; using System.Text; using System.Net.Mail; using System.Net.Mime; -using Activizr.Basic; -using Activizr.Basic.Enums; -using Activizr.Utility.Mail; -using Activizr.Basic.Diagnostics; -using Activizr.Logic.Communications; -using Activizr.Logic.Media; -using Activizr.Logic.Pirates; -using Activizr.Logic.Support; +using Swarmops.Basic.Enums; +using Swarmops.Basic.Diagnostics; +using Swarmops.Logic.Communications; +using Swarmops.Logic.Pirates; using System.Threading; +using Swarmops.Basic; +using Swarmops.Logic.Media; +using Swarmops.Logic.Support; +using Swarmops.Utility.Mail; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class MailProcessor { @@ -62,14 +62,14 @@ namespace Activizr.Utility.BotCode } #endregion - static Activizr.Logic.Support.QuotedPrintable qpUTF8 = new Activizr.Logic.Support.QuotedPrintable(Encoding.UTF8); - static Activizr.Logic.Support.QuotedPrintable qp8859 = new Activizr.Logic.Support.QuotedPrintable(Encoding.GetEncoding("ISO-8859-1")); - static Dictionary QuotedPrintableEncoder = InitQpDictionary(); + static QuotedPrintable qpUTF8 = new QuotedPrintable(Encoding.UTF8); + static QuotedPrintable qp8859 = new QuotedPrintable(Encoding.GetEncoding("ISO-8859-1")); + static Dictionary QuotedPrintableEncoder = InitQpDictionary(); #region Static initialisation - static private Dictionary InitQpDictionary () + static private Dictionary InitQpDictionary () { - Dictionary qp = new Dictionary(); + Dictionary qp = new Dictionary(); qp[Encoding.UTF8] = qpUTF8; qp[Encoding.GetEncoding("ISO-8859-1")] = qp8859; return qp; @@ -375,7 +375,7 @@ namespace Activizr.Utility.BotCode else currentEncoding = Encoding.UTF8; - Activizr.Logic.Support.QuotedPrintable qp = QuotedPrintableEncoder[currentEncoding]; + QuotedPrintable qp = QuotedPrintableEncoder[currentEncoding]; MailMessage message = new MailMessage(); diff --git a/Utility/BotCode/MailResolver.cs b/Utility/BotCode/MailResolver.cs index 8ec4bb0b..6ff4d83c 100644 --- a/Utility/BotCode/MailResolver.cs +++ b/Utility/BotCode/MailResolver.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Basic.Enums; -using Activizr.Logic.Communications; -using Activizr.Utility.Mail; -using Activizr.Logic.Pirates; -using Activizr.Logic.Structure; -using Activizr.Logic.Support; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Communications; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Support; +using Swarmops.Utility.Mail; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class MailResolver { diff --git a/Utility/BotCode/Mappery.cs b/Utility/BotCode/Mappery.cs index a0390c06..6665136a 100644 --- a/Utility/BotCode/Mappery.cs +++ b/Utility/BotCode/Mappery.cs @@ -4,13 +4,13 @@ using System.IO; using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; -using Activizr.Basic.Enums; -using Activizr.Logic.Pirates; -using Activizr.Logic.Structure; -using Activizr.Logic.Support; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Support; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class Mappery { diff --git a/Utility/BotCode/MediaWatcher.cs b/Utility/BotCode/MediaWatcher.cs index 352ce261..92a7227a 100644 --- a/Utility/BotCode/MediaWatcher.cs +++ b/Utility/BotCode/MediaWatcher.cs @@ -2,12 +2,10 @@ using System; using System.Collections.Generic; using System.Text; using System.Net; - -using Activizr.Logic.Media; - using NRss; +using Swarmops.Logic.Media; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class MediaWatcher { diff --git a/Utility/BotCode/NewsletterChecker.cs b/Utility/BotCode/NewsletterChecker.cs index c7cd6350..33981131 100644 --- a/Utility/BotCode/NewsletterChecker.cs +++ b/Utility/BotCode/NewsletterChecker.cs @@ -2,18 +2,17 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Logic.Pirates; -using Activizr.Logic.Structure; -using Activizr.Logic.Support; -using Activizr.Utility.Mail; -using Activizr.Utility.Special.Sweden; -using Activizr.Logic.Special.Sweden; - +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Structure; +using Swarmops.Utility.Mail; +using Swarmops.Utility.Special.Sweden; using NRss; -using Activizr.Logic.Communications; +using Swarmops.Logic.Communications; +using Swarmops.Logic.Special.Sweden; +using Swarmops.Logic.Support; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class NewsletterChecker { diff --git a/Utility/BotCode/PressReleaseChecker.cs b/Utility/BotCode/PressReleaseChecker.cs index fe05af2c..57d6f1be 100644 --- a/Utility/BotCode/PressReleaseChecker.cs +++ b/Utility/BotCode/PressReleaseChecker.cs @@ -2,18 +2,18 @@ using System; using System.Collections.Generic; using System.Text; using System.Net; -using Activizr.Basic.Enums; -using Activizr.Logic.Media; -using Activizr.Logic.Pirates; -using Activizr.Logic.Support; -using Activizr.Utility.Mail; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Pirates; +using Swarmops.Utility.Mail; using NRss; -using Activizr.Logic.Communications; -using Activizr.Logic.Structure; +using Swarmops.Logic.Communications; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Media; +using Swarmops.Logic.Support; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class PressReleaseChecker { diff --git a/Utility/BotCode/RosterHousekeeping.cs b/Utility/BotCode/RosterHousekeeping.cs index 9e06e4bb..a92e23c7 100644 --- a/Utility/BotCode/RosterHousekeeping.cs +++ b/Utility/BotCode/RosterHousekeeping.cs @@ -1,19 +1,19 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Basic; -using Activizr.Basic.Enums; -using Activizr.Basic.Types; -using Activizr.Database; -using Activizr.Utility.Mail; -using Activizr.Logic.Communications; -using Activizr.Logic.Pirates; -using Activizr.Logic.Security; -using Activizr.Logic.Structure; -using Activizr.Logic.Support; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Communications; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Security; +using Swarmops.Logic.Structure; using System.Diagnostics; +using Swarmops.Basic; +using Swarmops.Basic.Types; +using Swarmops.Database; +using Swarmops.Logic.Support; +using Swarmops.Utility.Mail; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class RosterHousekeeping { diff --git a/Utility/BotCode/SalaryProcessor.cs b/Utility/BotCode/SalaryProcessor.cs index 28ef5cac..3354df3f 100644 --- a/Utility/BotCode/SalaryProcessor.cs +++ b/Utility/BotCode/SalaryProcessor.cs @@ -2,11 +2,11 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Text; -using Activizr.Basic.Enums; -using Activizr.Logic.Financial; -using Activizr.Logic.Support; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Financial; +using Swarmops.Logic.Support; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class SalaryProcessor { diff --git a/Utility/BotCode/SchulzeProcessor.cs b/Utility/BotCode/SchulzeProcessor.cs index 0dc66186..29b1699a 100644 --- a/Utility/BotCode/SchulzeProcessor.cs +++ b/Utility/BotCode/SchulzeProcessor.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Logic.Governance; +using Swarmops.Logic.Governance; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { /// /// This class computes a Condorcet/Single-Transferable-Vote result according to the Schulze Method. diff --git a/Utility/BotCode/TurnaroundTracker.cs b/Utility/BotCode/TurnaroundTracker.cs index 649e29a4..ca932a1a 100644 --- a/Utility/BotCode/TurnaroundTracker.cs +++ b/Utility/BotCode/TurnaroundTracker.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Database; -using Activizr.Logic.Communications; -using Activizr.Logic.Special.Sweden; -using Activizr.Logic.Structure; -using Activizr.Logic.Support; -using Activizr.Utility.Special.Sweden; +using Swarmops.Logic.Communications; +using Swarmops.Logic.Structure; +using Swarmops.Utility.Special.Sweden; +using Swarmops.Database; +using Swarmops.Logic.Special.Sweden; +using Swarmops.Logic.Support; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class TurnaroundTracker { diff --git a/Utility/BotCode/UpdateStatsCache.cs b/Utility/BotCode/UpdateStatsCache.cs index a8045641..c6e2ac08 100644 --- a/Utility/BotCode/UpdateStatsCache.cs +++ b/Utility/BotCode/UpdateStatsCache.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.IO; using System.Net; using System.Text; -using Activizr.Basic.Enums; -using Activizr.Logic.Special.Sweden; -using Activizr.Logic.Structure; -using Activizr.Logic.Support; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Special.Sweden; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Support; -namespace Activizr.Utility.BotCode +namespace Swarmops.Utility.BotCode { public class UpdateStatsCache { diff --git a/Utility/ExceptionMail.cs b/Utility/ExceptionMail.cs index 59465006..6e3bd935 100644 --- a/Utility/ExceptionMail.cs +++ b/Utility/ExceptionMail.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Basic; -using Activizr.Database; -using Activizr.Utility.Mail; -using Activizr.Logic.Pirates; +using Swarmops.Logic.Pirates; +using Swarmops.Basic; +using Swarmops.Database; +using Swarmops.Utility.Mail; -namespace Activizr.Utility +namespace Swarmops.Utility { public class ExceptionMail { diff --git a/Utility/Financial/PaymentGroupMapper.cs b/Utility/Financial/PaymentGroupMapper.cs index 764be65f..e5aeed2d 100644 --- a/Utility/Financial/PaymentGroupMapper.cs +++ b/Utility/Financial/PaymentGroupMapper.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Logic.Financial; -using Activizr.Logic.Structure; +using Swarmops.Logic.Financial; +using Swarmops.Logic.Structure; -namespace Activizr.Utility.Financial +namespace Swarmops.Utility.Financial { public class PaymentGroupMapper { diff --git a/Utility/Financial/PaypalImporter.cs b/Utility/Financial/PaypalImporter.cs index 2dfd7131..fdf6387e 100644 --- a/Utility/Financial/PaypalImporter.cs +++ b/Utility/Financial/PaypalImporter.cs @@ -2,13 +2,13 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Text; -using Activizr.Basic.Enums; -using Activizr.Logic.Financial; -using Activizr.Logic.Pirates; -using Activizr.Logic.Security; -using Activizr.Logic.Structure; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Financial; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Security; +using Swarmops.Logic.Structure; -namespace Activizr.Utility.Financial +namespace Swarmops.Utility.Financial { public class PaypalImporter { diff --git a/Utility/Financial/PaysonImporter.cs b/Utility/Financial/PaysonImporter.cs index e741d9a4..2a00065a 100644 --- a/Utility/Financial/PaysonImporter.cs +++ b/Utility/Financial/PaysonImporter.cs @@ -4,13 +4,13 @@ using System.Globalization; using System.Text; using System.Text.RegularExpressions; using System.Web; -using Activizr.Basic.Enums; -using Activizr.Logic.Financial; -using Activizr.Logic.Pirates; -using Activizr.Logic.Security; -using Activizr.Logic.Structure; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Financial; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Security; +using Swarmops.Logic.Structure; -namespace Activizr.Utility.Financial +namespace Swarmops.Utility.Financial { public class PaysonImporter { diff --git a/Utility/Mail/MailTransmitter.cs b/Utility/Mail/MailTransmitter.cs index b99cc2e9..c35ec944 100644 --- a/Utility/Mail/MailTransmitter.cs +++ b/Utility/Mail/MailTransmitter.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.Text; using System.Net; using System.Net.Mail; -using Activizr.Basic; -using Activizr.Basic.Enums; -using Activizr.Logic.Pirates; -using Activizr.Logic.Support; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Pirates; +using Swarmops.Basic; +using Swarmops.Logic.Support; -namespace Activizr.Utility.Mail +namespace Swarmops.Utility.Mail { public class MailTransmitter { diff --git a/Utility/Mail/Newsletter.cs b/Utility/Mail/Newsletter.cs index bf64b361..0d03add8 100644 --- a/Utility/Mail/Newsletter.cs +++ b/Utility/Mail/Newsletter.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Logic.Pirates; +using Swarmops.Logic.Pirates; -namespace Activizr.Utility.Mail +namespace Swarmops.Utility.Mail { public class Newsletter { diff --git a/Utility/Mail/NewsletterTransmitter.cs b/Utility/Mail/NewsletterTransmitter.cs index 620839e4..8160aa70 100644 --- a/Utility/Mail/NewsletterTransmitter.cs +++ b/Utility/Mail/NewsletterTransmitter.cs @@ -7,11 +7,11 @@ using System.Text; using System.Text.RegularExpressions; using System.Web; -using Activizr.Basic.Types; -using Activizr.Logic.Pirates; -using Activizr.Logic.Support; +using Swarmops.Basic.Types; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Support; -namespace Activizr.Utility.Mail +namespace Swarmops.Utility.Mail { public class NewsletterTransmitter2 { diff --git a/Utility/Mail/NewsletterTransmitter3.cs b/Utility/Mail/NewsletterTransmitter3.cs index d3973b06..1ad979ff 100644 --- a/Utility/Mail/NewsletterTransmitter3.cs +++ b/Utility/Mail/NewsletterTransmitter3.cs @@ -6,12 +6,12 @@ using System.Net.Mime; using System.Text; using System.Text.RegularExpressions; using System.Web; -using Activizr.Basic; -using Activizr.Basic.Types; -using Activizr.Logic.Pirates; -using Activizr.Logic.Support; +using Swarmops.Basic.Types; +using Swarmops.Logic.Pirates; +using Swarmops.Basic; +using Swarmops.Logic.Support; -namespace Activizr.Utility.Mail +namespace Swarmops.Utility.Mail { public class NewsletterTransmitter3 { diff --git a/Utility/Mail/PressReleaseTransmitter.cs b/Utility/Mail/PressReleaseTransmitter.cs index ae46ee80..f1bc69c2 100644 --- a/Utility/Mail/PressReleaseTransmitter.cs +++ b/Utility/Mail/PressReleaseTransmitter.cs @@ -6,12 +6,12 @@ using System.Net.Mime; using System.Text; using System.Text.RegularExpressions; using System.Web; -using Activizr.Basic; -using Activizr.Basic.Types; -using Activizr.Logic.Media; +using Swarmops.Basic.Types; +using Swarmops.Basic; +using Swarmops.Logic.Media; -namespace Activizr.Utility.Mail +namespace Swarmops.Utility.Mail { /// diff --git a/Utility/Migrations/PeopleOptionalData.cs b/Utility/Migrations/PeopleOptionalData.cs index 72e685bc..91c93496 100644 --- a/Utility/Migrations/PeopleOptionalData.cs +++ b/Utility/Migrations/PeopleOptionalData.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Data.Common; using System.Data.SqlClient; using System.Text; -using Activizr.Basic.Enums; -using Activizr.Database; -using Activizr.Logic.Pirates; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Pirates; +using Swarmops.Database; -namespace Activizr.Utility.Migrations +namespace Swarmops.Utility.Migrations { public class PeopleOptionalData { diff --git a/Utility/Server/ActiveDirectoryCode.cs b/Utility/Server/ActiveDirectoryCode.cs index 74b3b674..09ff7eb0 100644 --- a/Utility/Server/ActiveDirectoryCode.cs +++ b/Utility/Server/ActiveDirectoryCode.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Text; -namespace Activizr.Utility.Server +namespace Swarmops.Utility.Server { public class ActiveDirectoryCode { diff --git a/Utility/Server/ExchangeCode.cs b/Utility/Server/ExchangeCode.cs index 8c542cdb..a8bfbda7 100644 --- a/Utility/Server/ExchangeCode.cs +++ b/Utility/Server/ExchangeCode.cs @@ -3,7 +3,7 @@ using System.DirectoryServices; //using CDOEXM; -namespace Activizr.Utility.Server +namespace Swarmops.Utility.Server { /// /// Summary description for ExchangeCode. diff --git a/Utility/Special/Sweden/SupportMailReview.cs b/Utility/Special/Sweden/SupportMailReview.cs index 1ad467c8..3ce258d5 100644 --- a/Utility/Special/Sweden/SupportMailReview.cs +++ b/Utility/Special/Sweden/SupportMailReview.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.IO; using System.Net.Mail; using System.Text; -using Activizr.Basic; -using Activizr.Logic.Special.Sweden; -using Activizr.Logic.Support; -using Activizr.Utility.Mail; +using Swarmops.Utility.Mail; +using Swarmops.Basic; +using Swarmops.Logic.Special.Sweden; +using Swarmops.Logic.Support; -namespace Activizr.Utility.Special.Sweden +namespace Swarmops.Utility.Special.Sweden { public class SupportMailReview { diff --git a/Utility/Special/Sweden/SwedishForumMemberCheck.cs b/Utility/Special/Sweden/SwedishForumMemberCheck.cs index a48af26c..90a8ab79 100644 --- a/Utility/Special/Sweden/SwedishForumMemberCheck.cs +++ b/Utility/Special/Sweden/SwedishForumMemberCheck.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; using System.Text; -using Activizr.Utility.BotCode; -using Activizr.Basic.Enums; -using Activizr.Logic.Pirates; -using Activizr.Logic.Special.Sweden; -using Activizr.Logic.Structure; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Pirates; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Special.Sweden; +using Swarmops.Utility.BotCode; -namespace Activizr.Utility.Special.Sweden +namespace Swarmops.Utility.Special.Sweden { public class SwedishForumMemberCheck { diff --git a/Utility/Special/UrlTranslator.cs b/Utility/Special/UrlTranslator.cs index da2ba918..1f9704ed 100644 --- a/Utility/Special/UrlTranslator.cs +++ b/Utility/Special/UrlTranslator.cs @@ -4,7 +4,7 @@ using System.IO; using System.Text; using System.Net; -namespace Activizr.Utility.Special +namespace Swarmops.Utility.Special { public class UrlTranslator {