- On <%# GetPageDetails(Eval("nodeid")) %> , <%# Eval("created") %>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <%# Container.DataItem %>
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/usercontrols/MemberPicker.ascx b/src/Umbraco.Web.UI/usercontrols/MemberPicker.ascx
deleted file mode 100644
index c73e17174e..0000000000
--- a/src/Umbraco.Web.UI/usercontrols/MemberPicker.ascx
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="MemberPicker.ascx.cs" Inherits="Training.Level2.usercontrols.MemberPicker" %>
-
-
-
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/usercontrols/Parallel.ascx b/src/Umbraco.Web.UI/usercontrols/Parallel.ascx
deleted file mode 100644
index 795df2c126..0000000000
--- a/src/Umbraco.Web.UI/usercontrols/Parallel.ascx
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Parallel.ascx.cs" Inherits="Umbraco.Web.UI.usercontrols.ParallelUserControl" %>
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/usercontrols/Parallel.ascx.cs b/src/Umbraco.Web.UI/usercontrols/Parallel.ascx.cs
deleted file mode 100644
index ea3a38f605..0000000000
--- a/src/Umbraco.Web.UI/usercontrols/Parallel.ascx.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using umbraco.cms.businesslogic.web;
-using umbraco.BusinessLogic;
-
-namespace Umbraco.Web.UI.usercontrols
-{
- public partial class ParallelUserControl : System.Web.UI.UserControl
- {
- protected void Page_Load(object sender, EventArgs e)
- {
-
- }
-
- protected void Button1_Click(object sender, EventArgs e)
- {
- ParallelDocumentUpdate test = new ParallelDocumentUpdate();
- test.Execute();
-
- }
- }
-
- public class ParallelDocumentUpdate
- {
- private List documents;
- public ParallelDocumentUpdate()
- {
- documents = new List();
-
- documents.Add(new myDocument(1079, "name1", "string1", 1, false, DateTime.Now.AddDays(1)));
- documents.Add(new myDocument(1080, "name2", "string2", 2, true, DateTime.Now.AddDays(2)));
- documents.Add(new myDocument(1082, "name3", "string3", 3, false, DateTime.Now.AddDays(3)));
- documents.Add(new myDocument(1083, "name4", "string4", 4, true, DateTime.Now.AddDays(4)));
- documents.Add(new myDocument(1084, "name5", "string5", 5, true, DateTime.Now.AddDays(4)));
-
- }
-
- public void Execute()
- {
-
- System.Threading.Tasks.Parallel.ForEach(documents, d =>
- {
- Document doc = new Document(d.Id);
- doc.Text = d.Name + " " + d.Id.ToString();
- doc.getProperty("string").Value = d.Prop1 + " " + d.Id.ToString();
- doc.getProperty("int").Value = d.Prop2;
- doc.getProperty("bool").Value = d.Prop3;
- doc.getProperty("date").Value = d.Prop4;
- doc.Publish(User.GetUser(0));
- });
-
- }
- }
-
- public class myDocument
- {
- public myDocument(int id, string name, string prop1, int prop2, bool prop3, DateTime prop4)
- {
- Id = id;
- Name = name;
- Prop1 = prop1;
- Prop2 = prop2;
- Prop3 = prop3;
- Prop4 = prop4;
- }
-
- public int Id { get; set; }
- public string Name { get; set; }
- public string Prop1 { get; set; }
- public int Prop2 { get; set; }
- public bool Prop3 { get; set; }
- public DateTime Prop4 { get; set; }
- }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/usercontrols/Parallel.ascx.designer.cs b/src/Umbraco.Web.UI/usercontrols/Parallel.ascx.designer.cs
deleted file mode 100644
index 334046ec2c..0000000000
--- a/src/Umbraco.Web.UI/usercontrols/Parallel.ascx.designer.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace Umbraco.Web.UI.usercontrols {
-
-
- public partial class ParallelUserControl {
-
- ///
- /// Button1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Button Button1;
- }
-}
diff --git a/src/Umbraco.Web.UI/usercontrols/RunwayContactForm/Contact.ascx b/src/Umbraco.Web.UI/usercontrols/RunwayContactForm/Contact.ascx
deleted file mode 100644
index 3816d939d0..0000000000
--- a/src/Umbraco.Web.UI/usercontrols/RunwayContactForm/Contact.ascx
+++ /dev/null
@@ -1,21 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Contact.ascx.cs" Inherits="UmbracoShop.Controls.Contact" %>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index 86dbf76259..a8fd495bd1 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -2,6 +2,7 @@
using System.Web;
using Umbraco.Core;
using Umbraco.Core.Services;
+using Umbraco.Core.CodeAnnotations;
using Umbraco.Web.Routing;
using umbraco;
using umbraco.IO;
@@ -49,9 +50,35 @@ namespace Umbraco.Web
/// during the startup process as well.
/// See: http://issues.umbraco.org/issue/U4-1890
///
+ [UmbracoProposedPublic("http://issues.umbraco.org/issue/U4-1717")]
internal static UmbracoContext EnsureContext(HttpContextBase httpContext, ApplicationContext applicationContext)
{
- if (UmbracoContext.Current != null)
+ return EnsureContext(httpContext, applicationContext, false);
+ }
+
+ ///
+ /// This is a helper method which is called to ensure that the singleton context is created and the nice url and routing
+ /// context is created and assigned.
+ ///
+ ///
+ ///
+ ///
+ /// if set to true will replace the current singleton with a new one, this is generally only ever used because
+ /// during application startup the base url domain will not be available so after app startup we'll replace the current
+ /// context with a new one in which we can access the httpcontext.Request object.
+ ///
+ ///
+ /// The Singleton context object
+ ///
+ ///
+ /// This is created in order to standardize the creation of the singleton. Normally it is created during a request
+ /// in the UmbracoModule, however this module does not execute during application startup so we need to ensure it
+ /// during the startup process as well.
+ /// See: http://issues.umbraco.org/issue/U4-1890
+ ///
+ internal static UmbracoContext EnsureContext(HttpContextBase httpContext, ApplicationContext applicationContext, bool replaceContext)
+ {
+ if (UmbracoContext.Current != null && !replaceContext)
return UmbracoContext.Current;
var umbracoContext = new UmbracoContext(httpContext, applicationContext, RoutesCacheResolver.Current.RoutesCache);
@@ -66,10 +93,10 @@ namespace Umbraco.Web
LastChanceLookupResolver.Current.LastChanceLookup,
PublishedContentStoreResolver.Current.PublishedContentStore,
niceUrls);
-
+
//assign the routing context back
umbracoContext.RoutingContext = routingContext;
-
+
//assign the singleton
UmbracoContext.Current = umbracoContext;
return UmbracoContext.Current;
diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs
index 134f14353f..2e0af2d74e 100644
--- a/src/Umbraco.Web/UmbracoModule.cs
+++ b/src/Umbraco.Web/UmbracoModule.cs
@@ -50,7 +50,8 @@ namespace Umbraco.Web
legacyRequestInitializer.InitializeRequest();
// create the UmbracoContext singleton, one per request, and assign
- UmbracoContext.EnsureContext(httpContext, ApplicationContext.Current);
+ // NOTE: we assign 'true' to ensure the context is replaced if it is already set (i.e. during app startup)
+ UmbracoContext.EnsureContext(httpContext, ApplicationContext.Current, true);
}
///
diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index c112fcf1d1..76501df8a7 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -74,6 +74,19 @@ namespace Umbraco.Web
return this;
}
+ ///
+ /// Override this method in order to ensure that the UmbracoContext is also created, this can only be
+ /// created after resolution is frozen!
+ ///
+ protected override void FreezeResolution()
+ {
+ base.FreezeResolution();
+
+ //before we do anything, we'll ensure the umbraco context
+ //see: http://issues.umbraco.org/issue/U4-1717
+ UmbracoContext.EnsureContext(new HttpContextWrapper(_umbracoApplication.Context), ApplicationContext);
+ }
+
///
/// Override this method in order to ensure that the UmbracoContext is also created, this can only be
/// created after resolution is frozen!
![avatar](http://www.gravatar.com/avatar/<%# umbraco.library.md5(Eval("email").ToString()) %>?s=32)
-