Skip to content

Commit

Permalink
lot of spiking to support the new remote model
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeremydmiller
jeremydmiller committed Mar 19, 2013
1 parent e677f45 commit 453357f
Show file tree
Hide file tree
Showing 15 changed files with 333 additions and 5 deletions.
7 changes: 7 additions & 0 deletions src/BottleServiceRunner/BottleServiceRunner.csproj
View file
Expand Up @@ -41,6 +41,12 @@
<Reference Include="FubuCore">
<HintPath>..\packages\FubuCore.1.0.2.231\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="FubuJson">
<HintPath>..\packages\FubuJson.0.2.0.292\lib\net40\FubuJson.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
Expand Down Expand Up @@ -70,6 +76,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
Expand Down
8 changes: 3 additions & 5 deletions src/BottleServiceRunner/TopshelfApplication.cs
View file
Expand Up @@ -5,15 +5,13 @@ namespace BottleServiceRunner
// TODO -- This gets fancier later
public class TopshelfApplication
{
private TopshelfPackageFacility _facility;

[SkipOverForProvenance]
public Bottles.Services.BottleServiceRunner Bootstrap(string[] assemblyNames)
{
_facility = new TopshelfPackageFacility(assemblyNames);
var facility = new TopshelfPackageFacility(assemblyNames);

PackageRegistry.LoadPackages(x => x.Facility(_facility));
return _facility.Aggregator.ServiceRunner();
PackageRegistry.LoadPackages(x => x.Facility(facility));
return facility.Aggregator.ServiceRunner();
}
}
}
11 changes: 11 additions & 0 deletions src/BottleServiceRunner/app.config
View file
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
2 changes: 2 additions & 0 deletions src/BottleServiceRunner/packages.config
View file
Expand Up @@ -2,5 +2,7 @@
<packages>
<package id="Bottles" version="1.0.0.450" targetFramework="net40" />
<package id="FubuCore" version="1.0.2.231" targetFramework="net40" />
<package id="FubuJson" version="0.2.0.292" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
<package id="TopShelf" version="3.1.0" targetFramework="net40" />
</packages>
3 changes: 3 additions & 0 deletions src/Bottles.Services.Embedded.Tests/Bottles.Services.Embedded.Tests.csproj
View file
Expand Up @@ -37,6 +37,9 @@
<Reference Include="FubuCore">
<HintPath>..\packages\FubuCore.1.0.2.231\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="FubuJson">
<HintPath>..\packages\FubuJson.0.2.0.292\lib\net40\FubuJson.dll</HintPath>
</Reference>
<Reference Include="FubuLocalization">
<HintPath>..\packages\FubuLocalization.0.9.5.129\lib\FubuLocalization.dll</HintPath>
</Reference>
Expand Down
1 change: 1 addition & 0 deletions src/Bottles.Services.Embedded.Tests/packages.config
View file
Expand Up @@ -2,6 +2,7 @@
<packages>
<package id="Bottles" version="1.0.0.450" targetFramework="net40" />
<package id="FubuCore" version="1.0.2.231" targetFramework="net40" />
<package id="FubuJson" version="0.2.0.292" targetFramework="net40" />
<package id="FubuLocalization" version="0.9.5.129" targetFramework="net40" />
<package id="FubuMVC.Core" version="1.0.1.1422" targetFramework="net40" />
<package id="FubuMVC.Katana" version="1.0.1.1422" targetFramework="net40" />
Expand Down
6 changes: 6 additions & 0 deletions src/Bottles.Services.Embedded/Bottles.Services.Embedded.csproj
View file
Expand Up @@ -37,6 +37,9 @@
<Reference Include="FubuCore">
<HintPath>..\packages\FubuCore.1.0.2.231\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="FubuJson">
<HintPath>..\packages\FubuJson.0.2.0.292\lib\net40\FubuJson.dll</HintPath>
</Reference>
<Reference Include="FubuLocalization">
<HintPath>..\packages\FubuLocalization.0.9.5.129\lib\FubuLocalization.dll</HintPath>
</Reference>
Expand All @@ -46,6 +49,9 @@
<Reference Include="HtmlTags">
<HintPath>..\packages\HtmlTags.1.1.0.119\lib\4.0\HtmlTags.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
Expand Down
2 changes: 2 additions & 0 deletions src/Bottles.Services.Embedded/packages.config
View file
Expand Up @@ -2,7 +2,9 @@
<packages>
<package id="Bottles" version="1.0.0.450" targetFramework="net40" />
<package id="FubuCore" version="1.0.2.231" targetFramework="net40" />
<package id="FubuJson" version="0.2.0.292" targetFramework="net40" />
<package id="FubuLocalization" version="0.9.5.129" targetFramework="net40" />
<package id="FubuMVC.Core" version="1.0.1.1422" targetFramework="net40" />
<package id="HtmlTags" version="1.1.0.119" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
</packages>
6 changes: 6 additions & 0 deletions src/Bottles.Services.Tests/Bottles.Services.Tests.csproj
View file
Expand Up @@ -37,9 +37,15 @@
<Reference Include="FubuCore">
<HintPath>..\packages\FubuCore.1.0.2.231\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="FubuJson">
<HintPath>..\packages\FubuJson.0.2.0.292\lib\net40\FubuJson.dll</HintPath>
</Reference>
<Reference Include="FubuTestingSupport">
<HintPath>..\packages\FubuTestingSupport.1.0.2.231\lib\FubuTestingSupport.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
</Reference>
Expand Down
2 changes: 2 additions & 0 deletions src/Bottles.Services.Tests/packages.config
View file
Expand Up @@ -2,7 +2,9 @@
<packages>
<package id="Bottles" version="1.0.0.450" targetFramework="net40" />
<package id="FubuCore" version="1.0.2.231" targetFramework="net40" />
<package id="FubuJson" version="0.2.0.292" targetFramework="net40" />
<package id="FubuTestingSupport" version="1.0.2.231" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
<package id="NUnit" version="2.5.10.11092" targetFramework="net40" />
<package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
<package id="structuremap" version="2.6.3" targetFramework="net40" />
Expand Down
7 changes: 7 additions & 0 deletions src/Bottles.Services/Bottles.Services.csproj
View file
Expand Up @@ -40,6 +40,12 @@
<Reference Include="FubuCore">
<HintPath>..\packages\FubuCore.1.0.2.231\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="FubuJson">
<HintPath>..\packages\FubuJson.0.2.0.292\lib\net40\FubuJson.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
Expand All @@ -57,6 +63,7 @@
<Compile Include="BottleServiceFinder.cs" />
<Compile Include="BottleServiceRunner.cs" />
<Compile Include="BottleServiceAggregator.cs" />
<Compile Include="Remote\Classes.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config">
Expand Down

0 comments on commit 453357f

Please sign in to comment.