diff --git a/src/Umbraco.Core/Models/ApplicationTree.cs b/src/Umbraco.Core/Models/ApplicationTree.cs index 2244d206d3..b44db46795 100644 --- a/src/Umbraco.Core/Models/ApplicationTree.cs +++ b/src/Umbraco.Core/Models/ApplicationTree.cs @@ -117,11 +117,11 @@ namespace Umbraco.Core.Models var parts = type.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); if (parts.Length != 2) throw new InvalidOperationException("Could not resolve type"); - if (parts[1].Trim() != "umbraco" || parts[0].StartsWith("Umbraco.Web.Trees") == false || parts[0].EndsWith("Controller")) + if (parts[1].Trim() != "Umbraco.Web" || parts[0].StartsWith("Umbraco.Web.Trees") == false || parts[0].EndsWith("Controller")) throw new InvalidOperationException("Could not resolve type"); //if it's one of our controllers but it's not suffixed with "Controller" then add it and try again - var tempType = parts[0] + "Controller, umbraco"; + var tempType = parts[0] + "Controller, Umbraco.Web"; result = System.Type.GetType(tempType); if (result != null) diff --git a/src/Umbraco.Core/Properties/AssemblyInfo.cs b/src/Umbraco.Core/Properties/AssemblyInfo.cs index b78788d8c9..44cd5df1ce 100644 --- a/src/Umbraco.Core/Properties/AssemblyInfo.cs +++ b/src/Umbraco.Core/Properties/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: Guid("130a6b5c-50e7-4df3-a0dd-e9e7eb0b7c5c")] // Umbraco Cms -[assembly: InternalsVisibleTo("umbraco")] +[assembly: InternalsVisibleTo("Umbraco.Web")] [assembly: InternalsVisibleTo("Umbraco.Tests")] [assembly: InternalsVisibleTo("Umbraco.Extensions")] // fixme ? [assembly: InternalsVisibleTo("businesslogic")] // fixme ? diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs index 06fba6fadc..885f63a8a8 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs @@ -219,7 +219,7 @@ namespace Umbraco.Tests.Testing AssembliesToScan = new[] { Assembly.Load("Umbraco.Core"), - Assembly.Load("umbraco"), + Assembly.Load("Umbraco.Web"), Assembly.Load("Umbraco.Tests") } }; diff --git a/src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs b/src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs index fd080b214d..01aea73e74 100644 --- a/src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs +++ b/src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs @@ -68,7 +68,7 @@ namespace Umbraco.Tests.TreesAndSections Assert.IsNotNull(app); //create the new app tree assigned to the new app - Current.Services.ApplicationTreeService.MakeNew(false, 0, app.Alias, treeName, treeName, "icon.jpg", "icon.jpg", "Umbraco.Web.Trees.ContentTreeController, umbraco"); + Current.Services.ApplicationTreeService.MakeNew(false, 0, app.Alias, treeName, treeName, "icon.jpg", "icon.jpg", "Umbraco.Web.Trees.ContentTreeController, Umbraco.Web"); var tree = Current.Services.ApplicationTreeService.GetByAlias(treeName); Assert.IsNotNull(tree); diff --git a/src/Umbraco.Web.UI/config/ClientDependency.Release.config b/src/Umbraco.Web.UI/config/ClientDependency.Release.config index 0efd128202..3409742432 100644 --- a/src/Umbraco.Web.UI/config/ClientDependency.Release.config +++ b/src/Umbraco.Web.UI/config/ClientDependency.Release.config @@ -1,6 +1,6 @@  - - + - - - + + - - + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + diff --git a/src/Umbraco.Web.UI/config/trees.config b/src/Umbraco.Web.UI/config/trees.config index 990992fd86..b3ad5b6310 100644 --- a/src/Umbraco.Web.UI/config/trees.config +++ b/src/Umbraco.Web.UI/config/trees.config @@ -1,38 +1,38 @@  - - + + - - + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config index d9e6500a03..4da6888f46 100644 --- a/src/Umbraco.Web.UI/web.Template.config +++ b/src/Umbraco.Web.UI/web.Template.config @@ -119,7 +119,7 @@ - + @@ -254,8 +254,8 @@ - - + + @@ -278,7 +278,7 @@ - + diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 8e632fc4f9..6bca845789 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -6,7 +6,7 @@ false {651E1350-91B6-44B7-BD60-7207006D7003} Library - umbraco + Umbraco.Web Umbraco.Web ..\ true @@ -28,7 +28,7 @@ TRACE prompt 4 - bin\Release\umbraco.xml + bin\Release\Umbraco.Web.xml false diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs index c1aa30653e..4f46c0d8e5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs @@ -11,7 +11,7 @@ namespace umbraco.presentation.templateControls /// This control disables request validation (equalevant of setting validateRequest to false in page directive) /// [ToolboxData("<{0}:DisableRequestValidation runat=\"server\">")] - [Designer("umbraco.presentation.templateControls.ItemDesigner, umbraco")] + [Designer("umbraco.presentation.templateControls.ItemDesigner, Umbraco.Web")] public class DisableRequestValidation : System.Web.UI.WebControls.WebControl { protected override void OnInit(EventArgs e) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs index 810cca2c89..397b626201 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs @@ -21,7 +21,7 @@ namespace umbraco.presentation.templateControls /// [DefaultProperty("Field")] [ToolboxData("<{0}:Item runat=\"server\">")] - [Designer("umbraco.presentation.templateControls.ItemDesigner, umbraco")] + [Designer("umbraco.presentation.templateControls.ItemDesigner, Umbraco.Web")] public class Item : CompositeControl { diff --git a/src/UmbracoExamine/LegacyLibrary.cs b/src/UmbracoExamine/LegacyLibrary.cs index 0908f005f6..207f92373c 100644 --- a/src/UmbracoExamine/LegacyLibrary.cs +++ b/src/UmbracoExamine/LegacyLibrary.cs @@ -6,7 +6,7 @@ namespace UmbracoExamine { /// /// This is only used for backward compatibility to get access to the umbraco.library object but this needs to be done - /// via reflection because of the circular reference we have between Umbraco.Web and UmbracoExamine. + /// via reflection because of the circular reference we have between Umbraco.Web and UmbracoExamine. /// internal static class LegacyLibrary { @@ -22,12 +22,12 @@ namespace UmbracoExamine { if (_libraryType == null) { - var ass = Assembly.Load("umbraco"); + var ass = Assembly.Load("Umbraco.Web"); if (ass == null) - throw new InvalidOperationException("Could not load assembly umbraco.dll, the umbraco.dll needs to be loaded in the current app domain"); + throw new InvalidOperationException("Could not load assembly Umbraco.Web.dll, the Umbraco.Web.dll needs to be loaded in the current app domain"); var lib = ass.GetType("umbraco.library"); if (lib == null) - throw new InvalidOperationException("Could not load type umbraco.library, the umbraco.dll needs to be loaded in the current app domain"); + throw new InvalidOperationException("Could not load type umbraco.library, the Umbraco.Web.dll needs to be loaded in the current app domain"); _libraryType = lib; } } @@ -35,13 +35,13 @@ namespace UmbracoExamine return _libraryType; } } - + internal static XPathNodeIterator GetXmlNodeByXPath(string xpathQuery) { var meth = LibraryType.GetMethod("GetXmlNodeByXPath", BindingFlags.Public | BindingFlags.Static); return (XPathNodeIterator)meth.Invoke(null, new object[] { xpathQuery }); } - + } } \ No newline at end of file