diff --git a/.gitignore b/.gitignore
index 0073675d82..32e7c297db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,7 @@ src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
@@ -129,3 +130,5 @@ src/*.boltdata/
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js
src/umbraco.sln.ide/*
build/UmbracoCms.*/
+src/.vs/
+src/Umbraco.Web.UI/umbraco/js/install.loader.js
diff --git a/README.md b/README.md
index d4a024ddbc..5988cc2a19 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,9 @@ The easiest way to get started is to run `build/build.bat` which will build both
If you're interested in making changes to Belle make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). Note that you can always [download a nightly build](http://nightly.umbraco.org/umbraco%207.0.0/) so you don't have to build the code yourself.
-## Watch a five minute introduction video ##
+## Watch a introduction video ##
-[](http://umbraco.org/help-and-support/video-tutorials/getting-started/what-is-umbraco)
+[](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)
## Umbraco - the simple, flexible and friendly ASP.NET CMS ##
diff --git a/build/Build.bat b/build/Build.bat
index f29260b274..bd18f719ad 100644
--- a/build/Build.bat
+++ b/build/Build.bat
@@ -25,9 +25,9 @@ ECHO Installing the Microsoft.Bcl.Build package before anything else, otherwise
SET nuGetFolder=%CD%\..\src\packages\
..\src\.nuget\NuGet.exe sources Remove -Name MyGetUmbracoCore >NUL
..\src\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/ >NUL
-..\src\.nuget\NuGet.exe install ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder%
-..\src\.nuget\NuGet.exe install ..\src\umbraco.businesslogic\packages.config -OutputDirectory %nuGetFolder%
-..\src\.nuget\NuGet.exe install ..\src\Umbraco.Core\packages.config -OutputDirectory %nuGetFolder%
+..\src\.nuget\NuGet.exe install ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet
+..\src\.nuget\NuGet.exe install ..\src\umbraco.businesslogic\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet
+..\src\.nuget\NuGet.exe install ..\src\Umbraco.Core\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet
ECHO Removing the belle build folder and bower_components folder to make sure everything is clean as a whistle
RD ..\src\Umbraco.Web.UI.Client\build /Q /S
@@ -43,7 +43,7 @@ DEL /F /Q webpihash.txt
ECHO Making sure Git is in the path so that the build can succeed
CALL InstallGit.cmd
ECHO Performing MSBuild and producing Umbraco binaries zip files
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment% /verbosity:minimal
ECHO Setting node_modules folder to hidden to prevent VS13 from crashing on it while loading the websites project
attrib +h ..\src\Umbraco.Web.UI.Client\node_modules
@@ -53,11 +53,13 @@ REN .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
REN .\_BuildOutput\WebApp\Xslt\Web.config Web.config.transform
ECHO Packing the NuGet release files
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version% -Symbols
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %version%
+..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version% -Symbols -Verbosity quiet
+..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %version% -Verbosity quiet
IF ERRORLEVEL 1 GOTO :showerror
+ECHO No errors were detected but you still may see some in the output, then it's time to investigate.
+ECHO You might see some warnings but that is completely normal.
GOTO :EOF
:showerror
diff --git a/build/Build.proj b/build/Build.proj
index 09303788d9..e937df15bd 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -68,6 +68,12 @@
.$(BUILD_RELEASE)-$(BUILD_COMMENT)
+
+ .$(BUILD_RELEASE)-$(BUILD_NIGHTLY)
+
+
+ .$(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY)
+ Release
@@ -91,15 +97,8 @@
-
-
-
-
-
-
-
@@ -145,14 +144,14 @@
DestinationFiles="@(WebPiFiles->'$(WebPiFolder)%(RecursiveDir)%(Filename)%(Extension)')" />
-
+
-
-
+
+
@@ -219,6 +218,7 @@
+
@@ -227,6 +227,11 @@
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false" />
+
+
-
+
@@ -271,9 +276,11 @@
$(BUILD_RELEASE)$(BUILD_RELEASE)-$(BUILD_COMMENT)
+ $(BUILD_RELEASE)-$(BUILD_NIGHTLY)
+ $(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY)
-
+
+
+
+
+
+
+
+
diff --git a/build/BuildBelle.bat b/build/BuildBelle.bat
index e323abbb0d..0d58204f65 100644
--- a/build/BuildBelle.bat
+++ b/build/BuildBelle.bat
@@ -6,7 +6,7 @@ SET nuGetFolder=%CD%\..\src\packages\
ECHO Configured packages folder: %nuGetFolder%
ECHO Current folder: %CD%
-%CD%\..\src\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder%
+%CD%\..\src\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder% -Verbosity quiet
for /f "delims=" %%A in ('dir %nuGetFolder%node.js.* /b') do set "nodePath=%nuGetFolder%%%A\"
for /f "delims=" %%A in ('dir %nuGetFolder%npm.js.* /b') do set "npmPath=%nuGetFolder%%%A\tools\"
@@ -24,9 +24,9 @@ ECHO Change directory to %CD%\..\src\Umbraco.Web.UI.Client\
CD %CD%\..\src\Umbraco.Web.UI.Client\
ECHO Do npm install and the grunt build of Belle
-call npm install
-call npm install -g grunt-cli
-call npm install -g bower
+call npm install --quiet
+call npm install -g grunt-cli --quiet
+call npm install -g bower --quiet
call grunt build --buildversion=%release%
ECHO Reset path to what it was before
diff --git a/build/InstallGit.cmd b/build/InstallGit.cmd
index f10fe6c100..2bd6d7cc35 100644
--- a/build/InstallGit.cmd
+++ b/build/InstallGit.cmd
@@ -6,14 +6,14 @@ if %ERRORLEVEL%==9009 GOTO :trydefaultpath
GOTO :EOF
:trydefaultpath
-path=C:\Program Files (x86)\Git\cmd;%PATH%
+path=C:\Program Files (x86)\Git\cmd;C:\Program Files\Git\cmd;%PATH%
git.exe 2> NUL
if %ERRORLEVEL%==9009 GOTO :showerror
GOTO :EOF
:showerror
path=%oldPath%
-ECHO Git is not in your path and could not be found in C:\Program Files (x86)\Git\bin
+ECHO Git is not in your path and could not be found in C:\Program Files (x86)\Git\cmd
set /p install=" Do you want to install Git through Chocolatey [y/n]? " %=%
if %install%==y (
GOTO :installgit
diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 1bb1a78d03..6852b04510 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -15,27 +15,29 @@
en-USumbraco
-
+
-
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 76d72935e9..61a8188804 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -26,7 +26,6 @@
-
@@ -41,6 +40,7 @@
+
\ No newline at end of file
diff --git a/build/NuSpecs/build/UmbracoCms.targets b/build/NuSpecs/build/UmbracoCms.targets
index 024d8af7ad..fde5b4ea81 100644
--- a/build/NuSpecs/build/UmbracoCms.targets
+++ b/build/NuSpecs/build/UmbracoCms.targets
@@ -1,6 +1,17 @@
+
+
+ $(MSBuildThisFileDirectory)..\UmbracoFiles\
+
+
+
+
+
+
+
+
$(MSBuildThisFileDirectory)..\UmbracoFiles\
@@ -47,4 +58,4 @@
-
\ No newline at end of file
+
diff --git a/build/NuSpecs/tools/Dashboard.config.install.xdt b/build/NuSpecs/tools/Dashboard.config.install.xdt
index 1f5bbb0164..197f9c1b6f 100644
--- a/build/NuSpecs/tools/Dashboard.config.install.xdt
+++ b/build/NuSpecs/tools/Dashboard.config.install.xdt
@@ -1,6 +1,6 @@
-
+
@@ -20,7 +20,7 @@
-
+
views/dashboard/developer/developerdashboardvideos.html
@@ -29,15 +29,20 @@
-
+
views/dashboard/developer/examinemanagement.html
+
+
+ views/dashboard/developer/xmldataintegrityreport.html
+
+
-
+
@@ -47,7 +52,7 @@
-
+
@@ -57,17 +62,10 @@
views/dashboard/default/startupdashboardintro.html
-
-
-
-
- views/dashboard/ChangePassword.html
-
-
-
+
diff --git a/build/NuSpecs/tools/ReadmeUpgrade.txt b/build/NuSpecs/tools/ReadmeUpgrade.txt
index 29aa41b55a..894f5e5f93 100644
--- a/build/NuSpecs/tools/ReadmeUpgrade.txt
+++ b/build/NuSpecs/tools/ReadmeUpgrade.txt
@@ -10,9 +10,6 @@
Don't forget to build!
-When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config
-file (and config files in the config folder).
-
We've done our best to transform your configuration files but in case something is not quite right: remember we
backed up your files in App_Data\NuGetBackup so you can find the original files before they were transformed.
diff --git a/build/NuSpecs/tools/Views.Web.config.install.xdt b/build/NuSpecs/tools/Views.Web.config.install.xdt
new file mode 100644
index 0000000000..c34963f2b0
--- /dev/null
+++ b/build/NuSpecs/tools/Views.Web.config.install.xdt
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt
index e6dc46aab7..cff81ba2d8 100644
--- a/build/NuSpecs/tools/Web.config.install.xdt
+++ b/build/NuSpecs/tools/Web.config.install.xdt
@@ -20,9 +20,9 @@
-
+
-
+
@@ -48,6 +48,13 @@
+
+
+
+
+
+
+ >
@@ -74,6 +81,10 @@
+
+
+
+
@@ -143,6 +154,12 @@
+
+
+
+
+
+
@@ -158,7 +175,31 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/NuSpecs/tools/install.core.ps1 b/build/NuSpecs/tools/install.core.ps1
index 9c631001d2..c81fa419c9 100644
--- a/build/NuSpecs/tools/install.core.ps1
+++ b/build/NuSpecs/tools/install.core.ps1
@@ -56,12 +56,25 @@ if ($project) {
if(Test-Path $umbracoBinFolder\ImageProcessor.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\ImageProcessor.Web.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.Web.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Lucene.Net.dll) { Remove-Item $umbracoBinFolder\Lucene.Net.dll -Force -Confirm:$false }
+ if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll -Force -Confirm:$false }
+ if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll -Force -Confirm:$false }
+ if(Test-Path $umbracoBinFolder\Microsoft.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.dll -Force -Confirm:$false }
+ if(Test-Path $umbracoBinFolder\Microsoft.Owin.Host.SystemWeb.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Host.SystemWeb.dll -Force -Confirm:$false }
+ if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.dll -Force -Confirm:$false }
+ if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.Cookies.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.Cookies.dll -Force -Confirm:$false }
+ if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.OAuth.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.OAuth.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Microsoft.Web.Infrastructure.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Infrastructure.dll -Force -Confirm:$false }
+ if(Test-Path $umbracoBinFolder\Microsoft.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Helpers.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\MiniProfiler.dll) { Remove-Item $umbracoBinFolder\MiniProfiler.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\MySql.Data.dll) { Remove-Item $umbracoBinFolder\MySql.Data.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Newtonsoft.Json.dll) { Remove-Item $umbracoBinFolder\Newtonsoft.Json.dll -Force -Confirm:$false }
+ if(Test-Path $umbracoBinFolder\Owin.dll) { Remove-Item $umbracoBinFolder\Owin.dll -Force -Confirm:$false }
+ if(Test-Path $umbracoBinFolder\Semver.dll) { Remove-Item $umbracoBinFolder\Semver.dll -Force -Confirm:$false }
+ if(Test-Path $umbracoBinFolder\System.Net.Http.Extensions.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Extensions.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Net.Http.Formatting.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Formatting.dll -Force -Confirm:$false }
+ if(Test-Path $umbracoBinFolder\System.Net.Http.Primitives.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Primitives.dll -Force -Confirm:$false }
+ if(Test-Path $umbracoBinFolder\System.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\System.Web.Helpers.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Web.Http.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Web.Http.WebHost.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.WebHost.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Web.Mvc.dll) { Remove-Item $umbracoBinFolder\System.Web.Mvc.dll -Force -Confirm:$false }
diff --git a/build/NuSpecs/tools/log4net.config.install.xdt b/build/NuSpecs/tools/log4net.config.install.xdt
new file mode 100644
index 0000000000..f4d3caf7fc
--- /dev/null
+++ b/build/NuSpecs/tools/log4net.config.install.xdt
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/NuSpecs/tools/trees.config.install.xdt b/build/NuSpecs/tools/trees.config.install.xdt
index 6acc793e05..f5a807b4bf 100644
--- a/build/NuSpecs/tools/trees.config.install.xdt
+++ b/build/NuSpecs/tools/trees.config.install.xdt
@@ -1,36 +1,127 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/RevertToCleanInstall.bat b/build/RevertToCleanInstall.bat
index 6c391386cd..b21b33d8ff 100644
--- a/build/RevertToCleanInstall.bat
+++ b/build/RevertToCleanInstall.bat
@@ -45,9 +45,6 @@ del ..\src\Umbraco.Web.UI\UserControls\*.*
echo Removing masterpage files
del ..\src\Umbraco.Web.UI\masterpages\*.*
-echo Removing view files
-del ..\src\Umbraco.Web.UI\Views\*.*
-
echo Removing razor files
del ..\src\Umbraco.Web.UI\macroScripts\*.*
@@ -104,7 +101,9 @@ echo Removing user control files
FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A
echo Removing view files
-FOR %%A IN (..\src\Umbraco.Web.UI\Views\*.*) DO DEL %%A
+ATTRIB +H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
+FOR %%A IN (..\src\Umbraco.Web.UI\Views\) DO DEL /Q /S *.cshtml -H
+ATTRIB -H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
echo Removing razor files
FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
diff --git a/build/RevertToEmptyInstall.bat b/build/RevertToEmptyInstall.bat
index d59e2cdc88..b8abe4e64e 100644
--- a/build/RevertToEmptyInstall.bat
+++ b/build/RevertToEmptyInstall.bat
@@ -54,9 +54,6 @@ del ..\src\Umbraco.Web.UI\UserControls\*.*
echo Removing masterpage files
del ..\src\Umbraco.Web.UI\masterpages\*.*
-echo Removing view files
-del ..\src\Umbraco.Web.UI\Views\*.*
-
echo Removing razor files
del ..\src\Umbraco.Web.UI\macroScripts\*.*
@@ -122,7 +119,9 @@ echo Removing user control files
FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A
echo Removing view files
-FOR %%A IN (..\src\Umbraco.Web.UI\Views\*.*) DO DEL %%A
+ATTRIB +H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
+FOR %%A IN (..\src\Umbraco.Web.UI\Views\) DO DEL /Q /S *.cshtml -H
+ATTRIB -H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
echo Removing razor files
FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
@@ -151,6 +150,9 @@ rmdir "..\src\Umbraco.Web.UI\usercontrols\umbracoContour\" /S /Q
echo Start with a clean web.config
copy ..\src\Umbraco.Web.UI\web.Template.config ..\src\Umbraco.Web.UI\web.config /Y
+echo Start with a clean web.config
+copy ..\src\Umbraco.Web.UI\web.Template.config ..\src\Umbraco.Web.UI\web.config /Y
+
echo "Umbraco install reverted to clean install"
pause
exit
diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt
index bba582b4dc..803b95f9af 100644
--- a/build/UmbracoVersion.txt
+++ b/build/UmbracoVersion.txt
@@ -1,2 +1,3 @@
# Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-8.0.0
\ No newline at end of file
+8.0.0
+beta
\ No newline at end of file
diff --git a/src/NuGet.Config b/src/NuGet.Config
new file mode 100644
index 0000000000..dcccfdd5c1
--- /dev/null
+++ b/src/NuGet.Config
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj.DotSettings b/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj.DotSettings
new file mode 100644
index 0000000000..662f95686e
--- /dev/null
+++ b/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj.DotSettings
@@ -0,0 +1,2 @@
+
+ CSharp50
\ No newline at end of file
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 6c766f8e97..28b314750a 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -11,5 +11,5 @@ using System.Resources;
[assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("7.3.0")]
-[assembly: AssemblyInformationalVersion("7.3.0")]
\ No newline at end of file
+[assembly: AssemblyFileVersion("7.4.0")]
+[assembly: AssemblyInformationalVersion("7.4.0-beta")]
\ No newline at end of file
diff --git a/src/Umbraco.Core/ActionsResolver.cs b/src/Umbraco.Core/ActionsResolver.cs
index ff34f62c60..2da95a3416 100644
--- a/src/Umbraco.Core/ActionsResolver.cs
+++ b/src/Umbraco.Core/ActionsResolver.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Core
///
/// A resolver to return all IAction objects
///
- internal sealed class ActionsResolver : LazyManyObjectsResolverBase
+ public sealed class ActionsResolver : LazyManyObjectsResolverBase
{
///
/// Constructor
diff --git a/src/Umbraco.Core/ApplicationContext.cs b/src/Umbraco.Core/ApplicationContext.cs
index b303c087f7..503b7e7dd0 100644
--- a/src/Umbraco.Core/ApplicationContext.cs
+++ b/src/Umbraco.Core/ApplicationContext.cs
@@ -1,6 +1,7 @@
using System;
using System.Configuration;
using System.Threading;
+using System.Threading.Tasks;
using System.Web;
using System.Web.Caching;
using Umbraco.Core.Cache;
@@ -10,7 +11,7 @@ using Umbraco.Core.Logging;
using Umbraco.Core.ObjectResolution;
using Umbraco.Core.Profiling;
using Umbraco.Core.Services;
-
+using Umbraco.Core.Sync;
namespace Umbraco.Core
{
@@ -34,10 +35,13 @@ namespace Umbraco.Core
if (dbContext == null) throw new ArgumentNullException("dbContext");
if (serviceContext == null) throw new ArgumentNullException("serviceContext");
if (cache == null) throw new ArgumentNullException("cache");
+ if (logger == null) throw new ArgumentNullException("logger");
_databaseContext = dbContext;
_services = serviceContext;
ApplicationCache = cache;
ProfilingLogger = logger;
+
+ Init();
}
///
@@ -46,7 +50,7 @@ namespace Umbraco.Core
///
///
///
- [Obsolete("Use the other constructor specifying an ILogger instead")]
+ [Obsolete("Use the other constructor specifying a ProfilingLogger instead")]
public ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache)
: this(dbContext, serviceContext, cache,
new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler))
@@ -57,9 +61,27 @@ namespace Umbraco.Core
/// Creates a basic app context
///
///
+ [Obsolete("Use the other constructor specifying a ProfilingLogger instead")]
public ApplicationContext(CacheHelper cache)
{
+ if (cache == null) throw new ArgumentNullException("cache");
ApplicationCache = cache;
+ ProfilingLogger = new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler);
+ Init();
+ }
+
+ ///
+ /// Creates a basic app context
+ ///
+ ///
+ ///
+ public ApplicationContext(CacheHelper cache, ProfilingLogger logger)
+ {
+ if (cache == null) throw new ArgumentNullException("cache");
+ if (logger == null) throw new ArgumentNullException("logger");
+ ApplicationCache = cache;
+ ProfilingLogger = logger;
+ Init();
}
///
@@ -75,13 +97,13 @@ namespace Umbraco.Core
///
public static ApplicationContext EnsureContext(ApplicationContext appContext, bool replaceContext)
{
- if (ApplicationContext.Current != null)
+ if (Current != null)
{
if (!replaceContext)
- return ApplicationContext.Current;
+ return Current;
}
- ApplicationContext.Current = appContext;
- return ApplicationContext.Current;
+ Current = appContext;
+ return Current;
}
///
@@ -101,14 +123,14 @@ namespace Umbraco.Core
[Obsolete("Use the other method specifying an ProfilingLogger instead")]
public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, bool replaceContext)
{
- if (ApplicationContext.Current != null)
+ if (Current != null)
{
if (!replaceContext)
- return ApplicationContext.Current;
+ return Current;
}
var ctx = new ApplicationContext(dbContext, serviceContext, cache);
- ApplicationContext.Current = ctx;
- return ApplicationContext.Current;
+ Current = ctx;
+ return Current;
}
///
@@ -128,14 +150,14 @@ namespace Umbraco.Core
///
public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, ProfilingLogger logger, bool replaceContext)
{
- if (ApplicationContext.Current != null)
+ if (Current != null)
{
if (!replaceContext)
- return ApplicationContext.Current;
+ return Current;
}
var ctx = new ApplicationContext(dbContext, serviceContext, cache, logger);
- ApplicationContext.Current = ctx;
- return ApplicationContext.Current;
+ Current = ctx;
+ return Current;
}
///
@@ -190,64 +212,117 @@ namespace Umbraco.Core
// GlobalSettings.CurrentVersion returns the hard-coded "current version"
// the system is configured if they match
// if they don't, install runs, updates web.config (presumably) and updates GlobalSettings.ConfiguredStatus
- //
- // then there is Application["umbracoNeedConfiguration"] which makes no sense... getting rid of it... SD: I have actually remove that now!
- //
+
public bool IsConfigured
{
- // todo - we should not do this - ok for now
- get
- {
- return Configured;
- }
+ get { return _configured.Value; }
}
///
- /// If the db is configured and there is a database context, but we are not 'configured' , then it means we are upgrading
+ /// If the db is configured, there is a database context and there is an umbraco schema, but we are not 'configured' , then it means we are upgrading
///
public bool IsUpgrading
{
- get { return IsConfigured == false && DatabaseContext != null && DatabaseContext.IsDatabaseConfigured; }
+ get
+ {
+ if (IsConfigured == false
+ && DatabaseContext != null
+ && DatabaseContext.IsDatabaseConfigured)
+ {
+ var schemaresult = DatabaseContext.ValidateDatabaseSchema();
+ if (schemaresult.ValidTables.Count > 0) return true;
+ }
+
+ return false;
+ }
}
///
- /// The original/first url that the web application executes
+ /// The application url.
///
///
- /// we need to set the initial url in our ApplicationContext, this is so our keep alive service works and this must
- /// exist on a global context because the keep alive service doesn't run in a web context.
- /// we are NOT going to put a lock on this because locking will slow down the application and we don't really care
- /// if two threads write to this at the exact same time during first page hit.
- /// see: http://issues.umbraco.org/issue/U4-2059
+ /// The application url is the url that should be used by services to talk to the application,
+ /// eg keep alive or scheduled publishing services. It must exist on a global context because
+ /// some of these services may not run within a web context.
+ /// The format of the application url is:
+ /// - has a scheme (http or https)
+ /// - has the SystemDirectories.Umbraco path
+ /// - does not end with a slash
+ /// It is initialized on the first request made to the server, by UmbracoModule.EnsureApplicationUrl:
+ /// - if umbracoSettings:settings/web.routing/@umbracoApplicationUrl is set, use the value (new setting)
+ /// - if umbracoSettings:settings/scheduledTasks/@baseUrl is set, use the value (backward compatibility)
+ /// - otherwise, use the url of the (first) request.
+ /// Not locking, does not matter if several threads write to this.
+ /// See also issues:
+ /// - http://issues.umbraco.org/issue/U4-2059
+ /// - http://issues.umbraco.org/issue/U4-6788
+ /// - http://issues.umbraco.org/issue/U4-5728
+ /// - http://issues.umbraco.org/issue/U4-5391
///
- internal string OriginalRequestUrl { get; set; }
+ internal string UmbracoApplicationUrl
+ {
+ get
+ {
+ ApplicationUrlHelper.EnsureApplicationUrl(this);
+ return _umbracoApplicationUrl;
+ }
+ }
- ///
- /// Checks if the version configured matches the assembly version
- ///
- private bool Configured
+ // ReSharper disable once InconsistentNaming
+ internal string _umbracoApplicationUrl;
+
+ private Lazy _configured;
+ internal MainDom MainDom { get; private set; }
+
+ private void Init()
{
- get
- {
- try
- {
- string configStatus = ConfigurationStatus;
- string currentVersion = UmbracoVersion.Current.ToString(3);
+ MainDom = new MainDom(ProfilingLogger.Logger);
+ MainDom.Acquire();
+
+ //Create the lazy value to resolve whether or not the application is 'configured'
+ _configured = new Lazy(() =>
+ {
+ try
+ {
+ var configStatus = ConfigurationStatus;
+ var currentVersion = UmbracoVersion.GetSemanticVersion();
+ var ok =
+ //we are not configured if this is null
+ string.IsNullOrWhiteSpace(configStatus) == false
+ //they must match
+ && configStatus == currentVersion;
- if (currentVersion != configStatus)
- {
- ProfilingLogger.Logger.Debug("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");
- }
-
+ if (ok)
+ {
+ //The versions are the same in config, but are they the same in the database. We can only check this
+ // if we have a db context available, if we don't then we are not installed anyways
+ if (DatabaseContext.IsDatabaseConfigured && DatabaseContext.CanConnect)
+ {
+ var found = Services.MigrationEntryService.FindEntry(GlobalSettings.UmbracoMigrationName, UmbracoVersion.GetSemanticVersion());
+ if (found == null)
+ {
+ //we haven't executed this migration in this environment, so even though the config versions match,
+ // this db has not been updated.
+ ProfilingLogger.Logger.Debug(string.Format("The migration for version: '{0} has not been executed, there is no record in the database", currentVersion.ToSemanticString()));
+ ok = false;
+ }
+ }
+ }
+ else
+ {
+ ProfilingLogger.Logger.Debug(string.Format("CurrentVersion different from configStatus: '{0}','{1}'", currentVersion.ToSemanticString(), configStatus));
+ }
- return (configStatus == currentVersion);
- }
- catch
- {
- return false;
- }
- }
+ return ok;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error("Error determining if application is configured, returning false", ex);
+ return false;
+ }
+
+ });
}
private string ConfigurationStatus
@@ -305,6 +380,11 @@ namespace Umbraco.Core
internal set { _services = value; }
}
+ internal ServerRole GetCurrentServerRole()
+ {
+ var registrar = ServerRegistrarResolver.Current.Registrar as IServerRegistrar2;
+ return registrar == null ? ServerRole.Unknown : registrar.GetCurrentServerRole();
+ }
private volatile bool _disposed;
private readonly ReaderWriterLockSlim _disposalLocker = new ReaderWriterLockSlim();
diff --git a/src/Umbraco.Core/ApplicationEventHandler.cs b/src/Umbraco.Core/ApplicationEventHandler.cs
index a725a08a8e..8d97baac95 100644
--- a/src/Umbraco.Core/ApplicationEventHandler.cs
+++ b/src/Umbraco.Core/ApplicationEventHandler.cs
@@ -74,7 +74,7 @@ namespace Umbraco.Core
///
private bool ShouldExecute(ApplicationContext applicationContext)
{
- if (applicationContext.IsConfigured && applicationContext.DatabaseContext.CanConnect)
+ if (applicationContext.IsConfigured && applicationContext.DatabaseContext.IsDatabaseConfigured)
{
return true;
}
@@ -84,7 +84,7 @@ namespace Umbraco.Core
return true;
}
- if (!applicationContext.DatabaseContext.CanConnect && ExecuteWhenDatabaseNotConfigured)
+ if (!applicationContext.DatabaseContext.IsDatabaseConfigured && ExecuteWhenDatabaseNotConfigured)
{
return true;
}
diff --git a/src/Umbraco.Core/AsyncLock.cs b/src/Umbraco.Core/AsyncLock.cs
index 426984ab9f..b6a3f8534e 100644
--- a/src/Umbraco.Core/AsyncLock.cs
+++ b/src/Umbraco.Core/AsyncLock.cs
@@ -1,5 +1,6 @@
using System;
using System.Runtime.ConstrainedExecution;
+using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
@@ -11,6 +12,15 @@ namespace Umbraco.Core
// - this is NOT a reader/writer lock
// - this is NOT a recursive lock
//
+ // using a named Semaphore here and not a Mutex because mutexes have thread
+ // affinity which does not work with async situations
+ //
+ // it is important that managed code properly release the Semaphore before
+ // going down else it will maintain the lock - however note that when the
+ // whole process (w3wp.exe) goes down and all handles to the Semaphore have
+ // been closed, the Semaphore system object is destroyed - so in any case
+ // an iisreset should clean up everything
+ //
internal class AsyncLock
{
private readonly SemaphoreSlim _semaphore;
@@ -54,14 +64,14 @@ namespace Umbraco.Core
// for anonymous semaphore, use the unique releaser, else create a new one
return _semaphore != null
? _releaser // (IDisposable)new SemaphoreSlimReleaser(_semaphore)
- : (IDisposable)new NamedSemaphoreReleaser(_semaphore2);
+ : new NamedSemaphoreReleaser(_semaphore2);
}
public Task LockAsync()
{
var wait = _semaphore != null
- ? _semaphore.WaitAsync()
- : WaitOneAsync(_semaphore2);
+ ? _semaphore.WaitAsync()
+ : _semaphore2.WaitOneAsync();
return wait.IsCompleted
? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
@@ -70,6 +80,19 @@ namespace Umbraco.Core
TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
}
+ public Task LockAsync(int millisecondsTimeout)
+ {
+ var wait = _semaphore != null
+ ? _semaphore.WaitAsync(millisecondsTimeout)
+ : _semaphore2.WaitOneAsync(millisecondsTimeout);
+
+ return wait.IsCompleted
+ ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
+ : wait.ContinueWith((_, state) => (((AsyncLock)state).CreateReleaser()),
+ this, CancellationToken.None,
+ TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
+ }
+
public IDisposable Lock()
{
if (_semaphore != null)
@@ -95,38 +118,55 @@ namespace Umbraco.Core
private class NamedSemaphoreReleaser : CriticalFinalizerObject, IDisposable
{
private readonly Semaphore _semaphore;
+ private GCHandle _handle;
internal NamedSemaphoreReleaser(Semaphore semaphore)
{
_semaphore = semaphore;
+ _handle = GCHandle.Alloc(_semaphore);
}
public void Dispose()
{
Dispose(true);
- GC.SuppressFinalize(this);
+ GC.SuppressFinalize(this); // finalize will not run
}
private void Dispose(bool disposing)
{
// critical
+ _handle.Free();
_semaphore.Release();
+ _semaphore.Dispose();
}
- // we WANT to release the semaphore because it's a system object
- // ie a critical non-managed resource - so we inherit from CriticalFinalizerObject
- // which means that the finalizer "should" run in all situations
+ // we WANT to release the semaphore because it's a system object, ie a critical
+ // non-managed resource - and if it is not released then noone else can acquire
+ // the lock - so we inherit from CriticalFinalizerObject which means that the
+ // finalizer "should" run in all situations - there is always a chance that it
+ // does not run and the semaphore remains "acquired" but then chances are the
+ // whole process (w3wp.exe...) is going down, at which point the semaphore will
+ // be destroyed by Windows.
- // however... that can fail with System.ObjectDisposedException because the
- // underlying handle was closed... because we cannot guarantee that the semaphore
- // is not gone already... unless we get a GCHandle = GCHandle.Alloc(_semaphore);
- // which should keep it around and then we free the handle?
+ // however, the semaphore is a managed object, and so when the finalizer runs it
+ // might have been finalized already, and then we get a, ObjectDisposedException
+ // in the finalizer - which is bad.
- // so... I'm not sure this is safe really...
+ // in order to prevent this we do two things
+ // - use a GCHandler to ensure the semaphore is still there when the finalizer
+ // runs, so we can actually release it
+ // - wrap the finalizer code in a try...catch to make sure it never throws
~NamedSemaphoreReleaser()
{
- Dispose(false);
+ try
+ {
+ Dispose(false);
+ }
+ catch
+ {
+ // we do NOT want the finalizer to throw - never ever
+ }
}
}
@@ -159,40 +199,5 @@ namespace Umbraco.Core
Dispose(false);
}
}
-
- // http://stackoverflow.com/questions/25382583/waiting-on-a-named-semaphore-with-waitone100-vs-waitone0-task-delay100
- // http://blog.nerdbank.net/2011/07/c-await-for-waithandle.html
- // F# has a AwaitWaitHandle method that accepts a time out... and seems pretty complex...
- // version below should be OK
-
- private static Task WaitOneAsync(WaitHandle handle)
- {
- var tcs = new TaskCompletionSource
/// true if configured; otherwise, false.
- public static bool Configured
+ [Obsolete("Do not use this, it is no longer in use and will be removed from the codebase in future versions")]
+ internal static bool Configured
{
get
{
try
{
string configStatus = ConfigurationStatus;
- string currentVersion = UmbracoVersion.Current.ToString(3);
+ string currentVersion = UmbracoVersion.GetSemanticVersion().ToSemanticString();
if (currentVersion != configStatus)
@@ -594,10 +596,7 @@ namespace Umbraco.Core.Configuration
[Obsolete("Use Umbraco.Core.Configuration.UmbracoVersion.Current instead", false)]
public static string CurrentVersion
{
- get
- {
- return UmbracoVersion.Current.ToString(3);
- }
+ get { return UmbracoVersion.GetSemanticVersion().ToSemanticString(); }
}
///
@@ -768,38 +767,31 @@ namespace Umbraco.Core.Configuration
// store references to strings to determine changes
_reservedPathsCache = GlobalSettings.ReservedPaths;
_reservedUrlsCache = GlobalSettings.ReservedUrls;
-
- string _root = SystemDirectories.Root.Trim().ToLower();
-
+
// add URLs and paths to a new list
- StartsWithContainer _newReservedList = new StartsWithContainer();
- foreach (string reservedUrl in _reservedUrlsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
+ var newReservedList = new HashSet();
+ foreach (var reservedUrlTrimmed in _reservedUrlsCache
+ .Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries)
+ .Select(x => x.Trim().ToLowerInvariant())
+ .Where(x => x.IsNullOrWhiteSpace() == false)
+ .Select(reservedUrl => IOHelper.ResolveUrl(reservedUrl).Trim().EnsureStartsWith("/"))
+ .Where(reservedUrlTrimmed => reservedUrlTrimmed.IsNullOrWhiteSpace() == false))
{
- if (string.IsNullOrWhiteSpace(reservedUrl))
- continue;
-
-
- //resolves the url to support tilde chars
- string reservedUrlTrimmed = IOHelper.ResolveUrl(reservedUrl.Trim()).Trim().ToLower();
- if (reservedUrlTrimmed.Length > 0)
- _newReservedList.Add(reservedUrlTrimmed);
+ newReservedList.Add(reservedUrlTrimmed);
}
- foreach (string reservedPath in _reservedPathsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
+ foreach (var reservedPathTrimmed in _reservedPathsCache
+ .Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries)
+ .Select(x => x.Trim().ToLowerInvariant())
+ .Where(x => x.IsNullOrWhiteSpace() == false)
+ .Select(reservedPath => IOHelper.ResolveUrl(reservedPath).Trim().EnsureStartsWith("/").EnsureEndsWith("/"))
+ .Where(reservedPathTrimmed => reservedPathTrimmed.IsNullOrWhiteSpace() == false))
{
- bool trimEnd = !reservedPath.EndsWith("/");
- if (string.IsNullOrWhiteSpace(reservedPath))
- continue;
-
- //resolves the url to support tilde chars
- string reservedPathTrimmed = IOHelper.ResolveUrl(reservedPath.Trim()).Trim().ToLower();
-
- if (reservedPathTrimmed.Length > 0)
- _newReservedList.Add(reservedPathTrimmed + (reservedPathTrimmed.EndsWith("/") ? "" : "/"));
+ newReservedList.Add(reservedPathTrimmed);
}
// use the new list from now on
- _reservedList = _newReservedList;
+ _reservedList = newReservedList;
}
}
}
@@ -807,107 +799,17 @@ namespace Umbraco.Core.Configuration
//The url should be cleaned up before checking:
// * If it doesn't contain an '.' in the path then we assume it is a path based URL, if that is the case we should add an trailing '/' because all of our reservedPaths use a trailing '/'
// * We shouldn't be comparing the query at all
- var pathPart = url.Split('?')[0];
- if (!pathPart.Contains(".") && !pathPart.EndsWith("/"))
+ var pathPart = url.Split(new[] {'?'}, StringSplitOptions.RemoveEmptyEntries)[0].ToLowerInvariant();
+ if (pathPart.Contains(".") == false)
{
- pathPart += "/";
+ pathPart = pathPart.EnsureEndsWith('/');
}
// return true if url starts with an element of the reserved list
- return _reservedList.StartsWith(pathPart.ToLowerInvariant());
+ return _reservedList.Any(x => pathPart.InvariantStartsWith(x));
}
- ///
- /// Structure that checks in logarithmic time
- /// if a given string starts with one of the added keys.
- ///
- private class StartsWithContainer
- {
- /// Internal sorted list of keys.
- public SortedList _list
- = new SortedList(StartsWithComparator.Instance);
-
- ///
- /// Adds the specified new key.
- ///
- /// The new key.
- public void Add(string newKey)
- {
- // if the list already contains an element that begins with newKey, return
- if (String.IsNullOrEmpty(newKey) || StartsWith(newKey))
- return;
-
- // create a new collection, so the old one can still be accessed
- SortedList newList
- = new SortedList(_list.Count + 1, StartsWithComparator.Instance);
-
- // add only keys that don't already start with newKey, others are unnecessary
- foreach (string key in _list.Keys)
- if (!key.StartsWith(newKey))
- newList.Add(key, null);
- // add the new key
- newList.Add(newKey, null);
-
- // update the list (thread safe, _list was never in incomplete state)
- _list = newList;
- }
-
- ///
- /// Checks if the given string starts with any of the added keys.
- ///
- /// The target.
- /// true if a key is found that matches the start of target
- ///
- /// Runs in O(s*log(n)), with n the number of keys and s the length of target.
- ///
- public bool StartsWith(string target)
- {
- return _list.ContainsKey(target);
- }
-
- /// Comparator that tests if a string starts with another.
- /// Not a real comparator, since it is not reflexive. (x==y does not imply y==x)
- private sealed class StartsWithComparator : IComparer
- {
- /// Default string comparer.
- private readonly static Comparer _stringComparer = Comparer.Default;
-
- /// Gets an instance of the StartsWithComparator.
- public static readonly StartsWithComparator Instance = new StartsWithComparator();
-
- ///
- /// Tests if whole begins with all characters of part.
- ///
- /// The part.
- /// The whole.
- ///
- /// Returns 0 if whole starts with part, otherwise performs standard string comparison.
- ///
- public int Compare(string part, string whole)
- {
- // let the default string comparer deal with null or when part is not smaller then whole
- if (part == null || whole == null || part.Length >= whole.Length)
- return _stringComparer.Compare(part, whole);
-
- ////ensure both have a / on the end
- //part = part.EndsWith("/") ? part : part + "/";
- //whole = whole.EndsWith("/") ? whole : whole + "/";
- //if (part.Length >= whole.Length)
- // return _stringComparer.Compare(part, whole);
-
- // loop through all characters that part and whole have in common
- int pos = 0;
- bool match;
- do
- {
- match = (part[pos] == whole[pos]);
- } while (match && ++pos < part.Length);
-
- // return result of last comparison
- return match ? 0 : (part[pos] < whole[pos] ? -1 : 1);
- }
- }
- }
+
}
diff --git a/src/Umbraco.Core/Configuration/Grid/GridConfig.cs b/src/Umbraco.Core/Configuration/Grid/GridConfig.cs
new file mode 100644
index 0000000000..334124a4e5
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/Grid/GridConfig.cs
@@ -0,0 +1,16 @@
+using System.IO;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+ class GridConfig : IGridConfig
+ {
+ public GridConfig(ILogger logger, IRuntimeCacheProvider runtimeCache, DirectoryInfo appPlugins, DirectoryInfo configFolder, bool isDebug)
+ {
+ EditorsConfig = new GridEditorsConfig(logger, runtimeCache, appPlugins, configFolder, isDebug);
+ }
+
+ public IGridEditorsConfig EditorsConfig { get; private set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
new file mode 100644
index 0000000000..389c620637
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Manifest;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+ class GridEditorsConfig : IGridEditorsConfig
+ {
+ private readonly ILogger _logger;
+ private readonly IRuntimeCacheProvider _runtimeCache;
+ private readonly DirectoryInfo _appPlugins;
+ private readonly DirectoryInfo _configFolder;
+ private readonly bool _isDebug;
+
+ public GridEditorsConfig(ILogger logger, IRuntimeCacheProvider runtimeCache, DirectoryInfo appPlugins, DirectoryInfo configFolder, bool isDebug)
+ {
+ _logger = logger;
+ _runtimeCache = runtimeCache;
+ _appPlugins = appPlugins;
+ _configFolder = configFolder;
+ _isDebug = isDebug;
+ }
+
+ public IEnumerable Editors
+ {
+ get
+ {
+ Func> getResult = () =>
+ {
+ var editors = new List();
+ var gridConfig = Path.Combine(_configFolder.FullName, "grid.editors.config.js");
+ if (File.Exists(gridConfig))
+ {
+ try
+ {
+ var arr = JArray.Parse(File.ReadAllText(gridConfig));
+ //ensure the contents parse correctly to objects
+ var parsed = ManifestParser.GetGridEditors(arr);
+ editors.AddRange(parsed);
+ }
+ catch (Exception ex)
+ {
+ _logger.Error("Could not parse the contents of grid.editors.config.js into a JSON array", ex);
+ }
+ }
+
+ var parser = new ManifestParser(_appPlugins, _runtimeCache);
+ var builder = new ManifestBuilder(_runtimeCache, parser);
+ foreach (var gridEditor in builder.GridEditors)
+ {
+ //no duplicates! (based on alias)
+ if (editors.Contains(gridEditor) == false)
+ {
+ editors.Add(gridEditor);
+ }
+ }
+ return editors;
+ };
+
+ //cache the result if debugging is disabled
+ var result = _isDebug
+ ? getResult()
+ : _runtimeCache.GetCacheItem>(
+ typeof(GridEditorsConfig) + "Editors",
+ () => getResult(),
+ TimeSpan.FromMinutes(10));
+
+ return result;
+ }
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/Grid/IGridConfig.cs b/src/Umbraco.Core/Configuration/Grid/IGridConfig.cs
new file mode 100644
index 0000000000..a1170c136e
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/Grid/IGridConfig.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+ public interface IGridConfig
+ {
+
+ IGridEditorsConfig EditorsConfig { get; }
+
+ }
+}
diff --git a/src/Umbraco.Core/Configuration/Grid/IGridEditorConfig.cs b/src/Umbraco.Core/Configuration/Grid/IGridEditorConfig.cs
new file mode 100644
index 0000000000..0eedd5e035
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/Grid/IGridEditorConfig.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+ public interface IGridEditorConfig
+ {
+ string Name { get; }
+ string Alias { get; }
+ string View { get; }
+ string Render { get; }
+ string Icon { get; }
+ IDictionary Config { get; }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/Grid/IGridEditorsConfig.cs b/src/Umbraco.Core/Configuration/Grid/IGridEditorsConfig.cs
new file mode 100644
index 0000000000..64fb1a831f
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/Grid/IGridEditorsConfig.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+ public interface IGridEditorsConfig
+ {
+ IEnumerable Editors { get; }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoConfig.cs b/src/Umbraco.Core/Configuration/UmbracoConfig.cs
index 1be7b5aadf..3cd9bab776 100644
--- a/src/Umbraco.Core/Configuration/UmbracoConfig.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoConfig.cs
@@ -1,6 +1,9 @@
using System;
using System.Configuration;
+using System.IO;
+using Umbraco.Core.Cache;
using Umbraco.Core.Configuration.Dashboard;
+using Umbraco.Core.Configuration.Grid;
using Umbraco.Core.Configuration.UmbracoSettings;
using Umbraco.Core.Logging;
@@ -53,6 +56,7 @@ namespace Umbraco.Core.Configuration
private IDashboardSection _dashboardSection;
private IUmbracoSettingsSection _umbracoSettings;
+ private IGridConfig _gridConfig;
///
/// Gets the IDashboardSection
@@ -103,6 +107,28 @@ namespace Umbraco.Core.Configuration
}
+ }
+
+ ///
+ /// Only for testing
+ ///
+ ///
+ public void SetGridConfig(IGridConfig value)
+ {
+ _gridConfig = value;
+ }
+
+ ///
+ /// Gets the IGridConfig
+ ///
+ public IGridConfig GridConfig(ILogger logger, IRuntimeCacheProvider runtimeCache, DirectoryInfo appPlugins, DirectoryInfo configFolder, bool isDebug)
+ {
+ if (_gridConfig == null)
+ {
+ _gridConfig = new GridConfig(logger, runtimeCache, appPlugins, configFolder, isDebug);
+ }
+
+ return _gridConfig;
//TODO: Add other configurations here !
}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSection.cs
index f3d42b6904..2998fc2f78 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSection.cs
@@ -11,6 +11,8 @@
bool DisableFindContentByIdPath { get; }
string UrlProviderMode { get; }
+
+ string UmbracoApplicationUrl { get; }
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/WebRoutingElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/WebRoutingElement.cs
index f5b71eb2c7..1ed9bc034c 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/WebRoutingElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/WebRoutingElement.cs
@@ -30,8 +30,13 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
[ConfigurationProperty("urlProviderMode", DefaultValue = "AutoLegacy")]
public string UrlProviderMode
{
- get { return (string)base["urlProviderMode"]; }
+ get { return (string) base["urlProviderMode"]; }
}
+ [ConfigurationProperty("umbracoApplicationUrl", DefaultValue = null)]
+ public string UmbracoApplicationUrl
+ {
+ get { return (string)base["umbracoApplicationUrl"]; }
+ }
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index d79b2d6123..ef33e7a966 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -1,5 +1,6 @@
using System;
using System.Reflection;
+using Semver;
namespace Umbraco.Core.Configuration
{
@@ -23,10 +24,20 @@ namespace Umbraco.Core.Configuration
/// Gets the version comment (like beta or RC).
///
/// The version comment.
- public static string CurrentComment { get { return ""; } }
+ public static string CurrentComment { get { return "beta"; } }
// Get the version of the umbraco.dll by looking at a class in that dll
// Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx
public static string AssemblyVersion { get { return new AssemblyName(typeof(ActionsResolver).Assembly.FullName).Version.ToString(); } }
+
+ public static SemVersion GetSemanticVersion()
+ {
+ return new SemVersion(
+ Current.Major,
+ Current.Minor,
+ Current.Build,
+ CurrentComment.IsNullOrWhiteSpace() ? null : CurrentComment,
+ Current.Revision > 0 ? Current.Revision.ToInvariantString() : null);
+ }
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Constants-Applications.cs b/src/Umbraco.Core/Constants-Applications.cs
index f03108f4ac..12f7076fc4 100644
--- a/src/Umbraco.Core/Constants-Applications.cs
+++ b/src/Umbraco.Core/Constants-Applications.cs
@@ -43,7 +43,7 @@
public const string Users = "users";
///
- /// Application alias for the users section.
+ /// Application alias for the forms section.
///
public const string Forms = "forms";
}
@@ -59,7 +59,7 @@
public const string Content = "content";
///
- /// alias for the media tree.
+ /// alias for the member tree.
///
public const string Members = "member";
@@ -71,7 +71,7 @@
///
/// alias for the datatype tree.
///
- public const string DataTypes = "datatype";
+ public const string DataTypes = "dataTypes";
///
/// alias for the dictionary tree.
@@ -80,6 +80,22 @@
public const string Stylesheets = "stylesheets";
+ ///
+ /// alias for the document type tree.
+ ///
+ public const string DocumentTypes = "documentTypes";
+
+ ///
+ /// alias for the media type tree.
+ ///
+ public const string MediaTypes = "mediaTypes";
+
+
+ ///
+ /// alias for the member type tree.
+ ///
+ public const string MemberTypes = "memberTypes";
+
///
/// alias for the template tree.
///
diff --git a/src/Umbraco.Core/Constants-Conventions.cs b/src/Umbraco.Core/Constants-Conventions.cs
index c1d5bd35e3..7e2bb88964 100644
--- a/src/Umbraco.Core/Constants-Conventions.cs
+++ b/src/Umbraco.Core/Constants-Conventions.cs
@@ -27,6 +27,7 @@ namespace Umbraco.Core
///
/// The root id for all top level dictionary items
///
+ [Obsolete("There is no dictionary root item id anymore, it is simply null")]
public const string DictionaryItemRootId = "41c7638d-f529-4bff-853e-59a0c2fb1bde";
}
@@ -205,7 +206,7 @@ namespace Umbraco.Core
///
internal const string StandardPropertiesGroupName = "Membership";
- internal static Dictionary GetStandardPropertyTypeStubs()
+ public static Dictionary GetStandardPropertyTypeStubs()
{
return new Dictionary
{
diff --git a/src/Umbraco.Core/Constants-Icons.cs b/src/Umbraco.Core/Constants-Icons.cs
new file mode 100644
index 0000000000..a0928919f0
--- /dev/null
+++ b/src/Umbraco.Core/Constants-Icons.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core
+{
+ public static partial class Constants
+ {
+ public static class Icons
+ {
+
+
+ ///
+ /// System contenttype icon
+ ///
+ public const string ContentType = "icon-arrangement";
+
+ ///
+ /// System datatype icon
+ ///
+ public const string DataType = "icon-autofill";
+
+ ///
+ /// System property editor icon
+ ///
+ public const string PropertyEditor = "icon-autofill";
+
+ ///
+ /// System macro icon
+ ///
+ public const string Macro = "icon-settings-alt";
+
+ ///
+ /// System member icon
+ ///
+ public const string Member = "icon-user";
+
+ ///
+ /// System member icon
+ ///
+ public const string MemberType = "icon-users";
+
+
+ ///
+ /// System member icon
+ ///
+ public const string Template = "icon-layout";
+
+ }
+ }
+}
diff --git a/src/Umbraco.Core/Constants-ObjectTypes.cs b/src/Umbraco.Core/Constants-ObjectTypes.cs
index 81bd66928d..560cd4b306 100644
--- a/src/Umbraco.Core/Constants-ObjectTypes.cs
+++ b/src/Umbraco.Core/Constants-ObjectTypes.cs
@@ -2,91 +2,148 @@
namespace Umbraco.Core
{
- public static partial class Constants
- {
- ///
- /// Defines the identifiers for Umbraco object types as constants for easy centralized access/management.
- ///
- public static class ObjectTypes
- {
- ///
- /// Guid for a Content Item object.
- ///
- public const string ContentItem = "10E2B09F-C28B-476D-B77A-AA686435E44A";
+ public static partial class Constants
+ {
+ ///
+ /// Defines the identifiers for Umbraco object types as constants for easy centralized access/management.
+ ///
+ public static class ObjectTypes
+ {
+ ///
+ /// Guid for a data type container
+ ///
+ public const string DataTypeContainer = "521231E3-8B37-469C-9F9D-51AFC91FEB7B";
- ///
- /// Guid for a Content Item Type object.
- ///
- public const string ContentItemType = "7A333C54-6F43-40A4-86A2-18688DC7E532";
+ ///
+ /// Guid for a data type container
+ ///
+ public static readonly Guid DataTypeContainerGuid = new Guid(DataTypeContainer);
- ///
- /// Guid for the Content Recycle Bin.
- ///
- public const string ContentRecycleBin = "01BB7FF2-24DC-4C0C-95A2-C24EF72BBAC8";
+ ///
+ /// Guid for a doc type container
+ ///
+ public const string DocumentTypeContainer = "2F7A2769-6B0B-4468-90DD-AF42D64F7F16";
- ///
- /// Guid for a DataType object.
- ///
- public const string DataType = "30A2A501-1978-4DDB-A57B-F7EFED43BA3C";
+ ///
+ /// Guid for a doc type container
+ ///
+ public static readonly Guid DocumentTypeContainerGuid = new Guid(DocumentTypeContainer);
- ///
- /// Guid for a Document object.
- ///
- public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972";
+ ///
+ /// Guid for a doc type container
+ ///
+ public const string MediaTypeContainer = "42AEF799-B288-4744-9B10-BE144B73CDC4";
- ///
- /// Guid for a Document Type object.
- ///
- public const string DocumentType = "A2CB7800-F571-4787-9638-BC48539A0EFB";
+ ///
+ /// Guid for a doc type container
+ ///
+ public static readonly Guid MediaTypeContainerGuid = new Guid(MediaTypeContainer);
- ///
- /// Guid for a Media object.
- ///
- public const string Media = "B796F64C-1F99-4FFB-B886-4BF4BC011A9C";
+ ///
+ /// Guid for a Content Item object.
+ ///
+ public const string ContentItem = "10E2B09F-C28B-476D-B77A-AA686435E44A";
- ///
- /// Guid for the Media Recycle Bin.
- ///
- public const string MediaRecycleBin = "CF3D8E34-1C1C-41e9-AE56-878B57B32113";
+ ///
+ /// Guid for a Content Item Type object.
+ ///
+ public const string ContentItemType = "7A333C54-6F43-40A4-86A2-18688DC7E532";
- ///
- /// Guid for a Media Type object.
- ///
- public const string MediaType = "4EA4382B-2F5A-4C2B-9587-AE9B3CF3602E";
+ ///
+ /// Guid for the Content Recycle Bin.
+ ///
+ public const string ContentRecycleBin = "01BB7FF2-24DC-4C0C-95A2-C24EF72BBAC8";
- ///
- /// Guid for a Member object.
- ///
- public const string Member = "39EB0F98-B348-42A1-8662-E7EB18487560";
+ ///
+ /// Guid for a DataType object.
+ ///
+ public const string DataType = "30A2A501-1978-4DDB-A57B-F7EFED43BA3C";
- ///
- /// Guid for a Member Group object.
- ///
- public const string MemberGroup = "366E63B9-880F-4E13-A61C-98069B029728";
+ ///
+ /// Guid for a DataType object.
+ ///
+ public static readonly Guid DataTypeGuid = new Guid(DataType);
- ///
- /// Guid for a Member Type object.
- ///
- public const string MemberType = "9B5416FB-E72F-45A9-A07B-5A9A2709CE43";
+ ///
+ /// Guid for a Document object.
+ ///
+ public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972";
- ///
- /// Guid for a Stylesheet object.
- ///
+ ///
+ /// Guid for a Document Type object.
+ ///
+ public const string DocumentType = "A2CB7800-F571-4787-9638-BC48539A0EFB";
+
+ ///
+ /// Guid for a Document Type object.
+ ///
+ public static readonly Guid DocumentTypeGuid = new Guid(DocumentType);
+
+ ///
+ /// Guid for a Media object.
+ ///
+ public const string Media = "B796F64C-1F99-4FFB-B886-4BF4BC011A9C";
+
+ ///
+ /// Guid for the Media Recycle Bin.
+ ///
+ public const string MediaRecycleBin = "CF3D8E34-1C1C-41e9-AE56-878B57B32113";
+
+ ///
+ /// Guid for a Media Type object.
+ ///
+ public const string MediaType = "4EA4382B-2F5A-4C2B-9587-AE9B3CF3602E";
+
+ ///
+ /// Guid for a Media Type object.
+ ///
+ public static readonly Guid MediaTypeGuid = new Guid(MediaType);
+
+ ///
+ /// Guid for a Member object.
+ ///
+ public const string Member = "39EB0F98-B348-42A1-8662-E7EB18487560";
+
+ ///
+ /// Guid for a Member Group object.
+ ///
+ public const string MemberGroup = "366E63B9-880F-4E13-A61C-98069B029728";
+
+ ///
+ /// Guid for a Member Type object.
+ ///
+ public const string MemberType = "9B5416FB-E72F-45A9-A07B-5A9A2709CE43";
+
+ ///
+ /// Guid for a Member Type object.
+ ///
+ public static readonly Guid MemberTypeGuid = new Guid(MemberType);
+
+ ///
+ /// Guid for a Stylesheet object.
+ ///
[Obsolete("This no longer exists in the database")]
public const string Stylesheet = "9F68DA4F-A3A8-44C2-8226-DCBD125E4840";
[Obsolete("This no longer exists in the database")]
internal const string StylesheetProperty = "5555da4f-a123-42b2-4488-dcdfb25e4111";
- ///
- /// Guid for the System Root.
- ///
- public const string SystemRoot = "EA7D8624-4CFE-4578-A871-24AA946BF34D";
+ ///
+ /// Guid for the System Root.
+ ///
+ public const string SystemRoot = "EA7D8624-4CFE-4578-A871-24AA946BF34D";
- ///
- /// Guid for a Template object.
- ///
- public const string Template = "6FBDE604-4178-42CE-A10B-8A2600A2F07D";
- }
- }
+ ///
+ /// Guid for a Template object.
+ ///
+ public const string Template = "6FBDE604-4178-42CE-A10B-8A2600A2F07D";
+
+ ///
+ /// Guid for a Lock object.
+ ///
+ public const string LockObject = "87A9F1FF-B1E4-4A25-BABB-465A4A47EC41";
+
+
+ }
+ }
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index a719e845b1..2f7d247b36 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -158,6 +158,11 @@ namespace Umbraco.Core
///
public const string IntegerAlias = "Umbraco.Integer";
+ ///
+ /// Alias for the Decimal datatype.
+ ///
+ public const string DecimalAlias = "Umbraco.Decimal";
+
///
/// Alias for the listview datatype.
///
@@ -310,13 +315,13 @@ namespace Umbraco.Core
public const string TextboxAlias = "Umbraco.Textbox";
///
- /// Guid for the Textbox multiple datatype.
+ /// Guid for the Textarea datatype.
///
[Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
public const string TextboxMultiple = "67DB8357-EF57-493E-91AC-936D305E0F2A";
///
- /// Alias for the Textbox multiple datatype.
+ /// Alias for the Textarea datatype.
///
public const string TextboxMultipleAlias = "Umbraco.TextboxMultiple";
diff --git a/src/Umbraco.Core/Constants-PropertyTypeGroups.cs b/src/Umbraco.Core/Constants-PropertyTypeGroups.cs
new file mode 100644
index 0000000000..5dabe90029
--- /dev/null
+++ b/src/Umbraco.Core/Constants-PropertyTypeGroups.cs
@@ -0,0 +1,31 @@
+namespace Umbraco.Core
+{
+ public static partial class Constants
+ {
+ ///
+ /// Defines the identifiers for property-type groups conventions that are used within the Umbraco core.
+ ///
+ public static class PropertyTypeGroups
+ {
+ ///
+ /// Guid for a Image PropertyTypeGroup object.
+ ///
+ public const string Image = "79ED4D07-254A-42CF-8FA9-EBE1C116A596";
+
+ ///
+ /// Guid for a File PropertyTypeGroup object.
+ ///
+ public const string File = "50899F9C-023A-4466-B623-ABA9049885FE";
+
+ ///
+ /// Guid for a Image PropertyTypeGroup object.
+ ///
+ public const string Contents = "79995FA2-63EE-453C-A29B-2E66F324CDBE";
+
+ ///
+ /// Guid for a Image PropertyTypeGroup object.
+ ///
+ public const string Membership = "0756729D-D665-46E3-B84A-37ACEAA614F8";
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Constants-System.cs b/src/Umbraco.Core/Constants-System.cs
index b72afa265f..82e3a1ff3f 100644
--- a/src/Umbraco.Core/Constants-System.cs
+++ b/src/Umbraco.Core/Constants-System.cs
@@ -26,6 +26,8 @@
public const int DefaultMediaListViewDataTypeId = -96;
public const int DefaultMembersListViewDataTypeId = -97;
+ // identifiers for lock objects
+ public const int ServersLock = -331;
}
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Constants-Web.cs b/src/Umbraco.Core/Constants-Web.cs
index 0d7c2f41da..60fba0ae40 100644
--- a/src/Umbraco.Core/Constants-Web.cs
+++ b/src/Umbraco.Core/Constants-Web.cs
@@ -1,4 +1,7 @@
-namespace Umbraco.Core
+using System;
+using System.ComponentModel;
+
+namespace Umbraco.Core
{
public static partial class Constants
{
@@ -15,6 +18,8 @@
///
/// The auth cookie name
///
+ [Obsolete("DO NOT USE THIS, USE ISecuritySection.AuthCookieName, this will be removed in future versions")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public const string AuthCookieName = "UMB_UCONTEXT";
}
@@ -26,6 +31,7 @@
public const string BackOfficeExternalAuthenticationType = "UmbracoExternalCookie";
public const string BackOfficeExternalCookieName = "UMB_EXTLOGIN";
public const string BackOfficeTokenAuthenticationType = "UmbracoBackOfficeToken";
+ public const string BackOfficeTwoFactorAuthenticationType = "UmbracoTwoFactorCookie";
///
/// The prefix used for external identity providers for their authentication type
diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs
index 990e8d471e..2c8ffe4f7f 100644
--- a/src/Umbraco.Core/CoreBootManager.cs
+++ b/src/Umbraco.Core/CoreBootManager.cs
@@ -3,10 +3,13 @@ using System.IO;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
+using System.Threading;
using AutoMapper;
using Umbraco.Core.Cache;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Events;
+using Umbraco.Core.Exceptions;
using Umbraco.Core.IO;
using Umbraco.Core.LightInject;
using Umbraco.Core.Logging;
@@ -51,8 +54,8 @@ namespace Umbraco.Core
private bool _isStarted = false;
private bool _isComplete = false;
private readonly UmbracoApplicationBase _umbracoApplication;
-
protected ApplicationContext ApplicationContext { get; private set; }
+ protected CacheHelper ApplicationCache { get; private set; }
protected UmbracoApplicationBase UmbracoApplication
{
@@ -72,27 +75,32 @@ namespace Umbraco.Core
_umbracoApplication = umbracoApplication;
}
+ internal CoreBootManager(UmbracoApplicationBase umbracoApplication, ProfilingLogger logger)
+ {
+ if (umbracoApplication == null) throw new ArgumentNullException("umbracoApplication");
+ if (logger == null) throw new ArgumentNullException("logger");
+ _umbracoApplication = umbracoApplication;
+ ProfilingLogger = logger;
+ }
+
public virtual IBootManager Initialize()
{
if (_isInitialized)
throw new InvalidOperationException("The boot manager has already been initialized");
- //Create logger/profiler, and their resolvers, these are special resolvers that can be resolved before frozen so we can start logging
- LoggerResolver.Current = new LoggerResolver(_umbracoApplication.Logger) { CanResolveBeforeFrozen = true };
- var profiler = CreateProfiler();
- ProfilerResolver.Current = new ProfilerResolver(profiler) {CanResolveBeforeFrozen = true};
- ProfilingLogger = new ProfilingLogger(_umbracoApplication.Logger, profiler);
+ InitializeLoggerResolver();
+ InitializeProfilerResolver();
- _timer = ProfilingLogger.DebugDuration("Umbraco application starting", "Umbraco application startup complete");
+ ProfilingLogger = ProfilingLogger?? new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler);
- //create the plugin manager
- //TODO: this is currently a singleton but it would be better if it weren't. Unfortunately the only way to get
- // rid of this singleton would be to put it into IoC and then use the ServiceLocator pattern.
+ _timer = ProfilingLogger.TraceDuration(
+ string.Format("Umbraco {0} application starting on {1}", UmbracoVersion.GetSemanticVersion().ToSemanticString(), NetworkHelper.MachineName),
+ "Umbraco application startup complete");
_cacheHelper = CreateApplicationCache();
ServiceProvider = new ActivatorServiceProvider();
PluginManager.Current = PluginManager = new PluginManager(ServiceProvider, _cacheHelper.RuntimeCache, ProfilingLogger, true);
- //build up core IoC servoces
+ ApplicationCache = CreateApplicationCache();
ConfigureCoreServices(Container);
//set the singleton resolved from the core container
@@ -118,6 +126,7 @@ namespace Umbraco.Core
InitializeModelMappers();
//now we need to call the initialize methods
+ //TODO: Make sure to try/catch the OnApplicationInitialized!!
Parallel.ForEach(_appStartupEvtContainer.GetAllInstances(), x => x.OnApplicationInitialized(UmbracoApplication, ApplicationContext));
_isInitialized = true;
@@ -258,6 +267,7 @@ namespace Umbraco.Core
if (_isStarted)
throw new InvalidOperationException("The boot manager has already been initialized");
+ //TODO: Make sure to try/catch the OnApplicationInitialized!!
//call OnApplicationStarting of each application events handler
Parallel.ForEach(_appStartupEvtContainer.GetAllInstances(), x => x.OnApplicationStarting(UmbracoApplication, ApplicationContext));
@@ -280,12 +290,24 @@ namespace Umbraco.Core
{
if (_isComplete)
throw new InvalidOperationException("The boot manager has already been completed");
-
+
FreezeResolution();
+ //Here we need to make sure the db can be connected to
+ EnsureDatabaseConnection();
+
+
+ //This is a special case for the user service, we need to tell it if it's an upgrade, if so we need to ensure that
+ // exceptions are bubbled up if a user is attempted to be persisted during an upgrade (i.e. when they auth to login)
+ ((UserService) ApplicationContext.Services.UserService).IsUpgrading = true;
+
+
+
//call OnApplicationStarting of each application events handler
+ //TODO: Make sure to try/catch the OnApplicationInitialized!!
Parallel.ForEach(_appStartupEvtContainer.GetAllInstances(), x => x.OnApplicationStarted(UmbracoApplication, ApplicationContext));
+
//end the current scope which was created to intantiate all of the startup handlers
_appStartupEvtContainer.EndCurrentScope();
@@ -302,6 +324,36 @@ namespace Umbraco.Core
//stop the timer and log the output
_timer.Dispose();
return this;
+ }
+
+ ///
+ /// We cannot continue if the db cannot be connected to
+ ///
+ private void EnsureDatabaseConnection()
+ {
+ if (ApplicationContext.IsConfigured == false) return;
+ if (ApplicationContext.DatabaseContext.IsDatabaseConfigured == false) return;
+
+ //try now
+ if (ApplicationContext.DatabaseContext.CanConnect)
+ return;
+
+ var currentTry = 0;
+ while (currentTry < 5)
+ {
+ //first wait, then retry
+ Thread.Sleep(1000);
+
+ if (ApplicationContext.DatabaseContext.CanConnect)
+ break;
+
+ currentTry++;
+ }
+
+ if (currentTry == 5)
+ {
+ throw new UmbracoStartupFailedException("Umbraco cannot start. A connection string is configured but the Umbraco cannot connect to the database.");
+ }
}
///
@@ -336,17 +388,34 @@ namespace Umbraco.Core
new Lazy(() => typeof (DelimitedManifestValueValidator)),
new Lazy(() => typeof (EmailValidator)),
new Lazy(() => typeof (IntegerValidator)),
+ new Lazy(() => typeof (DecimalValidator)),
});
- //by default we'll use the standard configuration based sync
- ServerRegistrarResolver.Current = new ServerRegistrarResolver(Container, typeof(ConfigServerRegistrar));
+ //by default we'll use the db server registrar unless the developer has the legacy
+ // dist calls enabled, in which case we'll use the config server registrar
+ if (UmbracoConfig.For.UmbracoSettings().DistributedCall.Enabled)
+ {
+ ServerRegistrarResolver.Current = new ServerRegistrarResolver(new ConfigServerRegistrar());
+ }
+ else
+ {
+ ServerRegistrarResolver.Current = new ServerRegistrarResolver(
+ new DatabaseServerRegistrar(
+ new Lazy(() => ApplicationContext.Services.ServerRegistrationService),
+ new DatabaseServerRegistrarOptions()));
+ }
+
- //by default (outside of the web) we'll use the default server messenger without
- //supplying a username/password, this will automatically disable distributed calls
- // .. we'll override this in the WebBootManager
- ServerMessengerResolver.Current = new ServerMessengerResolver(Container, typeof (WebServiceServerMessenger));
+ //by default we'll use the database server messenger with default options (no callbacks),
+ // this will be overridden in the web startup
+ ServerMessengerResolver.Current = new ServerMessengerResolver(
+ new DatabaseServerMessenger(ApplicationContext, true, new DatabaseServerMessengerOptions()));
+ MappingResolver.Current = new MappingResolver(
+ ServiceProvider, ProfilingLogger.Logger,
+ () => PluginManager.ResolveAssignedMapperTypes());
+
//RepositoryResolver.Current = new RepositoryResolver(
// new RepositoryFactory(ApplicationCache));
diff --git a/src/Umbraco.Core/DatabaseContext.cs b/src/Umbraco.Core/DatabaseContext.cs
index 741c4f9746..17b274d4ba 100644
--- a/src/Umbraco.Core/DatabaseContext.cs
+++ b/src/Umbraco.Core/DatabaseContext.cs
@@ -6,6 +6,7 @@ using System.Linq;
using System.Web;
using System.Web.Configuration;
using System.Xml.Linq;
+using Semver;
using Umbraco.Core.Configuration;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
@@ -13,6 +14,7 @@ using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Migrations;
using Umbraco.Core.Persistence.Migrations.Initial;
using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Services;
namespace Umbraco.Core
{
@@ -28,8 +30,6 @@ namespace Umbraco.Core
private readonly ILogger _logger;
private readonly SqlSyntaxProviders _syntaxProviders;
private bool _configured;
- private bool _canConnect;
- private volatile bool _connectCheck = false;
private readonly object _locker = new object();
private string _connectionString;
private string _providerName;
@@ -78,7 +78,7 @@ namespace Umbraco.Core
/// This should not be used for CRUD operations or queries against the
/// standard Umbraco tables! Use the Public services for that.
///
- public UmbracoDatabase Database
+ public virtual UmbracoDatabase Database
{
get { return _factory.CreateDatabase(); }
}
@@ -86,7 +86,7 @@ namespace Umbraco.Core
///
/// Boolean indicating whether the database has been configured
///
- public bool IsDatabaseConfigured
+ public virtual bool IsDatabaseConfigured
{
get { return _configured; }
}
@@ -94,33 +94,21 @@ namespace Umbraco.Core
///
/// Determines if the db can be connected to
///
- public bool CanConnect
+ public virtual bool CanConnect
{
get
{
if (IsDatabaseConfigured == false) return false;
-
- //double check lock so that it is only checked once and is fast
- if (_connectCheck == false)
- {
- lock (_locker)
- {
- if (_canConnect == false)
- {
- _canConnect = DbConnectionExtensions.IsConnectionAvailable(ConnectionString, DatabaseProvider);
- _connectCheck = true;
- }
- }
- }
-
- return _canConnect;
+ var canConnect = DbConnectionExtensions.IsConnectionAvailable(ConnectionString, DatabaseProvider);
+ LogHelper.Info("CanConnect = " + canConnect);
+ return canConnect;
}
}
///
/// Gets the configured umbraco db connection string.
///
- public string ConnectionString
+ public virtual string ConnectionString
{
get { return _connectionString; }
}
@@ -152,7 +140,7 @@ namespace Umbraco.Core
///
/// Returns the Type of DatabaseProvider used
///
- public DatabaseProviders DatabaseProvider
+ public virtual DatabaseProviders DatabaseProvider
{
get
{
@@ -527,7 +515,7 @@ namespace Umbraco.Core
return _result;
}
- internal Result CreateDatabaseSchemaAndData()
+ internal Result CreateDatabaseSchemaAndData(ApplicationContext applicationContext)
{
try
{
@@ -564,13 +552,15 @@ namespace Umbraco.Core
message = GetResultMessageForMySql();
var schemaResult = ValidateDatabaseSchema();
- var installedVersion = schemaResult.DetermineInstalledVersion();
+
+ var installedSchemaVersion = schemaResult.DetermineInstalledVersion();
//If Configuration Status is empty and the determined version is "empty" its a new install - otherwise upgrade the existing
- if (string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus) && installedVersion.Equals(new Version(0, 0, 0)))
+ if (string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus) && installedSchemaVersion.Equals(new Version(0, 0, 0)))
{
- var schemaHelper = new DatabaseSchemaHelper(database, _logger, SqlSyntax);
- schemaHelper.CreateDatabaseSchema();
+ var helper = new DatabaseSchemaHelper(database, _logger, SqlSyntax);
+ helper.CreateDatabaseSchema(true, applicationContext);
+
message = message + "
Installation completed!
";
//now that everything is done, we need to determine the version of SQL server that is executing
@@ -599,7 +589,7 @@ namespace Umbraco.Core
/// This assumes all of the previous checks are done!
///
///
- internal Result UpgradeSchemaAndData(IMigrationResolver migrationResolver)
+ internal Result UpgradeSchemaAndData(IMigrationEntryService migrationEntryService)
{
try
{
@@ -618,16 +608,55 @@ namespace Umbraco.Core
var message = GetResultMessageForMySql();
var schemaResult = ValidateDatabaseSchema();
- var installedVersion = schemaResult.DetermineInstalledVersion();
+
+ var installedSchemaVersion = new SemVersion(schemaResult.DetermineInstalledVersion());
+
+ var installedMigrationVersion = new SemVersion(0);
+ //we cannot check the migrations table if it doesn't exist, this will occur when upgrading to 7.3
+ if (schemaResult.ValidTables.Any(x => x.InvariantEquals("umbracoMigration")))
+ {
+ installedMigrationVersion = schemaResult.DetermineInstalledVersionByMigrations(migrationEntryService);
+ }
+
+ var targetVersion = UmbracoVersion.Current;
+ //In some cases - like upgrading from 7.2.6 -> 7.3, there will be no migration information in the database and therefore it will
+ // return a version of 0.0.0 and we don't necessarily want to run all migrations from 0 -> 7.3, so we'll just ensure that the
+ // migrations are run for the target version
+ if (installedMigrationVersion == new SemVersion(new Version(0, 0, 0)) && installedSchemaVersion > new SemVersion(new Version(0, 0, 0)))
+ {
+ //set the installedMigrationVersion to be one less than the target so the latest migrations are guaranteed to execute
+ installedMigrationVersion = new SemVersion(targetVersion.SubtractRevision());
+ }
+
+ //Figure out what our current installed version is. If the web.config doesn't have a version listed, then we'll use the minimum
+ // version detected between the schema installed and the migrations listed in the migration table.
+ // If there is a version in the web.config, we'll take the minimum between the listed migration in the db and what
+ // is declared in the web.config.
+
+ var currentInstalledVersion = string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus)
+ //Take the minimum version between the detected schema version and the installed migration version
+ ? new[] {installedSchemaVersion, installedMigrationVersion}.Min()
+ //Take the minimum version between the installed migration version and the version specified in the config
+ : new[] { SemVersion.Parse(GlobalSettings.ConfigurationStatus), installedMigrationVersion }.Min();
+
+ //Ok, another edge case here. If the current version is a pre-release,
+ // then we want to ensure all migrations for the current release are executed.
+ if (currentInstalledVersion.Prerelease.IsNullOrWhiteSpace() == false)
+ {
+ currentInstalledVersion = new SemVersion(currentInstalledVersion.GetVersion().SubtractRevision());
+ }
+
//DO the upgrade!
- var currentVersion = string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus)
- ? installedVersion
- : new Version(GlobalSettings.ConfigurationStatus);
- var targetVersion = UmbracoVersion.Current;
- var runner = new MigrationRunner(migrationResolver, _logger, currentVersion, targetVersion, GlobalSettings.UmbracoMigrationName);
- var upgraded = runner.Execute(database, DatabaseProvider, SqlSyntax, true);
+ var runner = new MigrationRunner(migrationEntryService, _logger, currentInstalledVersion, UmbracoVersion.GetSemanticVersion(), GlobalSettings.UmbracoMigrationName);
+
+
+ if (upgraded == false)
+ {
+ throw new ApplicationException("Upgrading failed, either an error occurred during the upgrade process or an event canceled the upgrade process, see log for full details");
+ }
+
message = message + "
Upgrade completed!
";
//now that everything is done, we need to determine the version of SQL server that is executing
diff --git a/src/Umbraco.Core/DelegateExtensions.cs b/src/Umbraco.Core/DelegateExtensions.cs
new file mode 100644
index 0000000000..78450448e2
--- /dev/null
+++ b/src/Umbraco.Core/DelegateExtensions.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+
+namespace Umbraco.Core
+{
+ public static class DelegateExtensions
+ {
+ public static Attempt RetryUntilSuccessOrTimeout(this Func> task, TimeSpan timeout, TimeSpan pause)
+ {
+ if (pause.TotalMilliseconds < 0)
+ {
+ throw new ArgumentException("pause must be >= 0 milliseconds");
+ }
+ var stopwatch = Stopwatch.StartNew();
+ do
+ {
+ var result = task();
+ if (result) { return result; }
+ Thread.Sleep((int)pause.TotalMilliseconds);
+ }
+ while (stopwatch.Elapsed < timeout);
+ return Attempt.Fail();
+ }
+
+ public static Attempt RetryUntilSuccessOrMaxAttempts(this Func> task, int totalAttempts, TimeSpan pause)
+ {
+ if (pause.TotalMilliseconds < 0)
+ {
+ throw new ArgumentException("pause must be >= 0 milliseconds");
+ }
+ int attempts = 0;
+ do
+ {
+ attempts++;
+ var result = task(attempts);
+ if (result) { return result; }
+ Thread.Sleep((int)pause.TotalMilliseconds);
+ }
+ while (attempts < totalAttempts);
+ return Attempt.Fail();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Dictionary/CultureDictionaryFactoryResolver.cs b/src/Umbraco.Core/Dictionary/CultureDictionaryFactoryResolver.cs
index 8d744c90a6..cf0227d2a3 100644
--- a/src/Umbraco.Core/Dictionary/CultureDictionaryFactoryResolver.cs
+++ b/src/Umbraco.Core/Dictionary/CultureDictionaryFactoryResolver.cs
@@ -1,5 +1,6 @@
using System;
using System.Linq.Expressions;
+using System.ComponentModel;
using Umbraco.Core.LightInject;
using Umbraco.Core.ObjectResolution;
@@ -36,13 +37,13 @@ namespace Umbraco.Core.Dictionary
}
///
- /// Can be used by developers at runtime to set their ICultureDictionaryFactory at app startup
- ///
- ///
- public void SetContentStore(ICultureDictionaryFactory factory)
- {
- Value = factory;
- }
+ /// Can be used by developers at runtime to set their ICultureDictionaryFactory at app startup
+ ///
+ ///
+ public void SetDictionaryFactory(ICultureDictionaryFactory factory)
+ {
+ Value = factory;
+ }
///
/// Returns the ICultureDictionaryFactory
diff --git a/src/Umbraco.Core/Dictionary/ICultureDictionary.cs b/src/Umbraco.Core/Dictionary/ICultureDictionary.cs
index 57a739dbc6..8617d7440e 100644
--- a/src/Umbraco.Core/Dictionary/ICultureDictionary.cs
+++ b/src/Umbraco.Core/Dictionary/ICultureDictionary.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Globalization;
namespace Umbraco.Core.Dictionary
@@ -19,5 +20,12 @@ namespace Umbraco.Core.Dictionary
/// Returns the current culture
///
CultureInfo Culture { get; }
+
+ ///
+ /// Returns the child dictionary entries for a given key
+ ///
+ ///
+ ///
+ IDictionary GetChildren(string key);
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/DisposableObject.cs b/src/Umbraco.Core/DisposableObject.cs
index f054b53c98..516a9712e5 100644
--- a/src/Umbraco.Core/DisposableObject.cs
+++ b/src/Umbraco.Core/DisposableObject.cs
@@ -4,69 +4,58 @@ using System.Threading;
namespace Umbraco.Core
{
///
- /// Abstract implementation of logic commonly required to safely handle disposable unmanaged resources.
+ /// Abstract implementation of IDisposable.
///
+ ///
+ /// Can also be used as a pattern for when inheriting is not possible.
+ ///
+ /// See also: https://msdn.microsoft.com/en-us/library/b1yfkh5e%28v=vs.110%29.aspx
+ /// See also: https://lostechies.com/chrispatterson/2012/11/29/idisposable-done-right/
+ ///
+ /// Note: if an object's ctor throws, it will never be disposed, and so if that ctor
+ /// has allocated disposable objects, it should take care of disposing them.
+ ///
public abstract class DisposableObject : IDisposable
{
private bool _disposed;
- private readonly ReaderWriterLockSlim _disposalLocker = new ReaderWriterLockSlim();
+ private readonly object _locko = new object();
- ///
- /// Gets a value indicating whether this instance is disposed.
- ///
- ///
- /// true if this instance is disposed; otherwise, false.
- ///
- public bool IsDisposed
- {
- get { return _disposed; }
- }
+ // gets a value indicating whether this instance is disposed.
+ // for internal tests only (not thread safe)
+ //TODO make this internal + rename "Disposed" when we can break compatibility
+ public bool IsDisposed { get { return _disposed; } }
- ///
- /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
- ///
- /// 2
+ // implements IDisposable
public void Dispose()
{
Dispose(true);
-
- // Use SupressFinalize in case a subclass of this type implements a finalizer.
GC.SuppressFinalize(this);
}
+ // finalizer
~DisposableObject()
{
- // Run dispose but let the class know it was due to the finalizer running.
Dispose(false);
}
- protected virtual void Dispose(bool disposing)
+ //TODO make this private, non-virtual when we can break compatibility
+ protected virtual void Dispose(bool disposing)
{
- // Only operate if we haven't already disposed
- if (IsDisposed || !disposing) return;
+ lock (_locko)
+ {
+ if (_disposed) return;
+ _disposed = true;
+ }
- using (new WriteLock(_disposalLocker))
- {
- // Check again now we're inside the lock
- if (IsDisposed) return;
+ DisposeUnmanagedResources();
- // Call to actually release resources. This method is only
- // kept separate so that the entire disposal logic can be used as a VS snippet
- DisposeResources();
-
- // Indicate that the instance has been disposed.
- _disposed = true;
- }
+ if (disposing)
+ DisposeResources();
}
- ///
- /// Handles the disposal of resources. Derived from abstract class which handles common required locking logic.
- ///
protected abstract void DisposeResources();
protected virtual void DisposeUnmanagedResources()
- {
-
- }
+ { }
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/EnumerableExtensions.cs b/src/Umbraco.Core/EnumerableExtensions.cs
index 79b48af3ab..58d4d453b7 100644
--- a/src/Umbraco.Core/EnumerableExtensions.cs
+++ b/src/Umbraco.Core/EnumerableExtensions.cs
@@ -101,6 +101,7 @@ namespace Umbraco.Core
/// The select child.
/// Item type
/// list of TItem
+ [Obsolete("Do not use, use SelectRecursive instead which has far less potential of re-iterating an iterator which may cause significantly more SQL queries")]
public static IEnumerable FlattenList(this IEnumerable e, Func> f)
{
return e.SelectMany(c => f(c).FlattenList(f)).Concat(e);
diff --git a/src/Umbraco.Core/Events/CancellableEventArgs.cs b/src/Umbraco.Core/Events/CancellableEventArgs.cs
index 80e69ae353..506ba1c22e 100644
--- a/src/Umbraco.Core/Events/CancellableEventArgs.cs
+++ b/src/Umbraco.Core/Events/CancellableEventArgs.cs
@@ -3,7 +3,7 @@ using System.Security.Permissions;
namespace Umbraco.Core.Events
{
- ///
+ ///
/// Event args for that can support cancellation
///
[HostProtection(SecurityAction.LinkDemand, SharedState = true)]
@@ -11,15 +11,30 @@ namespace Umbraco.Core.Events
{
private bool _cancel;
- public CancellableEventArgs(bool canCancel)
+ public CancellableEventArgs(bool canCancel, EventMessages eventMessages)
+ {
+ if (eventMessages == null) throw new ArgumentNullException("eventMessages");
+ CanCancel = canCancel;
+ Messages = eventMessages;
+ }
+
+ public CancellableEventArgs(bool canCancel)
{
CanCancel = canCancel;
- }
+ //create a standalone messages
+ Messages = new EventMessages();
+ }
- public CancellableEventArgs()
+ public CancellableEventArgs(EventMessages eventMessages)
+ : this(true, eventMessages)
+ {
+ }
+
+ public CancellableEventArgs()
: this(true)
{
}
+
///
/// Flag to determine if this instance will support being cancellable
///
@@ -32,7 +47,7 @@ namespace Umbraco.Core.Events
{
get
{
- if (!CanCancel)
+ if (CanCancel == false)
{
throw new InvalidOperationException("This event argument class does not support cancelling.");
}
@@ -40,12 +55,28 @@ namespace Umbraco.Core.Events
}
set
{
- if (!CanCancel)
+ if (CanCancel == false)
{
throw new InvalidOperationException("This event argument class does not support cancelling.");
}
_cancel = value;
}
}
- }
+
+ ///
+ /// if this instance supports cancellation, this will set Cancel to true with an affiliated cancellation message
+ ///
+ ///
+ public void CancelOperation(EventMessage cancelationMessage)
+ {
+ Cancel = true;
+ cancelationMessage.IsDefaultEventMessage = true;
+ Messages.Add(cancelationMessage);
+ }
+
+ ///
+ /// Returns the EventMessages object which is used to add messages to the message collection for this event
+ ///
+ public EventMessages Messages { get; private set; }
+ }
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs b/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
index a51da5652e..726d32d7b0 100644
--- a/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
+++ b/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
@@ -12,7 +12,18 @@ namespace Umbraco.Core.Events
public class CancellableObjectEventArgs : CancellableEventArgs
{
- public CancellableObjectEventArgs(T eventObject, bool canCancel)
+ public CancellableObjectEventArgs(T eventObject, bool canCancel, EventMessages eventMessages)
+ : base(canCancel, eventMessages)
+ {
+ EventObject = eventObject;
+ }
+
+ public CancellableObjectEventArgs(T eventObject, EventMessages eventMessages)
+ : this(eventObject, true, eventMessages)
+ {
+ }
+
+ public CancellableObjectEventArgs(T eventObject, bool canCancel)
: base(canCancel)
{
EventObject = eventObject;
diff --git a/src/Umbraco.Core/Events/DeleteEventArgs.cs b/src/Umbraco.Core/Events/DeleteEventArgs.cs
index 4edee846cf..1025066bcc 100644
--- a/src/Umbraco.Core/Events/DeleteEventArgs.cs
+++ b/src/Umbraco.Core/Events/DeleteEventArgs.cs
@@ -4,12 +4,56 @@ namespace Umbraco.Core.Events
{
public class DeleteEventArgs : CancellableObjectEventArgs>
{
- ///
- /// Constructor accepting multiple entities that are used in the delete operation
- ///
- ///
- ///
- public DeleteEventArgs(IEnumerable eventObject, bool canCancel) : base(eventObject, canCancel)
+ ///
+ /// Constructor accepting multiple entities that are used in the delete operation
+ ///
+ ///
+ ///
+ ///
+ public DeleteEventArgs(IEnumerable eventObject, bool canCancel, EventMessages eventMessages) : base(eventObject, canCancel, eventMessages)
+ {
+ MediaFilesToDelete = new List();
+ }
+
+ ///
+ /// Constructor accepting multiple entities that are used in the delete operation
+ ///
+ ///
+ ///
+ public DeleteEventArgs(IEnumerable eventObject, EventMessages eventMessages) : base(eventObject, eventMessages)
+ {
+ MediaFilesToDelete = new List();
+ }
+
+ ///
+ /// Constructor accepting a single entity instance
+ ///
+ ///
+ ///
+ public DeleteEventArgs(TEntity eventObject, EventMessages eventMessages)
+ : base(new List { eventObject }, eventMessages)
+ {
+ MediaFilesToDelete = new List();
+ }
+
+ ///
+ /// Constructor accepting a single entity instance
+ ///
+ ///
+ ///
+ ///
+ public DeleteEventArgs(TEntity eventObject, bool canCancel, EventMessages eventMessages)
+ : base(new List { eventObject }, canCancel, eventMessages)
+ {
+ MediaFilesToDelete = new List();
+ }
+
+ ///
+ /// Constructor accepting multiple entities that are used in the delete operation
+ ///
+ ///
+ ///
+ public DeleteEventArgs(IEnumerable eventObject, bool canCancel) : base(eventObject, canCancel)
{
MediaFilesToDelete = new List();
}
@@ -60,7 +104,13 @@ namespace Umbraco.Core.Events
public class DeleteEventArgs : CancellableEventArgs
{
- public DeleteEventArgs(int id, bool canCancel)
+ public DeleteEventArgs(int id, bool canCancel, EventMessages eventMessages)
+ : base(canCancel, eventMessages)
+ {
+ Id = id;
+ }
+
+ public DeleteEventArgs(int id, bool canCancel)
: base(canCancel)
{
Id = id;
diff --git a/src/Umbraco.Core/Events/EventExtensions.cs b/src/Umbraco.Core/Events/EventExtensions.cs
index 99cf145fe0..8c645aead6 100644
--- a/src/Umbraco.Core/Events/EventExtensions.cs
+++ b/src/Umbraco.Core/Events/EventExtensions.cs
@@ -1,4 +1,5 @@
using System;
+using System.Linq;
namespace Umbraco.Core.Events
{
@@ -7,16 +8,16 @@ namespace Umbraco.Core.Events
///
public static class EventExtensions
{
- ///
- /// Raises the event and returns a boolean value indicating if the event was cancelled
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public static bool IsRaisedEventCancelled(
+ ///
+ /// Raises the event and returns a boolean value indicating if the event was cancelled
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static bool IsRaisedEventCancelled(
this TypedEventHandler eventHandler,
TArgs args,
TSender sender)
@@ -27,16 +28,16 @@ namespace Umbraco.Core.Events
return args.Cancel;
}
-
- ///
- /// Raises the event
- ///
- ///
- ///
- ///
- ///
- ///
- public static void RaiseEvent(
+
+ ///
+ /// Raises the event
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static void RaiseEvent(
this TypedEventHandler eventHandler,
TArgs args,
TSender sender)
diff --git a/src/Umbraco.Core/Events/EventMessage.cs b/src/Umbraco.Core/Events/EventMessage.cs
new file mode 100644
index 0000000000..473f955d45
--- /dev/null
+++ b/src/Umbraco.Core/Events/EventMessage.cs
@@ -0,0 +1,27 @@
+namespace Umbraco.Core.Events
+{
+ ///
+ /// An event message
+ ///
+ public sealed class EventMessage
+ {
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ public EventMessage(string category, string message, EventMessageType messageType = EventMessageType.Default)
+ {
+ Category = category;
+ Message = message;
+ MessageType = messageType;
+ }
+
+ public string Category { get; private set; }
+ public string Message { get; private set; }
+ public EventMessageType MessageType { get; private set; }
+
+ ///
+ /// This is used to track if this message should be used as a default message so that Umbraco doesn't also append it's own default messages
+ ///
+ internal bool IsDefaultEventMessage { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/EventMessages.cs b/src/Umbraco.Core/Events/EventMessages.cs
new file mode 100644
index 0000000000..2900f3d471
--- /dev/null
+++ b/src/Umbraco.Core/Events/EventMessages.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Events
+{
+ ///
+ /// Event messages collection
+ ///
+ public sealed class EventMessages : DisposableObject
+ {
+ private readonly List _msgs = new List();
+
+ public void Add(EventMessage msg)
+ {
+ _msgs.Add(msg);
+ }
+
+ public int Count
+ {
+ get { return _msgs.Count; }
+ }
+
+ public IEnumerable GetAll()
+ {
+ return _msgs;
+ }
+
+ protected override void DisposeResources()
+ {
+ _msgs.Clear();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/IEventMessagesFactory.cs b/src/Umbraco.Core/Events/IEventMessagesFactory.cs
new file mode 100644
index 0000000000..cb2391186d
--- /dev/null
+++ b/src/Umbraco.Core/Events/IEventMessagesFactory.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Events
+{
+ ///
+ /// Event messages factory
+ ///
+ public interface IEventMessagesFactory
+ {
+ EventMessages Get();
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/MessageType.cs b/src/Umbraco.Core/Events/MessageType.cs
new file mode 100644
index 0000000000..6299a0e7d7
--- /dev/null
+++ b/src/Umbraco.Core/Events/MessageType.cs
@@ -0,0 +1,14 @@
+namespace Umbraco.Core.Events
+{
+ ///
+ /// The type of event message
+ ///
+ public enum EventMessageType
+ {
+ Default = 0,
+ Info = 1,
+ Error = 2,
+ Success = 3,
+ Warning = 4
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/MigrationEventArgs.cs b/src/Umbraco.Core/Events/MigrationEventArgs.cs
index c6da480999..7eed61484b 100644
--- a/src/Umbraco.Core/Events/MigrationEventArgs.cs
+++ b/src/Umbraco.Core/Events/MigrationEventArgs.cs
@@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel;
+using Semver;
using Umbraco.Core.Persistence.Migrations;
namespace Umbraco.Core.Events
@@ -13,11 +15,20 @@ namespace Umbraco.Core.Events
///
///
///
+ public MigrationEventArgs(IList eventObject, SemVersion configuredVersion, SemVersion targetVersion, bool canCancel)
+ : base(eventObject, canCancel)
+ {
+ ConfiguredSemVersion = configuredVersion;
+ TargetSemVersion = targetVersion;
+ }
+
+ [Obsolete("Use constructor accepting UmbracoVersion instances instead")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public MigrationEventArgs(IList eventObject, Version configuredVersion, Version targetVersion, bool canCancel)
: base(eventObject, canCancel)
{
- ConfiguredVersion = configuredVersion;
- TargetVersion = targetVersion;
+ ConfiguredSemVersion = new SemVersion(configuredVersion);
+ TargetSemVersion = new SemVersion(targetVersion);
}
///
@@ -28,12 +39,12 @@ namespace Umbraco.Core.Events
///
///
///
- internal MigrationEventArgs(IList eventObject, MigrationContext migrationContext, Version configuredVersion, Version targetVersion, bool canCancel)
+ internal MigrationEventArgs(IList eventObject, MigrationContext migrationContext, SemVersion configuredVersion, SemVersion targetVersion, bool canCancel)
: base(eventObject, canCancel)
{
MigrationContext = migrationContext;
- ConfiguredVersion = configuredVersion;
- TargetVersion = targetVersion;
+ ConfiguredSemVersion = configuredVersion;
+ TargetSemVersion = targetVersion;
}
///
@@ -42,11 +53,20 @@ namespace Umbraco.Core.Events
///
///
///
+ public MigrationEventArgs(IList eventObject, SemVersion configuredVersion, SemVersion targetVersion)
+ : base(eventObject)
+ {
+ ConfiguredSemVersion = configuredVersion;
+ TargetSemVersion = targetVersion;
+ }
+
+ [Obsolete("Use constructor accepting UmbracoVersion instances instead")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public MigrationEventArgs(IList eventObject, Version configuredVersion, Version targetVersion)
: base(eventObject)
{
- ConfiguredVersion = configuredVersion;
- TargetVersion = targetVersion;
+ ConfiguredSemVersion = new SemVersion(configuredVersion);
+ TargetSemVersion = new SemVersion(targetVersion);
}
///
@@ -57,9 +77,23 @@ namespace Umbraco.Core.Events
get { return EventObject; }
}
- public Version ConfiguredVersion { get; private set; }
+ [Obsolete("Use ConfiguredSemVersion instead")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public Version ConfiguredVersion
+ {
+ get { return ConfiguredSemVersion.GetVersion(); }
+ }
- public Version TargetVersion { get; private set; }
+ [Obsolete("Use TargetUmbracoVersion instead")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public Version TargetVersion
+ {
+ get { return TargetSemVersion.GetVersion(); }
+ }
+
+ public SemVersion ConfiguredSemVersion { get; private set; }
+
+ public SemVersion TargetSemVersion { get; private set; }
internal MigrationContext MigrationContext { get; private set; }
}
diff --git a/src/Umbraco.Core/Events/MoveEventArgs.cs b/src/Umbraco.Core/Events/MoveEventArgs.cs
index 107629ff19..0f0a5183a9 100644
--- a/src/Umbraco.Core/Events/MoveEventArgs.cs
+++ b/src/Umbraco.Core/Events/MoveEventArgs.cs
@@ -4,22 +4,51 @@ using System.Linq;
namespace Umbraco.Core.Events
{
- public class MoveEventInfo
- {
- public MoveEventInfo(TEntity entity, string originalPath, int newParentId)
- {
- Entity = entity;
- OriginalPath = originalPath;
- NewParentId = newParentId;
- }
-
- public TEntity Entity { get; set; }
- public string OriginalPath { get; set; }
- public int NewParentId { get; set; }
- }
-
public class MoveEventArgs : CancellableObjectEventArgs
{
+ ///
+ /// Constructor accepting a collection of MoveEventInfo objects
+ ///
+ ///
+ ///
+ ///
+ /// A colleciton of MoveEventInfo objects that exposes all entities that have been moved during a single move operation
+ ///
+ public MoveEventArgs(bool canCancel, EventMessages eventMessages, params MoveEventInfo[] moveInfo)
+ : base(default(TEntity), canCancel, eventMessages)
+ {
+ if (moveInfo.FirstOrDefault() == null)
+ {
+ throw new ArgumentException("moveInfo argument must contain at least one item");
+ }
+
+ MoveInfoCollection = moveInfo;
+ //assign the legacy props
+ EventObject = moveInfo.First().Entity;
+ ParentId = moveInfo.First().NewParentId;
+ }
+
+ ///
+ /// Constructor accepting a collection of MoveEventInfo objects
+ ///
+ ///
+ ///
+ /// A colleciton of MoveEventInfo objects that exposes all entities that have been moved during a single move operation
+ ///
+ public MoveEventArgs(EventMessages eventMessages, params MoveEventInfo[] moveInfo)
+ : base(default(TEntity), eventMessages)
+ {
+ if (moveInfo.FirstOrDefault() == null)
+ {
+ throw new ArgumentException("moveInfo argument must contain at least one item");
+ }
+
+ MoveInfoCollection = moveInfo;
+ //assign the legacy props
+ EventObject = moveInfo.First().Entity;
+ ParentId = moveInfo.First().NewParentId;
+ }
+
///
/// Constructor accepting a collection of MoveEventInfo objects
///
diff --git a/src/Umbraco.Core/Events/MoveEventInfo.cs b/src/Umbraco.Core/Events/MoveEventInfo.cs
new file mode 100644
index 0000000000..a74db7f36e
--- /dev/null
+++ b/src/Umbraco.Core/Events/MoveEventInfo.cs
@@ -0,0 +1,16 @@
+namespace Umbraco.Core.Events
+{
+ public class MoveEventInfo
+ {
+ public MoveEventInfo(TEntity entity, string originalPath, int newParentId)
+ {
+ Entity = entity;
+ OriginalPath = originalPath;
+ NewParentId = newParentId;
+ }
+
+ public TEntity Entity { get; set; }
+ public string OriginalPath { get; set; }
+ public int NewParentId { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/NewEventArgs.cs b/src/Umbraco.Core/Events/NewEventArgs.cs
index 8e6cd64db1..acfd64e60d 100644
--- a/src/Umbraco.Core/Events/NewEventArgs.cs
+++ b/src/Umbraco.Core/Events/NewEventArgs.cs
@@ -4,7 +4,39 @@ namespace Umbraco.Core.Events
{
public class NewEventArgs : CancellableObjectEventArgs
{
- public NewEventArgs(TEntity eventObject, bool canCancel, string @alias, int parentId) : base(eventObject, canCancel)
+
+
+ public NewEventArgs(TEntity eventObject, bool canCancel, string @alias, int parentId, EventMessages eventMessages)
+ : base(eventObject, canCancel, eventMessages)
+ {
+ Alias = alias;
+ ParentId = parentId;
+ }
+
+ public NewEventArgs(TEntity eventObject, bool canCancel, string @alias, TEntity parent, EventMessages eventMessages)
+ : base(eventObject, canCancel, eventMessages)
+ {
+ Alias = alias;
+ Parent = parent;
+ }
+
+ public NewEventArgs(TEntity eventObject, string @alias, int parentId, EventMessages eventMessages)
+ : base(eventObject, eventMessages)
+ {
+ Alias = alias;
+ ParentId = parentId;
+ }
+
+ public NewEventArgs(TEntity eventObject, string @alias, TEntity parent, EventMessages eventMessages)
+ : base(eventObject, eventMessages)
+ {
+ Alias = alias;
+ Parent = parent;
+ }
+
+
+
+ public NewEventArgs(TEntity eventObject, bool canCancel, string @alias, int parentId) : base(eventObject, canCancel)
{
Alias = alias;
ParentId = parentId;
diff --git a/src/Umbraco.Core/Events/PublishEventArgs.cs b/src/Umbraco.Core/Events/PublishEventArgs.cs
index 2355e250ef..a791781617 100644
--- a/src/Umbraco.Core/Events/PublishEventArgs.cs
+++ b/src/Umbraco.Core/Events/PublishEventArgs.cs
@@ -4,6 +4,52 @@ namespace Umbraco.Core.Events
{
public class PublishEventArgs : CancellableObjectEventArgs>
{
+ ///
+ /// Constructor accepting multiple entities that are used in the publish operation
+ ///
+ ///
+ ///
+ ///
+ ///
+ public PublishEventArgs(IEnumerable eventObject, bool canCancel, bool isAllPublished, EventMessages eventMessages)
+ : base(eventObject, canCancel, eventMessages)
+ {
+ IsAllRepublished = isAllPublished;
+ }
+
+ ///
+ /// Constructor accepting multiple entities that are used in the publish operation
+ ///
+ ///
+ ///
+ public PublishEventArgs(IEnumerable eventObject, EventMessages eventMessages)
+ : base(eventObject, eventMessages)
+ {
+ }
+
+ ///
+ /// Constructor accepting a single entity instance
+ ///
+ ///
+ ///
+ public PublishEventArgs(TEntity eventObject, EventMessages eventMessages)
+ : base(new List { eventObject }, eventMessages)
+ {
+ }
+
+ ///
+ /// Constructor accepting a single entity instance
+ ///
+ ///
+ ///
+ ///
+ ///
+ public PublishEventArgs(TEntity eventObject, bool canCancel, bool isAllPublished, EventMessages eventMessages)
+ : base(new List { eventObject }, canCancel, eventMessages)
+ {
+ IsAllRepublished = isAllPublished;
+ }
+
///
/// Constructor accepting multiple entities that are used in the publish operation
///
diff --git a/src/Umbraco.Core/Events/SaveEventArgs.cs b/src/Umbraco.Core/Events/SaveEventArgs.cs
index d3ac8b22e5..b84e28285e 100644
--- a/src/Umbraco.Core/Events/SaveEventArgs.cs
+++ b/src/Umbraco.Core/Events/SaveEventArgs.cs
@@ -4,12 +4,55 @@ namespace Umbraco.Core.Events
{
public class SaveEventArgs : CancellableObjectEventArgs>
{
- ///
- /// Constructor accepting multiple entities that are used in the saving operation
- ///
- ///
- ///
- public SaveEventArgs(IEnumerable eventObject, bool canCancel)
+ ///
+ /// Constructor accepting multiple entities that are used in the saving operation
+ ///
+ ///
+ ///
+ ///
+ public SaveEventArgs(IEnumerable eventObject, bool canCancel, EventMessages eventMessages)
+ : base(eventObject, canCancel, eventMessages)
+ {
+ }
+
+ ///
+ /// Constructor accepting multiple entities that are used in the saving operation
+ ///
+ ///
+ ///
+ public SaveEventArgs(IEnumerable eventObject, EventMessages eventMessages)
+ : base(eventObject, eventMessages)
+ {
+ }
+
+ ///
+ /// Constructor accepting a single entity instance
+ ///
+ ///
+ ///
+ public SaveEventArgs(TEntity eventObject, EventMessages eventMessages)
+ : base(new List { eventObject }, eventMessages)
+ {
+ }
+
+ ///
+ /// Constructor accepting a single entity instance
+ ///
+ ///
+ ///
+ ///
+ public SaveEventArgs(TEntity eventObject, bool canCancel, EventMessages eventMessages)
+ : base(new List { eventObject }, canCancel, eventMessages)
+ {
+ }
+
+
+ ///
+ /// Constructor accepting multiple entities that are used in the saving operation
+ ///
+ ///
+ ///
+ public SaveEventArgs(IEnumerable eventObject, bool canCancel)
: base(eventObject, canCancel)
{
}
diff --git a/src/Umbraco.Core/Events/TransientMessagesFactory.cs b/src/Umbraco.Core/Events/TransientMessagesFactory.cs
new file mode 100644
index 0000000000..5cd291a37f
--- /dev/null
+++ b/src/Umbraco.Core/Events/TransientMessagesFactory.cs
@@ -0,0 +1,13 @@
+namespace Umbraco.Core.Events
+{
+ ///
+ /// A simple/default transient messages factory
+ ///
+ internal class TransientMessagesFactory : IEventMessagesFactory
+ {
+ public EventMessages Get()
+ {
+ return new EventMessages();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Exceptions/DataOperationException.cs b/src/Umbraco.Core/Exceptions/DataOperationException.cs
new file mode 100644
index 0000000000..9a66e6a5be
--- /dev/null
+++ b/src/Umbraco.Core/Exceptions/DataOperationException.cs
@@ -0,0 +1,21 @@
+using System;
+
+namespace Umbraco.Core.Exceptions
+{
+ internal class DataOperationException : Exception
+ {
+ public T Operation { get; private set; }
+
+ public DataOperationException(T operation, string message)
+ :base(message)
+ {
+ Operation = operation;
+ }
+
+ public DataOperationException(T operation)
+ : base("Data operation exception: " + operation)
+ {
+ Operation = operation;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Exceptions/InvalidCompositionException.cs b/src/Umbraco.Core/Exceptions/InvalidCompositionException.cs
index fcf7a44677..bb9becf058 100644
--- a/src/Umbraco.Core/Exceptions/InvalidCompositionException.cs
+++ b/src/Umbraco.Core/Exceptions/InvalidCompositionException.cs
@@ -3,22 +3,41 @@
namespace Umbraco.Core.Exceptions
{
public class InvalidCompositionException : Exception
- {
- public string ContentTypeAlias { get; set; }
+ {
+ public InvalidCompositionException(string contentTypeAlias, string addedCompositionAlias, string[] propertyTypeAliass)
+ {
+ ContentTypeAlias = contentTypeAlias;
+ AddedCompositionAlias = addedCompositionAlias;
+ PropertyTypeAliases = propertyTypeAliass;
+ }
- public string AddedCompositionAlias { get; set; }
+ public InvalidCompositionException(string contentTypeAlias, string[] propertyTypeAliass)
+ {
+ ContentTypeAlias = contentTypeAlias;
+ PropertyTypeAliases = propertyTypeAliass;
+ }
- public string PropertyTypeAlias { get; set; }
+ public string ContentTypeAlias { get; private set; }
+
+ public string AddedCompositionAlias { get; private set; }
+
+ public string[] PropertyTypeAliases { get; private set; }
public override string Message
{
get
{
- return string.Format(
- "InvalidCompositionException - ContentType with alias '{0}' was added as a Compsition to ContentType with alias '{1}', " +
- "but there was a conflict on the PropertyType alias '{2}'. " +
+ return AddedCompositionAlias.IsNullOrWhiteSpace()
+ ? string.Format(
+ "ContentType with alias '{0}' has an invalid composition " +
+ "and there was a conflict on the following PropertyTypes: '{1}'. " +
"PropertyTypes must have a unique alias across all Compositions in order to compose a valid ContentType Composition.",
- AddedCompositionAlias, ContentTypeAlias, PropertyTypeAlias);
+ ContentTypeAlias, string.Join(", ", PropertyTypeAliases))
+ : string.Format(
+ "ContentType with alias '{0}' was added as a Composition to ContentType with alias '{1}', " +
+ "but there was a conflict on the following PropertyTypes: '{2}'. " +
+ "PropertyTypes must have a unique alias across all Compositions in order to compose a valid ContentType Composition.",
+ AddedCompositionAlias, ContentTypeAlias, string.Join(", ", PropertyTypeAliases));
}
}
}
diff --git a/src/Umbraco.Core/Exceptions/UmbracoStartupFailedException.cs b/src/Umbraco.Core/Exceptions/UmbracoStartupFailedException.cs
new file mode 100644
index 0000000000..d27d38de9a
--- /dev/null
+++ b/src/Umbraco.Core/Exceptions/UmbracoStartupFailedException.cs
@@ -0,0 +1,18 @@
+using System;
+
+namespace Umbraco.Core.Exceptions
+{
+ ///
+ /// An exception that is thrown if the umbraco application cannnot boot
+ ///
+ public class UmbracoStartupFailedException : Exception
+ {
+ ///
+ /// Initializes a new instance of the class with a specified error message.
+ ///
+ /// The message that describes the error.
+ public UmbracoStartupFailedException(string message) : base(message)
+ {
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/xslt/Web.config b/src/Umbraco.Core/FileResources/BlockingWeb.config
similarity index 96%
rename from src/Umbraco.Web.UI/xslt/Web.config
rename to src/Umbraco.Core/FileResources/BlockingWeb.config
index fd6e3a816a..80182af9a1 100644
--- a/src/Umbraco.Web.UI/xslt/Web.config
+++ b/src/Umbraco.Core/FileResources/BlockingWeb.config
@@ -1,18 +1,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Core/FileResources/Files.Designer.cs b/src/Umbraco.Core/FileResources/Files.Designer.cs
new file mode 100644
index 0000000000..456dae221f
--- /dev/null
+++ b/src/Umbraco.Core/FileResources/Files.Designer.cs
@@ -0,0 +1,86 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.0
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace Umbraco.Core.FileResources {
+ using System;
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Files {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Files() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Core.FileResources.Files", typeof(Files).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to <?xml version="1.0"?>
+ ///
+ ///<!-- Blocks public downloading of anything in this folder and sub folders -->
+ ///
+ ///<configuration>
+ /// <system.web>
+ /// <httpHandlers>
+ /// <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
+ /// </httpHandlers>
+ /// </system.web>
+ /// <system.webServer>
+ /// <validation validateIntegratedModeConfiguration="false" />
+ /// <handlers>
+ /// <remove name="BlockViewHandler"/>
+ /// <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.H [rest of string was truncated]";.
+ ///
+ internal static string BlockingWebConfig {
+ get {
+ return ResourceManager.GetString("BlockingWebConfig", resourceCulture);
+ }
+ }
+ }
+}
diff --git a/src/Umbraco.Core/FileResources/Files.resx b/src/Umbraco.Core/FileResources/Files.resx
new file mode 100644
index 0000000000..823aacefb7
--- /dev/null
+++ b/src/Umbraco.Core/FileResources/Files.resx
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+ blockingweb.config;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
+
\ No newline at end of file
diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index dc5e278970..286acf0285 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -6,6 +6,7 @@ using System.IO;
using System.Configuration;
using System.Web;
using System.Text.RegularExpressions;
+using System.Web.Hosting;
using Umbraco.Core.Configuration;
using Umbraco.Core.Logging;
@@ -51,7 +52,23 @@ namespace Umbraco.Core.IO
return VirtualPathUtility.ToAbsolute(virtualPath, SystemDirectories.Root);
}
- [Obsolete("Use Umbraco.Web.Templates.TemplateUtilities.ResolveUrlsFromTextString instead, this method on this class will be removed in future versions")]
+ public static Attempt TryResolveUrl(string virtualPath)
+ {
+ try
+ {
+ if (virtualPath.StartsWith("~"))
+ return Attempt.Succeed(virtualPath.Replace("~", SystemDirectories.Root).Replace("//", "/"));
+ if (Uri.IsWellFormedUriString(virtualPath, UriKind.Absolute))
+ return Attempt.Succeed(virtualPath);
+ return Attempt.Succeed(VirtualPathUtility.ToAbsolute(virtualPath, SystemDirectories.Root));
+ }
+ catch (Exception ex)
+ {
+ return Attempt.Fail(virtualPath, ex);
+ }
+ }
+
+ [Obsolete("Use Umbraco.Web.Templates.TemplateUtilities.ResolveUrlsFromTextString instead, this method on this class will be removed in future versions")]
internal static string ResolveUrlsFromTextString(string text)
{
if (UmbracoConfig.For.UmbracoSettings().Content.ResolveUrlsFromTextString)
@@ -67,7 +84,7 @@ namespace Umbraco.Core.IO
if (tag.Groups[1].Success)
url = tag.Groups[1].Value;
- if (string.IsNullOrEmpty(url) == false)
+ if (String.IsNullOrEmpty(url) == false)
{
string resolvedUrl = (url.Substring(0, 1) == "/") ? ResolveUrl(url.Substring(1)) : ResolveUrl(url);
text = text.Replace(url, resolvedUrl);
@@ -92,10 +109,10 @@ namespace Umbraco.Core.IO
if (useHttpContext && HttpContext.Current != null)
{
//string retval;
- if (string.IsNullOrEmpty(path) == false && (path.StartsWith("~") || path.StartsWith(SystemDirectories.Root)))
- return System.Web.Hosting.HostingEnvironment.MapPath(path);
+ if (String.IsNullOrEmpty(path) == false && (path.StartsWith("~") || path.StartsWith(SystemDirectories.Root)))
+ return HostingEnvironment.MapPath(path);
else
- return System.Web.Hosting.HostingEnvironment.MapPath("~/" + path.TrimStart('/'));
+ return HostingEnvironment.MapPath("~/" + path.TrimStart('/'));
}
var root = GetRootDirectorySafe();
@@ -115,7 +132,7 @@ namespace Umbraco.Core.IO
{
string retval = ConfigurationManager.AppSettings[settingsKey];
- if (string.IsNullOrEmpty(retval))
+ if (String.IsNullOrEmpty(retval))
retval = standardPath;
return retval.TrimEnd('/');
@@ -135,12 +152,7 @@ namespace Umbraco.Core.IO
/// A value indicating whether the filepath is valid.
internal static bool VerifyEditPath(string filePath, string validDir)
{
- if (filePath.StartsWith(MapPath(SystemDirectories.Root)) == false)
- filePath = MapPath(filePath);
- if (validDir.StartsWith(MapPath(SystemDirectories.Root)) == false)
- validDir = MapPath(validDir);
-
- return filePath.StartsWith(validDir);
+ return VerifyEditPath(filePath, new[] { validDir });
}
///
@@ -165,15 +177,31 @@ namespace Umbraco.Core.IO
/// A value indicating whether the filepath is valid.
internal static bool VerifyEditPath(string filePath, IEnumerable validDirs)
{
+ // this is called from ScriptRepository, PartialViewRepository, etc.
+ // filePath is the fullPath (rooted, filesystem path, can be trusted)
+ // validDirs are virtual paths (eg ~/Views)
+ //
+ // except that for templates, filePath actually is a virtual path
+
+ //TODO
+ // what's below is dirty, there are too many ways to get the root dir, etc.
+ // not going to fix everything today
+
+ var mappedRoot = MapPath(SystemDirectories.Root);
+ if (filePath.StartsWith(mappedRoot) == false)
+ filePath = MapPath(filePath);
+
+ // yes we can (see above)
+ //// don't trust what we get, it may contain relative segments
+ //filePath = Path.GetFullPath(filePath);
+
foreach (var dir in validDirs)
{
var validDir = dir;
- if (filePath.StartsWith(MapPath(SystemDirectories.Root)) == false)
- filePath = MapPath(filePath);
- if (validDir.StartsWith(MapPath(SystemDirectories.Root)) == false)
+ if (validDir.StartsWith(mappedRoot) == false)
validDir = MapPath(validDir);
- if (filePath.StartsWith(validDir))
+ if (PathStartsWith(filePath, validDir, Path.DirectorySeparatorChar))
return true;
}
@@ -202,11 +230,8 @@ namespace Umbraco.Core.IO
/// A value indicating whether the filepath is valid.
internal static bool VerifyFileExtension(string filePath, List validFileExtensions)
{
- if (filePath.StartsWith(MapPath(SystemDirectories.Root)) == false)
- filePath = MapPath(filePath);
- var f = new FileInfo(filePath);
-
- return validFileExtensions.Contains(f.Extension.Substring(1));
+ var ext = Path.GetExtension(filePath);
+ return ext != null && validFileExtensions.Contains(ext.TrimStart('.'));
}
///
@@ -223,6 +248,16 @@ namespace Umbraco.Core.IO
return true;
}
+ public static bool PathStartsWith(string path, string root, char separator)
+ {
+ // either it is identical to root,
+ // or it is root + separator + anything
+
+ if (path.StartsWith(root, StringComparison.OrdinalIgnoreCase) == false) return false;
+ if (path.Length == root.Length) return true;
+ if (path.Length < root.Length) return false;
+ return path[root.Length] == separator;
+ }
///
/// Returns the path to the root of the application, by getting the path to where the assembly where this
@@ -232,7 +267,7 @@ namespace Umbraco.Core.IO
///
internal static string GetRootDirectorySafe()
{
- if (string.IsNullOrEmpty(_rootDir) == false)
+ if (String.IsNullOrEmpty(_rootDir) == false)
{
return _rootDir;
}
@@ -241,7 +276,7 @@ namespace Umbraco.Core.IO
var uri = new Uri(codeBase);
var path = uri.LocalPath;
var baseDirectory = Path.GetDirectoryName(path);
- if (string.IsNullOrEmpty(baseDirectory))
+ if (String.IsNullOrEmpty(baseDirectory))
throw new Exception("No root directory could be resolved. Please ensure that your Umbraco solution is correctly configured.");
_rootDir = baseDirectory.Contains("bin")
@@ -253,8 +288,8 @@ namespace Umbraco.Core.IO
internal static string GetRootDirectoryBinFolder()
{
- string binFolder = string.Empty;
- if (string.IsNullOrEmpty(_rootDir))
+ string binFolder = String.Empty;
+ if (String.IsNullOrEmpty(_rootDir))
{
binFolder = Assembly.GetExecutingAssembly().GetAssemblyFile().Directory.FullName;
return binFolder;
@@ -298,5 +333,25 @@ namespace Umbraco.Core.IO
// use string extensions
return filePath.ToSafeFileName();
}
+
+ public static void EnsurePathExists(string path)
+ {
+ var absolutePath = IOHelper.MapPath(path);
+ if (Directory.Exists(absolutePath) == false)
+ Directory.CreateDirectory(absolutePath);
+ }
+
+ public static void EnsureFileExists(string path, string contents)
+ {
+ var absolutePath = IOHelper.MapPath(path);
+ if (File.Exists(absolutePath) == false)
+ {
+ using (var writer = File.CreateText(absolutePath))
+ {
+ writer.Write(contents);
+ }
+ }
+
+ }
}
}
diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
index 13df315960..47daff932d 100644
--- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs
+++ b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
+using System.IO;
using System.Linq;
using Umbraco.Core.Logging;
@@ -9,7 +8,12 @@ namespace Umbraco.Core.IO
{
public class PhysicalFileSystem : IFileSystem
{
- internal string RootPath { get; private set; }
+ // the rooted, filesystem path, using directory separator chars, NOT ending with a separator
+ // eg "c:" or "c:\path\to\site" or "\\server\path"
+ private readonly string _rootPath;
+
+ // the ??? url, using url separator chars, NOT ending with a separator
+ // eg "" (?) or "/Scripts" or ???
private readonly string _rootUrl;
public PhysicalFileSystem(string virtualRoot)
@@ -18,8 +22,13 @@ namespace Umbraco.Core.IO
if (virtualRoot.StartsWith("~/") == false)
throw new ArgumentException("The virtualRoot argument must be a virtual path and start with '~/'");
- RootPath = IOHelper.MapPath(virtualRoot);
+ _rootPath = IOHelper.MapPath(virtualRoot);
+ _rootPath = EnsureDirectorySeparatorChar(_rootPath);
+ _rootPath = _rootPath.TrimEnd(Path.DirectorySeparatorChar);
+
_rootUrl = IOHelper.ResolveUrl(virtualRoot);
+ _rootUrl = EnsureUrlSeparatorChar(_rootUrl);
+ _rootUrl = _rootUrl.TrimEnd('/');
}
public PhysicalFileSystem(string rootPath, string rootUrl)
@@ -33,18 +42,31 @@ namespace Umbraco.Core.IO
if (rootPath.StartsWith("~/"))
throw new ArgumentException("The rootPath argument cannot be a virtual path and cannot start with '~/'");
- RootPath = rootPath;
- _rootUrl = rootUrl;
+ // rootPath should be... rooted, as in, it's a root path!
+ // but the test suite App.config cannot really "root" anything so we'll have to do it here
+
+ //var localRoot = AppDomain.CurrentDomain.BaseDirectory;
+ var localRoot = IOHelper.GetRootDirectorySafe();
+ if (Path.IsPathRooted(rootPath) == false)
+ {
+ rootPath = Path.Combine(localRoot, rootPath);
+ }
+
+ rootPath = EnsureDirectorySeparatorChar(rootPath);
+ rootUrl = EnsureUrlSeparatorChar(rootUrl);
+
+ _rootPath = rootPath.TrimEnd(Path.DirectorySeparatorChar);
+ _rootUrl = rootUrl.TrimEnd('/');
}
public IEnumerable GetDirectories(string path)
{
- path = EnsureTrailingSeparator(GetFullPath(path));
+ var fullPath = GetFullPath(path);
try
{
- if (Directory.Exists(path))
- return Directory.EnumerateDirectories(path).Select(GetRelativePath);
+ if (Directory.Exists(fullPath))
+ return Directory.EnumerateDirectories(fullPath).Select(GetRelativePath);
}
catch (UnauthorizedAccessException ex)
{
@@ -65,12 +87,13 @@ namespace Umbraco.Core.IO
public void DeleteDirectory(string path, bool recursive)
{
- if (DirectoryExists(path) == false)
+ var fullPath = GetFullPath(path);
+ if (Directory.Exists(fullPath) == false)
return;
try
{
- Directory.Delete(GetFullPath(path), recursive);
+ Directory.Delete(fullPath, recursive);
}
catch (DirectoryNotFoundException ex)
{
@@ -80,7 +103,8 @@ namespace Umbraco.Core.IO
public bool DirectoryExists(string path)
{
- return Directory.Exists(GetFullPath(path));
+ var fullPath = GetFullPath(path);
+ return Directory.Exists(fullPath);
}
public void AddFile(string path, Stream stream)
@@ -90,17 +114,17 @@ namespace Umbraco.Core.IO
public void AddFile(string path, Stream stream, bool overrideIfExists)
{
- var fsRelativePath = GetRelativePath(path);
+ var fullPath = GetFullPath(path);
+ var exists = File.Exists(fullPath);
+ if (exists && overrideIfExists == false)
+ throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
- var exists = FileExists(fsRelativePath);
- if (exists && overrideIfExists == false) throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
-
- EnsureDirectory(Path.GetDirectoryName(fsRelativePath));
+ Directory.CreateDirectory(Path.GetDirectoryName(fullPath)); // ensure it exists
if (stream.CanSeek)
stream.Seek(0, 0);
- using (var destination = (Stream)File.Create(GetFullPath(fsRelativePath)))
+ using (var destination = (Stream)File.Create(fullPath))
stream.CopyTo(destination);
}
@@ -111,9 +135,7 @@ namespace Umbraco.Core.IO
public IEnumerable GetFiles(string path, string filter)
{
- var fsRelativePath = GetRelativePath(path);
-
- var fullPath = EnsureTrailingSeparator(GetFullPath(fsRelativePath));
+ var fullPath = GetFullPath(path);
try
{
@@ -140,12 +162,13 @@ namespace Umbraco.Core.IO
public void DeleteFile(string path)
{
- if (!FileExists(path))
+ var fullPath = GetFullPath(path);
+ if (File.Exists(fullPath) == false)
return;
try
{
- File.Delete(GetFullPath(path));
+ File.Delete(fullPath);
}
catch (FileNotFoundException ex)
{
@@ -155,39 +178,86 @@ namespace Umbraco.Core.IO
public bool FileExists(string path)
{
- return File.Exists(GetFullPath(path));
+ var fullpath = GetFullPath(path);
+ return File.Exists(fullpath);
}
+ // beware, many things depend on how the GetRelative/AbsolutePath methods work!
+
+ ///
+ /// Gets the relative path.
+ ///
+ /// The full path or url.
+ /// The path, relative to this filesystem's root.
+ ///
+ /// The relative path is relative to this filesystem's root, not starting with any
+ /// directory separator. If input was recognized as a url (path), then output uses url (path) separator
+ /// chars.
+ ///
public string GetRelativePath(string fullPathOrUrl)
{
- var relativePath = fullPathOrUrl
- .TrimStart(_rootUrl)
- .Replace('/', Path.DirectorySeparatorChar)
- .TrimStart(RootPath)
- .TrimStart(Path.DirectorySeparatorChar);
+ // test url
+ var path = fullPathOrUrl.Replace('\\', '/'); // ensure url separator char
- return relativePath;
+ if (IOHelper.PathStartsWith(path, _rootUrl, '/')) // if it starts with the root url...
+ return path.Substring(_rootUrl.Length) // strip it
+ .TrimStart('/'); // it's relative
+
+ // test path
+ path = EnsureDirectorySeparatorChar(fullPathOrUrl);
+
+ if (IOHelper.PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar)) // if it starts with the root path
+ return path.Substring(_rootPath.Length) // strip it
+ .TrimStart(Path.DirectorySeparatorChar); // it's relative
+
+ // unchanged - including separators
+ return fullPathOrUrl;
}
+ ///
+ /// Gets the full path.
+ ///
+ /// The full or relative path.
+ /// The full path.
+ ///
+ /// On the physical filesystem, the full path is the rooted (ie non-relative), safe (ie within this
+ /// filesystem's root) path. All separators are converted to Path.DirectorySeparatorChar.
+ ///
public string GetFullPath(string path)
{
- //if the path starts with a '/' then it's most likely not a FS relative path which is required so convert it
- if (path.StartsWith("/"))
- {
- path = GetRelativePath(path);
- }
+ // normalize
+ var opath = path;
+ path = EnsureDirectorySeparatorChar(path);
- return !path.StartsWith(RootPath)
- ? Path.Combine(RootPath, path)
- : path;
+ // not sure what we are doing here - so if input starts with a (back) slash,
+ // we assume it's not a FS relative path and we try to convert it... but it
+ // really makes little sense?
+ if (path.StartsWith(Path.DirectorySeparatorChar.ToString()))
+ path = GetRelativePath(path);
+
+ // if already a full path, return
+ if (IOHelper.PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar))
+ return path;
+
+ // else combine and sanitize, ie GetFullPath will take care of any relative
+ // segments in path, eg '../../foo.tmp' - it may throw a SecurityException
+ // if the combined path reaches illegal parts of the filesystem
+ var fpath = Path.Combine(_rootPath, path);
+ fpath = Path.GetFullPath(fpath);
+
+ // at that point, path is within legal parts of the filesystem, ie we have
+ // permissions to reach that path, but it may nevertheless be outside of
+ // our root path, due to relative segments, so better check
+ if (IOHelper.PathStartsWith(fpath, _rootPath, Path.DirectorySeparatorChar))
+ return fpath;
+
+ throw new FileSecurityException("File '" + opath + "' is outside this filesystem's root.");
}
public string GetUrl(string path)
{
- return _rootUrl.TrimEnd("/") + "/" + path
- .TrimStart(Path.DirectorySeparatorChar)
- .Replace(Path.DirectorySeparatorChar, '/')
- .TrimEnd("/");
+ path = EnsureUrlSeparatorChar(path).Trim('/');
+ return _rootUrl + "/" + path;
}
public DateTimeOffset GetLastModified(string path)
@@ -214,9 +284,19 @@ namespace Umbraco.Core.IO
protected string EnsureTrailingSeparator(string path)
{
- if (!path.EndsWith(Path.DirectorySeparatorChar.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal))
- path = path + Path.DirectorySeparatorChar;
+ return path.EnsureEndsWith(Path.DirectorySeparatorChar);
+ }
+ protected string EnsureDirectorySeparatorChar(string path)
+ {
+ path = path.Replace('/', Path.DirectorySeparatorChar);
+ path = path.Replace('\\', Path.DirectorySeparatorChar);
+ return path;
+ }
+
+ protected string EnsureUrlSeparatorChar(string path)
+ {
+ path = path.Replace('\\', '/');
return path;
}
diff --git a/src/Umbraco.Core/IO/SystemDirectories.cs b/src/Umbraco.Core/IO/SystemDirectories.cs
index 14997b7de7..38bc358e94 100644
--- a/src/Umbraco.Core/IO/SystemDirectories.cs
+++ b/src/Umbraco.Core/IO/SystemDirectories.cs
@@ -132,7 +132,7 @@ namespace Umbraco.Core.IO
{
get
{
- return IOHelper.ReturnPath("umbracoWebservicesPath", "~/umbraco/webservices");
+ return IOHelper.ReturnPath("umbracoWebservicesPath", Umbraco.EnsureEndsWith("/") + "webservices");
}
}
diff --git a/src/Umbraco.Core/IO/UmbracoMediaFile.cs b/src/Umbraco.Core/IO/UmbracoMediaFile.cs
index b8fe310f54..d708fcb804 100644
--- a/src/Umbraco.Core/IO/UmbracoMediaFile.cs
+++ b/src/Umbraco.Core/IO/UmbracoMediaFile.cs
@@ -199,8 +199,8 @@ namespace Umbraco.Core.IO
using (var image = Image.FromStream(fs))
{
var fileNameThumb = string.IsNullOrWhiteSpace(fileNameAddition)
- ? string.Format("{0}_UMBRACOSYSTHUMBNAIL.jpg", Path.Substring(0, Path.LastIndexOf(".", StringComparison.Ordinal)))
- : string.Format("{0}_{1}.jpg", Path.Substring(0, Path.LastIndexOf(".", StringComparison.Ordinal)), fileNameAddition);
+ ? string.Format("{0}_UMBRACOSYSTHUMBNAIL." + Extension, Path.Substring(0, Path.LastIndexOf(".", StringComparison.Ordinal)))
+ : string.Format("{0}_{1}." + Extension, Path.Substring(0, Path.LastIndexOf(".", StringComparison.Ordinal)), fileNameAddition);
var thumbnail = maxWidthHeight == -1
? ImageHelper.GenerateThumbnail(image, width, height, fileNameThumb, Extension, _fs)
diff --git a/src/Umbraco.Core/Logging/AppDomainTokenFormatter.cs b/src/Umbraco.Core/Logging/AppDomainTokenConverter.cs
similarity index 100%
rename from src/Umbraco.Core/Logging/AppDomainTokenFormatter.cs
rename to src/Umbraco.Core/Logging/AppDomainTokenConverter.cs
diff --git a/src/Umbraco.Core/Logging/AsyncForwardingAppenderBase.cs b/src/Umbraco.Core/Logging/AsyncForwardingAppenderBase.cs
new file mode 100644
index 0000000000..74a1de81f4
--- /dev/null
+++ b/src/Umbraco.Core/Logging/AsyncForwardingAppenderBase.cs
@@ -0,0 +1,105 @@
+using System;
+using log4net.Appender;
+using log4net.Core;
+using log4net.Util;
+
+namespace Umbraco.Core.Logging
+{
+ ///
+ /// Based on https://github.com/cjbhaines/Log4Net.Async
+ ///
+ public abstract class AsyncForwardingAppenderBase : ForwardingAppender
+ {
+ #region Private Members
+
+ private const FixFlags DefaultFixFlags = FixFlags.Partial;
+ private FixFlags _fixFlags = DefaultFixFlags;
+ private LoggingEventHelper _loggingEventHelper;
+
+ #endregion Private Members
+
+ #region Properties
+
+ public FixFlags Fix
+ {
+ get { return _fixFlags; }
+ set { SetFixFlags(value); }
+ }
+
+ ///
+ /// The logger name that will be used for logging internal errors.
+ ///
+ protected abstract string InternalLoggerName { get; }
+
+ public abstract int? BufferSize { get; set; }
+
+ #endregion Properties
+
+ public override void ActivateOptions()
+ {
+ base.ActivateOptions();
+ _loggingEventHelper = new LoggingEventHelper(InternalLoggerName, DefaultFixFlags);
+ InitializeAppenders();
+ }
+
+ #region Appender Management
+
+ public override void AddAppender(IAppender newAppender)
+ {
+ base.AddAppender(newAppender);
+ SetAppenderFixFlags(newAppender);
+ }
+
+ private void SetFixFlags(FixFlags newFixFlags)
+ {
+ if (newFixFlags != _fixFlags)
+ {
+ _loggingEventHelper.Fix = newFixFlags;
+ _fixFlags = newFixFlags;
+ InitializeAppenders();
+ }
+ }
+
+ private void InitializeAppenders()
+ {
+ foreach (var appender in Appenders)
+ {
+ SetAppenderFixFlags(appender);
+ }
+ }
+
+ private void SetAppenderFixFlags(IAppender appender)
+ {
+ var bufferingAppender = appender as BufferingAppenderSkeleton;
+ if (bufferingAppender != null)
+ {
+ bufferingAppender.Fix = Fix;
+ }
+ }
+
+ #endregion Appender Management
+
+ #region Forwarding
+
+ protected void ForwardInternalError(string message, Exception exception, Type thisType)
+ {
+ LogLog.Error(thisType, message, exception);
+ var loggingEvent = _loggingEventHelper.CreateLoggingEvent(Level.Error, message, exception);
+ ForwardLoggingEvent(loggingEvent, thisType);
+ }
+
+ protected void ForwardLoggingEvent(LoggingEvent loggingEvent, Type thisType)
+ {
+ try
+ {
+ base.Append(loggingEvent);
+ }
+ catch (Exception exception)
+ {
+ LogLog.Error(thisType, "Unable to forward logging event", exception);
+ }
+ }
+
+ #endregion Forwarding
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Logging/AsynchronousRollingFileAppender.cs b/src/Umbraco.Core/Logging/AsynchronousRollingFileAppender.cs
index 56d04c8426..cb58ebbfaa 100644
--- a/src/Umbraco.Core/Logging/AsynchronousRollingFileAppender.cs
+++ b/src/Umbraco.Core/Logging/AsynchronousRollingFileAppender.cs
@@ -1,276 +1,276 @@
+using log4net.Core;
+using log4net.Util;
using System;
+using System.Runtime.Remoting.Messaging;
using System.Security.Principal;
using System.Threading;
using System.Threading.Tasks;
using log4net.Appender;
-using log4net.Core;
-using log4net.Util;
namespace Umbraco.Core.Logging
{
- ///
- /// Based on code by Chris Haines http://cjbhaines.wordpress.com/2012/02/13/asynchronous-log4net-appenders/
+ ///
+ /// Based on https://github.com/cjbhaines/Log4Net.Async
+ /// which is based on code by Chris Haines http://cjbhaines.wordpress.com/2012/02/13/asynchronous-log4net-appenders/
///
public class AsynchronousRollingFileAppender : RollingFileAppender
{
- private readonly ManualResetEvent _manualResetEvent;
- private int _bufferOverflowCounter;
- private bool _forceStop;
- private bool _hasFinished;
- private DateTime _lastLoggedBufferOverflow;
- private bool _logBufferOverflow;
- private RingBuffer _pendingAppends;
- private int _queueSizeLimit = 1000;
- private bool _shuttingDown;
+ private RingBuffer pendingAppends;
+ private readonly ManualResetEvent manualResetEvent;
+ private bool shuttingDown;
+ private bool hasFinished;
+ private bool forceStop;
+ private bool logBufferOverflow;
+ private int bufferOverflowCounter;
+ private DateTime lastLoggedBufferOverflow;
+ private int queueSizeLimit = 1000;
+ public int QueueSizeLimit
+ {
+ get
+ {
+ return queueSizeLimit;
+ }
+ set
+ {
+ queueSizeLimit = value;
+ }
+ }
- public AsynchronousRollingFileAppender()
- {
- _manualResetEvent = new ManualResetEvent(false);
- }
+ public AsynchronousRollingFileAppender()
+ {
+ manualResetEvent = new ManualResetEvent(false);
+ }
- public int QueueSizeLimit
- {
- get { return _queueSizeLimit; }
- set { _queueSizeLimit = value; }
- }
+ public override void ActivateOptions()
+ {
+ base.ActivateOptions();
+ pendingAppends = new RingBuffer(QueueSizeLimit);
+ pendingAppends.BufferOverflow += OnBufferOverflow;
+ StartAppendTask();
+ }
- public override void ActivateOptions()
- {
- base.ActivateOptions();
- _pendingAppends = new RingBuffer(QueueSizeLimit);
- _pendingAppends.BufferOverflow += OnBufferOverflow;
- StartAppendTask();
- }
+ protected override void Append(LoggingEvent[] loggingEvents)
+ {
+ Array.ForEach(loggingEvents, Append);
+ }
- protected override void Append(LoggingEvent[] loggingEvents)
- {
- Array.ForEach(loggingEvents, Append);
- }
+ protected override void Append(LoggingEvent loggingEvent)
+ {
+ if (FilterEvent(loggingEvent))
+ {
+ pendingAppends.Enqueue(loggingEvent);
+ }
+ }
- protected override void Append(LoggingEvent loggingEvent)
- {
- if (FilterEvent(loggingEvent))
- {
- _pendingAppends.Enqueue(loggingEvent);
- }
- }
+ protected override void OnClose()
+ {
+ shuttingDown = true;
+ manualResetEvent.WaitOne(TimeSpan.FromSeconds(5));
- protected override void OnClose()
- {
- _shuttingDown = true;
- _manualResetEvent.WaitOne(TimeSpan.FromSeconds(5));
+ if (!hasFinished)
+ {
+ forceStop = true;
+ base.Append(new LoggingEvent(new LoggingEventData
+ {
+ Level = Level.Error,
+ Message = "Unable to clear out the AsyncRollingFileAppender buffer in the allotted time, forcing a shutdown",
+ TimeStamp = DateTime.UtcNow,
+ Identity = "",
+ ExceptionString = "",
+ UserName = WindowsIdentity.GetCurrent() != null ? WindowsIdentity.GetCurrent().Name : "",
+ Domain = AppDomain.CurrentDomain.FriendlyName,
+ ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
+ LocationInfo = new LocationInfo(this.GetType().Name, "OnClose", "AsyncRollingFileAppender.cs", "75"),
+ LoggerName = this.GetType().FullName,
+ Properties = new PropertiesDictionary(),
+ })
+ );
+ }
- if (!_hasFinished)
- {
- _forceStop = true;
- var windowsIdentity = WindowsIdentity.GetCurrent();
+ base.OnClose();
+ }
- var logEvent = new LoggingEvent(new LoggingEventData
- {
- Level = global::log4net.Core.Level.Error,
- Message =
- "Unable to clear out the AsynchronousRollingFileAppender buffer in the allotted time, forcing a shutdown",
- TimeStamp = DateTime.UtcNow,
- Identity = "",
- ExceptionString = "",
- UserName = windowsIdentity != null ? windowsIdentity.Name : "",
- Domain = AppDomain.CurrentDomain.FriendlyName,
- ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
- LocationInfo =
- new LocationInfo(this.GetType().Name, "OnClose", "AsynchronousRollingFileAppender.cs", "59"),
- LoggerName = this.GetType().FullName,
- Properties = new PropertiesDictionary(),
- });
+ private void StartAppendTask()
+ {
+ if (!shuttingDown)
+ {
+ Task appendTask = new Task(AppendLoggingEvents, TaskCreationOptions.LongRunning);
+ appendTask.LogErrors(LogAppenderError).ContinueWith(x => StartAppendTask()).LogErrors(LogAppenderError);
+ appendTask.Start();
+ }
+ }
- if (this.DateTimeStrategy != null)
- {
- base.Append(logEvent);
- }
- }
+ private void LogAppenderError(string logMessage, Exception exception)
+ {
+ base.Append(new LoggingEvent(new LoggingEventData
+ {
+ Level = Level.Error,
+ Message = "Appender exception: " + logMessage,
+ TimeStamp = DateTime.UtcNow,
+ Identity = "",
+ ExceptionString = exception.ToString(),
+ UserName = WindowsIdentity.GetCurrent() != null ? WindowsIdentity.GetCurrent().Name : "",
+ Domain = AppDomain.CurrentDomain.FriendlyName,
+ ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
+ LocationInfo = new LocationInfo(this.GetType().Name, "LogAppenderError", "AsyncRollingFileAppender.cs", "152"),
+ LoggerName = this.GetType().FullName,
+ Properties = new PropertiesDictionary(),
+ }));
+ }
- base.OnClose();
- }
+ private void AppendLoggingEvents()
+ {
+ LoggingEvent loggingEventToAppend;
+ while (!shuttingDown)
+ {
+ if (logBufferOverflow)
+ {
+ LogBufferOverflowError();
+ logBufferOverflow = false;
+ bufferOverflowCounter = 0;
+ lastLoggedBufferOverflow = DateTime.UtcNow;
+ }
- private void StartAppendTask()
- {
- if (!_shuttingDown)
- {
- Task appendTask = new Task(AppendLoggingEvents, TaskCreationOptions.LongRunning);
- appendTask.LogErrors(LogAppenderError).ContinueWith(x => StartAppendTask()).LogErrors(LogAppenderError);
- appendTask.Start();
- }
- }
+ while (!pendingAppends.TryDequeue(out loggingEventToAppend))
+ {
+ Thread.Sleep(10);
+ if (shuttingDown)
+ {
+ break;
+ }
+ }
+ if (loggingEventToAppend == null)
+ {
+ continue;
+ }
- private void LogAppenderError(string logMessage, Exception exception)
- {
- var windowsIdentity = WindowsIdentity.GetCurrent();
- base.Append(new LoggingEvent(new LoggingEventData
- {
- Level = Level.Error,
- Message = "Appender exception: " + logMessage,
- TimeStamp = DateTime.UtcNow,
- Identity = "",
- ExceptionString = exception.ToString(),
- UserName = windowsIdentity != null ? windowsIdentity.Name : "",
- Domain = AppDomain.CurrentDomain.FriendlyName,
- ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
- LocationInfo =
- new LocationInfo(this.GetType().Name,
- "LogAppenderError",
- "AsynchronousRollingFileAppender.cs",
- "100"),
- LoggerName = this.GetType().FullName,
- Properties = new PropertiesDictionary(),
- }));
- }
+ try
+ {
+ base.Append(loggingEventToAppend);
+ }
+ catch
+ {
+ }
+ }
- private void AppendLoggingEvents()
- {
- LoggingEvent loggingEventToAppend;
- while (!_shuttingDown)
- {
- if (_logBufferOverflow)
- {
- LogBufferOverflowError();
- _logBufferOverflow = false;
- _bufferOverflowCounter = 0;
- _lastLoggedBufferOverflow = DateTime.UtcNow;
- }
+ while (pendingAppends.TryDequeue(out loggingEventToAppend) && !forceStop)
+ {
+ try
+ {
+ base.Append(loggingEventToAppend);
+ }
+ catch
+ {
+ }
+ }
+ hasFinished = true;
+ manualResetEvent.Set();
+ }
- while (!_pendingAppends.TryDequeue(out loggingEventToAppend))
- {
- Thread.Sleep(10);
- if (_shuttingDown)
- {
- break;
- }
- }
- if (loggingEventToAppend == null)
- {
- continue;
- }
+ private void LogBufferOverflowError()
+ {
+ base.Append(new LoggingEvent(new LoggingEventData
+ {
+ Level = Level.Error,
+ Message = string.Format("Buffer overflow. {0} logging events have been lost in the last 30 seconds. [QueueSizeLimit: {1}]", bufferOverflowCounter, QueueSizeLimit),
+ TimeStamp = DateTime.UtcNow,
+ Identity = "",
+ ExceptionString = "",
+ UserName = WindowsIdentity.GetCurrent() != null ? WindowsIdentity.GetCurrent().Name : "",
+ Domain = AppDomain.CurrentDomain.FriendlyName,
+ ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
+ LocationInfo = new LocationInfo(this.GetType().Name, "LogBufferOverflowError", "AsyncRollingFileAppender.cs", "152"),
+ LoggerName = this.GetType().FullName,
+ Properties = new PropertiesDictionary(),
+ }));
+ }
- try
- {
- base.Append(loggingEventToAppend);
- }
- catch
- {
- }
- }
+ private void OnBufferOverflow(object sender, EventArgs eventArgs)
+ {
+ bufferOverflowCounter++;
+ if (logBufferOverflow == false)
+ {
+ if (lastLoggedBufferOverflow < DateTime.UtcNow.AddSeconds(-30))
+ {
+ logBufferOverflow = true;
+ }
+ }
+ }
+ }
- while (_pendingAppends.TryDequeue(out loggingEventToAppend) && !_forceStop)
- {
- try
- {
- base.Append(loggingEventToAppend);
- }
- catch
- {
- }
- }
- _hasFinished = true;
- _manualResetEvent.Set();
- }
+ internal interface IQueue
+ {
+ void Enqueue(T item);
+ bool TryDequeue(out T ret);
+ }
- private void LogBufferOverflowError()
- {
- var windowsIdentity = WindowsIdentity.GetCurrent();
- base.Append(new LoggingEvent(new LoggingEventData
- {
- Level = Level.Error,
- Message =
- string.Format(
- "Buffer overflow. {0} logging events have been lost in the last 30 seconds. [QueueSizeLimit: {1}]",
- _bufferOverflowCounter,
- QueueSizeLimit),
- TimeStamp = DateTime.UtcNow,
- Identity = "",
- ExceptionString = "",
- UserName = windowsIdentity != null ? windowsIdentity.Name : "",
- Domain = AppDomain.CurrentDomain.FriendlyName,
- ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
- LocationInfo =
- new LocationInfo(this.GetType().Name,
- "LogBufferOverflowError",
- "AsynchronousRollingFileAppender.cs",
- "172"),
- LoggerName = this.GetType().FullName,
- Properties = new PropertiesDictionary(),
- }));
- }
+ internal class RingBuffer : IQueue
+ {
+ private readonly object lockObject = new object();
+ private readonly T[] buffer;
+ private readonly int size;
+ private int readIndex = 0;
+ private int writeIndex = 0;
+ private bool bufferFull = false;
- private void OnBufferOverflow(object sender, EventArgs eventArgs)
- {
- _bufferOverflowCounter++;
- if (_logBufferOverflow == false)
- {
- if (_lastLoggedBufferOverflow < DateTime.UtcNow.AddSeconds(-30))
- {
- _logBufferOverflow = true;
- }
- }
- }
+ public int Size { get { return size; } }
- private class RingBuffer
- {
- private readonly object _lockObject = new object();
- private readonly T[] _buffer;
- private readonly int _size;
- private int _readIndex = 0;
- private int _writeIndex = 0;
- private bool _bufferFull = false;
+ public event Action BufferOverflow;
- public event Action BufferOverflow;
+ public RingBuffer(int size)
+ {
+ this.size = size;
+ buffer = new T[size];
+ }
- public RingBuffer(int size)
- {
- this._size = size;
- _buffer = new T[size];
- }
+ public void Enqueue(T item)
+ {
+ var bufferWasFull = false;
+ lock (lockObject)
+ {
+ buffer[writeIndex] = item;
+ writeIndex = (++writeIndex) % size;
+ if (bufferFull)
+ {
+ bufferWasFull = true;
+ readIndex = writeIndex;
+ }
+ else if (writeIndex == readIndex)
+ {
+ bufferFull = true;
+ }
+ }
- public void Enqueue(T item)
- {
- lock (_lockObject)
- {
- _buffer[_writeIndex] = item;
- _writeIndex = (++_writeIndex) % _size;
- if (_bufferFull)
- {
- if (BufferOverflow != null)
- {
- BufferOverflow(this, EventArgs.Empty);
- }
- _readIndex = _writeIndex;
- }
- else if (_writeIndex == _readIndex)
- {
- _bufferFull = true;
- }
- }
- }
+ if (bufferWasFull)
+ {
+ if (BufferOverflow != null)
+ {
+ BufferOverflow(this, EventArgs.Empty);
+ }
+ }
+ }
- public bool TryDequeue(out T ret)
- {
- if (_readIndex == _writeIndex && !_bufferFull)
- {
- ret = default(T);
- return false;
- }
- lock (_lockObject)
- {
- if (_readIndex == _writeIndex && !_bufferFull)
- {
- ret = default(T);
- return false;
- }
+ public bool TryDequeue(out T ret)
+ {
+ if (readIndex == writeIndex && !bufferFull)
+ {
+ ret = default(T);
+ return false;
+ }
+ lock (lockObject)
+ {
+ if (readIndex == writeIndex && !bufferFull)
+ {
+ ret = default(T);
+ return false;
+ }
- ret = _buffer[_readIndex];
- _readIndex = (++_readIndex) % _size;
- _bufferFull = false;
- return true;
- }
- }
- }
- }
+ ret = buffer[readIndex];
+ buffer[readIndex] = default(T);
+ readIndex = (++readIndex) % size;
+ bufferFull = false;
+ return true;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Logging/Logger.cs b/src/Umbraco.Core/Logging/Logger.cs
index 58f696d82b..ae8bb60fcd 100644
--- a/src/Umbraco.Core/Logging/Logger.cs
+++ b/src/Umbraco.Core/Logging/Logger.cs
@@ -1,4 +1,5 @@
using System;
+using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Threading;
@@ -12,15 +13,20 @@ namespace Umbraco.Core.Logging
/// Used for logging
///
public class Logger : ILogger
- {
+ {
+
public Logger(FileInfo log4NetConfigFile)
+ :this()
{
XmlConfigurator.Configure(log4NetConfigFile);
}
private Logger()
{
-
+ //Add custom global properties to the log4net context that we can use in our logging output
+
+ log4net.GlobalContext.Properties["processId"] = Process.GetCurrentProcess().Id;
+ log4net.GlobalContext.Properties["appDomainId"] = AppDomain.CurrentDomain.Id;
}
///
@@ -53,31 +59,19 @@ namespace Umbraco.Core.Logging
return LogManager.GetLogger(getTypeFromInstance.GetType());
}
-
- ///
- /// Useful if the logger itself is running on another thread
- ///
- ///
- ///
- private string PrefixThreadId(string generateMessageFormat)
- {
- return "[Thread " + Thread.CurrentThread.ManagedThreadId + "] " + generateMessageFormat;
- }
-
+
public void Error(Type callingType, string message, Exception exception)
{
var logger = LogManager.GetLogger(callingType);
if (logger != null)
- logger.Error(PrefixThreadId(message), exception);
+ logger.Error((message), exception);
}
-
-
public void Warn(Type callingType, string message, params Func