Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 4 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
2  MR3/src/Castle.MonoRail.Generator/Castle.MonoRail.Generator.fsproj
@@ -25,7 +25,7 @@
<PlatformTarget>x86</PlatformTarget>
<DocumentationFile>
</DocumentationFile>
- <StartArguments>-b:C:\dev\castle\MonoRail\MR3\tests\WebSiteForIntegration\bin\WebSiteForIntegration.dll -t:C:\dev\castle\MonoRail\MR3\tests\WebSiteForIntegration\Generated</StartArguments>
+ <StartArguments>-b:C:\dev\clear\repos\Clear.PremiumTrader.Web\Platform\src\Clear.PremiumTrader.Web\bin\Clear.PremiumTrader.Web.dll -t:C:\dev\clear\repos\Clear.PremiumTrader.Web\Platform\src\Clear.PremiumTrader.Web\Routes</StartArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
</PropertyGroup>
View
13 MR3/src/Castle.MonoRail.Generator/Program.fs
@@ -43,8 +43,8 @@ module Generator
for arg in args do
match arg with
- | Bin -> webappAssembly <- Path.Combine(curFolder, arg.Substring(3))
- | Target -> targetFolder <- Path.Combine(curFolder, arg.Substring(3))
+ | Bin -> webappAssembly <- arg.Substring(3) //Path.Combine(curFolder, arg.Substring(3))
+ | Target -> targetFolder <- arg.Substring(3) //Path.Combine(curFolder, arg.Substring(3))
| _ -> ignore()
let mutable inError = false
@@ -52,6 +52,7 @@ module Generator
if webappAssembly == null || not (File.Exists(webappAssembly)) then
Console.ForegroundColor <- ConsoleColor.DarkRed
+ Console.Error.WriteLine webappAssembly
Console.Error.WriteLine "Invalid web app assembly path. Specify a assembly with -b:<folder>. Ex: -b:bin\web.dll"
inError <- true
@@ -81,10 +82,10 @@ module Generator
Console.WriteLine (sprintf "Could not load assembly %O. Tried from %s but got %O" args.Name asmName.Name exc)
null
- let _asmResolveHandler = ResolveEventHandler(resolve_asm)
- let domain = AppDomain.CurrentDomain
- domain.add_AssemblyResolve _asmResolveHandler
+// let _asmResolveHandler = ResolveEventHandler(resolve_asm)
+// let domain = AppDomain.CurrentDomain
+// domain.add_AssemblyResolve _asmResolveHandler
generate_routes webappAssembly targetFolder
- //Console.ReadKey() |> ignore
+// Console.ReadKey() |> ignore
View
22 MR3/src/Castle.MonoRail/Mvc.ActionResults.fs
@@ -266,24 +266,4 @@ namespace Castle.MonoRail
override this.Execute(context:ActionResultContext) =
let stream = context.HttpContext.Response.OutputStream
- writing.Invoke(stream)
-
- // todo: better name that hints the fact it's serializable
- type ErrorResult (error:HttpError) =
- inherit ContentNegotiatedResult<HttpError>(error)
-
- do
- base.StatusCode <- error.StatusCode
-
- new (statusCode:HttpStatusCode) =
- ErrorResult(HttpError(statusCode))
-
-
- override this.Execute(context:ActionResultContext) =
- error.StatusCode <- base.StatusCode
- error.ErrorCode <- base.Status
- error.Description <- base.StatusDescription
-
- base.Execute(context)
-
-
+ writing.Invoke(stream)
View
1  MR3/src/Castle.MonoRail/Mvc.Helpers.UrlHelper.fs
@@ -34,6 +34,7 @@ namespace Castle.MonoRail.Helpers
member x.Content(url:string) : IHtmlStringEx =
// <app_path>/Content/<url>
upcast HtmlResult (UrlHelper.Combine (UrlHelper.Combine(x.AppPath, "Content"), url))
+
member x.ContextualContent(url:string) : IHtmlStringEx =
// <bundle_virtual_path>/Content/<url>

No commit comments for this range

Something went wrong with that request. Please try again.