Skip to content

Commit

Permalink
Renaming project to Firefly
Browse files Browse the repository at this point in the history
  • Loading branch information
loudej committed Jan 31, 2012
1 parent 82c0c01 commit e7bfe4d
Show file tree
Hide file tree
Showing 62 changed files with 152 additions and 174 deletions.
6 changes: 3 additions & 3 deletions Dragonfly.sln
Expand Up @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "src\sample\HelloWorld\HelloWorld.csproj", "{2087B5A3-5A02-4F6C-AB54-BDB96D32C291}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dragonfly", "src\main\Dragonfly\Dragonfly.csproj", "{CA805DDB-E41D-42A0-AF7E-2388E2670663}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firefly", "src\main\Dragonfly\Firefly.csproj", "{CA805DDB-E41D-42A0-AF7E-2388E2670663}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dragonfly.Tests", "src\test\Dragonfly.Tests\Dragonfly.Tests.csproj", "{043474E8-309A-42EB-904B-F570EA10E82D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firefly.Tests", "src\test\Dragonfly.Tests\Firefly.Tests.csproj", "{043474E8-309A-42EB-904B-F570EA10E82D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sandbox", "src\sample\Sandbox\Sandbox.csproj", "{4A484DEF-B640-468C-A7FB-B8602D1180A8}"
EndProject
Expand All @@ -27,7 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{87AEA17F
ProjectSection(SolutionItems) = preProject
build.cmd = build.cmd
build.fsx = build.fsx
Dragonfly.nuspec = Dragonfly.nuspec
Firefly.nuspec = Firefly.nuspec
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
packages.config = packages.config
Expand Down
6 changes: 3 additions & 3 deletions Dragonfly.nuspec → Firefly.nuspec
Expand Up @@ -7,14 +7,14 @@
<owners>@authors@</owners>
<language>en-US</language>
<summary>@summary@</summary>
<projectUrl>http://loudej.github.com/dragonfly</projectUrl>
<licenseUrl>https://github.com/loudej/dragonfly/blob/master/LICENSE.txt</licenseUrl>
<projectUrl>http://loudej.github.com/firefly</projectUrl>
<licenseUrl>https://github.com/loudej/firefly/blob/master/LICENSE.txt</licenseUrl>
<tags>http owin</tags>
<dependencies>
<dependency id="Gate.Owin" version="0.2.1" />
</dependencies>
</metadata>
<files>
<file src="build\Dragonfly.dll" target="lib\net40" />
<file src="build\Firefly.dll" target="lib\net40" />
</files>
</package>
4 changes: 2 additions & 2 deletions NOTICE.txt
@@ -1,5 +1,5 @@
Dragonfly HTTP Server
Copyright 2011 Louis DeJardin
Firefly HTTP Server
Copyright 2012 Louis DeJardin

This software was developed by
Louis DeJardin (http://whereslou.com/).
Expand Down
40 changes: 20 additions & 20 deletions build.fsx
@@ -1,12 +1,12 @@
#I "./packages/FAKE.1.62.1/tools"
#I "./packages/FAKE.1.62.1/tools"
#r "FakeLib.dll"

open Fake

// properties
let version = "0.2"
let projectName = "Dragonfly"
let projectDescription = "Dragonfly is a .NET HTTP Server in an assembly."
let projectName = "Firefly"
let projectDescription = "Firefly is a .NET HTTP Server in an assembly."
let authors = ["Louis DeJardin"]

let sourceDir = @".\src\"
Expand Down Expand Up @@ -41,18 +41,18 @@ Target "CleanTargetDir" (fun _ ->
CreateDir deployDir
CreateDir nugetDir
)

Target "ApplyVersion" (fun _ ->
let apply files =
for file in files do
ReplaceAssemblyInfoVersions (fun p ->
{p with
AssemblyVersion = version;
AssemblyFileVersion = version;
OutputFileName = file; })

!! "./src/**/AssemblyInfo.cs" |> apply
)

Target "ApplyVersion" (fun _ ->
let apply files =
for file in files do
ReplaceAssemblyInfoVersions (fun p ->
{p with
AssemblyVersion = version;
AssemblyFileVersion = version;
OutputFileName = file; })

!! "./src/**/AssemblyInfo.cs" |> apply
)

Target "CompileApp" (fun _ ->
// AssemblyInfo
Expand All @@ -75,13 +75,13 @@ Target "CompileApp" (fun _ ->
// Guid = "EE5621DB-B86B-44eb-987F-9C94BCC98441";
// OutputFileName = @".\src\app\CalculatorLib\Properties\AssemblyInfo.cs"})

MSBuild buildDir "Build" ["Configuration","Release"; "PackageVersion",version] appReferences
MSBuild buildDir "Build" ["Configuration","Release"; "PackageVersion",version] appReferences
|> Log "AppBuild-Output: "
)

Target "CompileTest" (fun _ ->
MSBuild testDir "Build" ["Configuration","Debug"] testReferences
|> Log "TestBuild-Output: "
MSBuild testDir "Build" ["Configuration","Debug"] testReferences
|> Log "TestBuild-Output: "
)

//Target "NUnitTest" (fun _ ->
Expand Down Expand Up @@ -120,7 +120,7 @@ Target "PackageZip" (fun _ ->
!+ (buildDir + "\**\*.*")
-- "*.zip"
|> Scan
|> Zip buildDir (deployDir + "Dragonfly." + version + ".zip")
|> Zip buildDir (deployDir + "Firefly." + version + ".zip")
)

Target "PackageNuGet" (fun _ ->
Expand All @@ -137,7 +137,7 @@ Target "PackageNuGet" (fun _ ->
Dependencies = ["Gate.Owin", "0.2.1"]
OutputPath = nugetDir
AccessKey = getBuildParamOrDefault "nugetkey" ""
Publish = hasBuildParam "nugetkey" }) "Dragonfly.nuspec"
Publish = hasBuildParam "nugetkey" }) "Firefly.nuspec"
)


