Skip to content

Commit

Permalink
New DotWeb.Debugger works great, all tests are passing once again, pr…
Browse files Browse the repository at this point in the history
…eparing to merge with mater soon
  • Loading branch information
Frank Laub committed Jun 27, 2010
1 parent fd6326c commit 25bf8d7
Show file tree
Hide file tree
Showing 21 changed files with 84 additions and 2,557 deletions.
1 change: 0 additions & 1 deletion src/DotWeb.Hosting.Bridge/DotWeb.Hosting.Bridge.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
</Compile>
<Compile Include="CallContextStorage.cs" />
<Compile Include="DefaultFactory.cs" />
<Compile Include="HostingServer.cs" />
<Compile Include="JsDynamicWrapper.cs" />
<Compile Include="IJsWrapper.cs" />
<Compile Include="IObjectFactory.cs" />
Expand Down
125 changes: 0 additions & 125 deletions src/DotWeb.Hosting.Bridge/HostingServer.cs

This file was deleted.

16 changes: 12 additions & 4 deletions src/DotWeb.Hosting.Bridge/JsBridge.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
using System.Linq;
using System.Reflection;
using System.Diagnostics;
using System.IO;
using DotWeb.Utility;
using DotWeb.Hosting.Weaver;

namespace DotWeb.Hosting.Bridge
{
Expand All @@ -31,8 +33,6 @@ namespace DotWeb.Hosting.Bridge
using ReferenceToObjectMap = Dictionary<int, object>;

using JsObjectToReferenceMap = Dictionary<object, int>;
using System.IO;
using DotWeb.Hosting.Weaver;

public class JsBridge : IDotWebHost
{
Expand Down Expand Up @@ -148,13 +148,21 @@ private Type PrepareType(string typeSpec) {
var typeName = parts[0].Trim();
var asmName = parts[1].Trim();
var binPath = parts[2].Trim();
var weaver = new SimpleWeaver(binPath, binPath, new string[] { binPath }, false);

var asmPath = Path.Combine(binPath, asmName);
if (!asmPath.EndsWith(".dll")) {
asmPath += ".dll";
}
var asm = weaver.ProcessAssembly(asmPath);

Assembly asm;
if (asmName.StartsWith("Hosted-")) {
// for testing
asm = Assembly.LoadFrom(asmPath);
}
else {
var weaver = new SimpleWeaver(binPath, binPath, new string[] { binPath }, false);
asm = weaver.ProcessAssembly(asmPath);
}
return asm.GetType(typeName);
}

Expand Down
143 changes: 0 additions & 143 deletions src/DotWeb.Hosting.Weaver/AssemblyProcessor.cs

This file was deleted.

Loading

0 comments on commit 25bf8d7

Please sign in to comment.