Expand Down
8 changes: 4 additions & 4 deletions src/main/Dragonfly/Firefly.csproj
Expand Up @@ -8,8 +8,8 @@
<ProjectGuid>{CA805DDB-E41D-42A0-AF7E-2388E2670663}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Dragonfly</RootNamespace>
<AssemblyName>Dragonfly</AssemblyName>
<RootNamespace>Firefly</RootNamespace>
<AssemblyName>Firefly</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\Dragonfly\</SolutionDir>
Expand All @@ -35,10 +35,10 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Compile Include="DragonflyServices.cs" />
<Compile Include="FireflyService.cs" />
<Compile Include="Http\Baton.cs" />
<Compile Include="Http\MessageBody.cs" />
<Compile Include="IDragonflyServices.cs" />
<Compile Include="IFireflyService.cs" />
<Compile Include="Utils\Disposable.cs" />
<Compile Include="Http\Connection.cs" />
<Compile Include="Http\Frame.cs" />
Expand Down
@@ -1,10 +1,10 @@
using Dragonfly.Utils;
using Firefly.Utils;

namespace Dragonfly
namespace Firefly
{
public class DragonflyServices : IDragonflyServices
public class FireflyService : IFireflyService
{
public DragonflyServices()
public FireflyService()
{
Trace = NullServerTrace.Instance;
Memory = new MemoryPool();
Expand Down
4 changes: 2 additions & 2 deletions src/main/Dragonfly/Http/Baton.cs
@@ -1,8 +1,8 @@
using System;
using System.Diagnostics;
using Dragonfly.Utils;
using Firefly.Utils;

namespace Dragonfly.Http
namespace Firefly.Http
{
public class Baton
{
Expand Down
8 changes: 4 additions & 4 deletions src/main/Dragonfly/Http/Connection.cs
Expand Up @@ -2,14 +2,14 @@
using System.Diagnostics;
using System.Net.Sockets;
using System.Threading;
using Dragonfly.Utils;
using Firefly.Utils;
using Gate.Owin;

namespace Dragonfly.Http
namespace Firefly.Http
{
public class Connection : IAsyncResult
{
private readonly IDragonflyServices _services;
private readonly IFireflyService _services;
private readonly AppDelegate _app;
private readonly ISocket _socket;
private readonly Action<ISocket> _disconnected;
Expand All @@ -21,7 +21,7 @@ public class Connection : IAsyncResult
private Action _frameConsumeCallback;
private SocketAsyncEventArgs _socketReceiveAsyncEventArgs;

public Connection(IDragonflyServices services, AppDelegate app, ISocket socket, Action<ISocket> disconnected)
public Connection(IFireflyService services, AppDelegate app, ISocket socket, Action<ISocket> disconnected)
{
_services = services;
_app = app;
Expand Down
8 changes: 4 additions & 4 deletions src/main/Dragonfly/Http/Frame.cs
Expand Up @@ -3,12 +3,12 @@
using System.IO;
using System.Linq;
using System.Text;
using Dragonfly.Utils;
using Firefly.Utils;
using Gate.Owin;

// ReSharper disable AccessToModifiedClosure

namespace Dragonfly.Http
namespace Firefly.Http
{
public enum ProduceEndType
{
Expand All @@ -19,7 +19,7 @@ public enum ProduceEndType

public class Frame
{
private readonly IDragonflyServices _services;
private readonly IFireflyService _services;
private readonly AppDelegate _app;
private readonly Func<ArraySegment<byte>, Action, bool> _produceData;
private readonly Action<ProduceEndType> _produceEnd;
Expand All @@ -43,7 +43,7 @@ enum Mode
private bool _resultStarted;
private bool _keepAlive;

public Frame(IDragonflyServices services, AppDelegate app, Func<ArraySegment<byte>, Action, bool> produceData, Action<ProduceEndType> produceEnd)
public Frame(IFireflyService services, AppDelegate app, Func<ArraySegment<byte>, Action, bool> produceData, Action<ProduceEndType> produceEnd)
{
_services = services;
_app = app;
Expand Down
4 changes: 2 additions & 2 deletions src/main/Dragonfly/Http/MessageBody.cs
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using System.Threading;
using Dragonfly.Utils;
using Firefly.Utils;

namespace Dragonfly.Http
namespace Firefly.Http
{
public abstract class MessageBody
{
Expand Down
12 changes: 6 additions & 6 deletions src/main/Dragonfly/Http/ServerFactory.cs
Expand Up @@ -3,29 +3,29 @@
using System.Net;
using System.Net.Sockets;
using System.Threading;
using Dragonfly.Utils;
using Firefly.Utils;
using Gate.Owin;

// ReSharper disable AccessToModifiedClosure

namespace Dragonfly.Http
namespace Firefly.Http
{
public class ServerFactory
{
private readonly IDragonflyServices _services;
private readonly IFireflyService _services;

public ServerFactory()
: this(new DragonflyServices())
: this(new FireflyService())
{
}

public ServerFactory(IServerTrace trace)
: this(new DragonflyServices { Trace = trace })
: this(new FireflyService { Trace = trace })
{

}

public ServerFactory(IDragonflyServices services)
public ServerFactory(IFireflyService services)
{
_services = services;
}
Expand Down
10 changes: 0 additions & 10 deletions src/main/Dragonfly/IDragonflyServices.cs

This file was deleted.

10 changes: 10 additions & 0 deletions src/main/Dragonfly/IFireflyService.cs
@@ -0,0 +1,10 @@
using Firefly.Utils;

namespace Firefly
{
public interface IFireflyService
{
IServerTrace Trace { get; }
IMemoryPool Memory { get; }
}
}
2 changes: 1 addition & 1 deletion src/main/Dragonfly/Properties/AssemblyInfo.cs
Expand Up @@ -5,7 +5,7 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Dragonfly")]
[assembly: AssemblyTitle("Firefly")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
Expand Down
2 changes: 1 addition & 1 deletion src/main/Dragonfly/Utils/Disposable.cs
@@ -1,7 +1,7 @@
using System;
using System.Threading;

namespace Dragonfly.Utils
namespace Firefly.Utils
{
class Disposable : IDisposable
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/Dragonfly/Utils/HeaderUtils.cs
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;

namespace Dragonfly.Utils
namespace Firefly.Utils
{
static class HeaderUtils
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/Dragonfly/Utils/IMemoryPool.cs
@@ -1,4 +1,4 @@
namespace Dragonfly.Utils
namespace Firefly.Utils
{
public interface IMemoryPool
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/Dragonfly/Utils/IServerTrace.cs
@@ -1,7 +1,7 @@
using System;
using System.Diagnostics;

namespace Dragonfly.Utils
namespace Firefly.Utils
{
public enum TraceMessage
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/Dragonfly/Utils/ISocket.cs
@@ -1,7 +1,7 @@
using System;
using System.Net.Sockets;

namespace Dragonfly.Utils
namespace Firefly.Utils
{
public interface ISocket
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/Dragonfly/Utils/MemoryPool.cs
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;

namespace Dragonfly.Utils
namespace Firefly.Utils
{
public class MemoryPool : IMemoryPool
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/Dragonfly/Utils/MemoryPoolTextWriter.cs
Expand Up @@ -2,7 +2,7 @@
using System.IO;
using System.Text;

namespace Dragonfly.Utils
namespace Firefly.Utils
{
public class MemoryPoolTextWriter : TextWriter
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/Dragonfly/Utils/NullServerTrace.cs
@@ -1,6 +1,6 @@
using System.Diagnostics;

namespace Dragonfly.Utils
namespace Firefly.Utils
{
class NullServerTrace : IServerTrace
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/Dragonfly/Utils/SocketWrapper.cs
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Net.Sockets;

namespace Dragonfly.Utils
namespace Firefly.Utils
{
class SocketWrapper : ISocket
{
Expand Down

0 comments on commit e7bfe4d

Please sign in to comment.