Commit Graph

1123 Commits

Author SHA1 Message Date
Nathan Heskew
5fb845dcc9 Adding start of initial module management UI
--HG--
branch : dev
2010-04-23 15:10:47 -07:00
Louis DeJardin
4b15c18ce0 Integrating routing work into project
Uncommenting old route collection publisher tests
Factoring wrapping handler into async and non-async cases
Adding [IContainerProvider] to datatokens at the time the routedata is matched

--HG--
branch : dev
2010-04-23 11:45:30 -07:00
Louis DeJardin
ca222e60f7 Implementing and testing request-to-shell mapping in RunningShellTable
Trailing host and leading path equality is required (by ordinal-ignore-case)
Longest stated host name is primary quality consideration for selection
Longest stated path prefix is secondary quality consideration, for shells of equal stated host names
Single unqualified shell matches only if all qualified shells fail first statment
'Default' unqualified (no stated host/path) shell takes precidence over other unqualified shells
No match occurs if 'Default' is qualified, multiple other shells are unqualified, and no qualified match occurs

--HG--
branch : dev
2010-04-22 19:35:31 -07:00
Suha Can
6f50f1038e - minor text change in the multitenancy admin.
--HG--
branch : dev
2010-04-22 18:02:26 -07:00
Nathan Heskew
5b3ad69503 Adding Orchard.Modules ... module
--HG--
branch : dev
2010-04-22 17:49:21 -07:00
Suha Can
91bb52c8af - Adding TenantState to the ShellSettings.
- Changes to the setup controller, multi tenancy controller/command handler to accomodate new ShellSettings like host,url prefix and state.
- Integration tests.

--HG--
branch : dev
2010-04-22 17:38:02 -07:00
Louis DeJardin
1fa348b6b6 Adding request url data to settings struct and making name of prefix more specific
--HG--
branch : dev
2010-04-22 16:06:07 -07:00
Louis DeJardin
e33a8e99d2 Merge
--HG--
branch : dev
2010-04-22 15:57:29 -07:00
Louis DeJardin
7014534b5b Fixing some spec tests
Orchard.Themes is one of the modules needed to function
Cleaning up some of the trace capture code

--HG--
branch : dev
2010-04-22 15:57:08 -07:00
Suha Can
28cc29c0ed - Removing some long ignored test cases.
--HG--
branch : dev
2010-04-22 15:49:56 -07:00
Nathan Heskew
3e46d5f0b0 Changing Orchard.Themes' System.Web.Mvc reference to what's in the lib
--HG--
branch : dev
2010-04-22 15:20:01 -07:00
Nathan Heskew
515d687342 Pulling Themes from Orchard.Core into its own module, Orchard.Themes
--HG--
branch : dev
rename : src/Orchard.Web/Core/Themes/AdminMenu.cs => src/Orchard.Web/Modules/Orchard.Themes/AdminMenu.cs
rename : src/Orchard.Web/Core/Themes/Content/orchard.ico => src/Orchard.Web/Modules/Orchard.Themes/Content/orchard.ico
rename : src/Orchard.Web/Core/Themes/Controllers/AdminController.cs => src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
rename : src/Orchard.Web/Core/Themes/DesignerNotes/ZoneManagerEvents.cs => src/Orchard.Web/Modules/Orchard.Themes/DesignerNotes/ZoneManagerEvents.cs
rename : src/Orchard.Web/Core/Themes/Handlers/ThemeSiteSettingsHandler.cs => src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsHandler.cs
rename : src/Orchard.Web/Core/Themes/Models/Theme.cs => src/Orchard.Web/Modules/Orchard.Themes/Models/Theme.cs
rename : src/Orchard.Web/Core/Themes/Models/ThemeRecord.cs => src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeRecord.cs
rename : src/Orchard.Web/Core/Themes/Models/ThemeSiteSettings.cs => src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettings.cs
rename : src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsRecord.cs => src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsRecord.cs
rename : src/Orchard.Web/Core/Themes/Module.txt => src/Orchard.Web/Modules/Orchard.Themes/Module.txt
rename : src/Orchard.Web/Core/Themes/Permissions.cs => src/Orchard.Web/Modules/Orchard.Themes/Permissions.cs
rename : src/Orchard.Web/Core/Themes/Preview/IPreviewTheme.cs => src/Orchard.Web/Modules/Orchard.Themes/Preview/IPreviewTheme.cs
rename : src/Orchard.Web/Core/Themes/Preview/PreviewTheme.cs => src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewTheme.cs
rename : src/Orchard.Web/Core/Themes/Preview/PreviewThemeFilter.cs => src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewThemeFilter.cs
rename : src/Orchard.Web/Core/Themes/Scripts/base.js => src/Orchard.Web/Modules/Orchard.Themes/Scripts/base.js
rename : src/Orchard.Web/Core/Themes/Scripts/jquery-1.4.1.js => src/Orchard.Web/Modules/Orchard.Themes/Scripts/jquery-1.4.1.js
rename : src/Orchard.Web/Core/Themes/Scripts/jquery-1.4.1.min.js => src/Orchard.Web/Modules/Orchard.Themes/Scripts/jquery-1.4.1.min.js
rename : src/Orchard.Web/Core/Themes/Services/SafeModeThemeSelector.cs => src/Orchard.Web/Modules/Orchard.Themes/Services/SafeModeThemeSelector.cs
rename : src/Orchard.Web/Core/Themes/Services/SiteThemeSelector.cs => src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs
rename : src/Orchard.Web/Core/Themes/Services/ThemeService.cs => src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
rename : src/Orchard.Web/Core/Themes/Services/ThemeZoneManagerEvents.cs => src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeZoneManagerEvents.cs
rename : src/Orchard.Web/Core/Themes/Styles/Images/toolBarActiveButtonBackground.gif => src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarActiveButtonBackground.gif
rename : src/Orchard.Web/Core/Themes/Styles/Images/toolBarBackground.gif => src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarBackground.gif
rename : src/Orchard.Web/Core/Themes/Styles/Images/toolBarHoverButtonBackground.gif => src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarHoverButtonBackground.gif
rename : src/Orchard.Web/Core/Themes/Styles/special.css => src/Orchard.Web/Modules/Orchard.Themes/Styles/special.css
rename : src/Orchard.Web/Core/Themes/ViewModels/PreviewViewModel.cs => src/Orchard.Web/Modules/Orchard.Themes/ViewModels/PreviewViewModel.cs
rename : src/Orchard.Web/Core/Themes/ViewModels/ThemesIndexViewModel.cs => src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs
rename : src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx => src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx
rename : src/Orchard.Web/Core/Themes/Views/Admin/Install.aspx => src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.aspx
rename : src/Orchard.Web/Core/Themes/Views/Admin/ThemePreview.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/ThemePreview.ascx
rename : src/Orchard.Web/Core/Themes/Views/EditorTemplates/Items/ContentItem.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/DisplayTemplates/Items/ContentItem.ascx
rename : src/Orchard.Web/Core/Themes/Views/Document.aspx => src/Orchard.Web/Modules/Orchard.Themes/Views/Document.aspx
rename : src/Orchard.Web/Core/Themes/Views/EditorTemplates/Items/ContentItem.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/EditorTemplates/Items/ContentItem.ascx
rename : src/Orchard.Web/Core/Themes/Views/HeadPreload.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/HeadPreload.ascx
rename : src/Orchard.Web/Core/Themes/Views/Header.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Header.ascx
rename : src/Orchard.Web/Core/Themes/Views/Layout.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Layout.ascx
rename : src/Orchard.Web/Core/Themes/Views/Menu.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Menu.ascx
rename : src/Orchard.Web/Core/Themes/Views/Messages.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Messages.ascx
rename : src/Orchard.Web/Core/Themes/Views/NotFound.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/NotFound.ascx
rename : src/Orchard.Web/Core/Themes/Views/User.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/User.ascx
rename : src/Orchard.Web/Core/Themes/Views/Web.config => src/Orchard.Web/Modules/Orchard.Themes/Views/Web.config
rename : src/Orchard.Web/Core/Themes/Views/Web.config => src/Orchard.Web/Modules/Orchard.Themes/Web.config
2010-04-22 14:39:09 -07:00
Louis DeJardin
b12ded8eb5 Merge
--HG--
branch : dev
2010-04-22 12:25:03 -07:00
Louis DeJardin
79431a11a2 Further progress towards tenant-specific routing
Ability to follow redirects from integration tests
Route publisher wraps handler with ShellRoute which controls request lifetime scope
ShellRoute at the moment is restricted to "Default" - host and prefix TBD
Route publisher remove-and-insert routes for a specific tenant to allow incremental and repeated shell route publish
Offers a more deterministic knowledge of which shell container is used than just-in-time http context
Removes Autofac default httpmodule, controller factory, httpapplication icontainerprovideraccessor, etc
Adds support for optional ~/Config/Sites.{yourtenantname}.config file for manual per-shell component override
Integration tests capture Orchard and NHibernate trace output. Levels are configurable in orchard.specs diagnostics.config
Concept of IRunningShellTable instroduced. Might not be needed - will be removed if so.

--HG--
branch : dev
2010-04-22 12:23:58 -07:00
Suha Can
45c2b3ec7e - tenant info <tenantName> command...
--HG--
branch : dev
2010-04-22 11:31:24 -07:00
Suha Can
fb87c02273 - Adding some switches for host/urlprefix to the multi-tenancy command handler.
- Moving connection string (for SQL) to be a switch instead of arg.
- Refining output text from multi-tenancy commands, adding better help text.

--HG--
branch : dev
2010-04-22 11:23:18 -07:00
Louis DeJardin
eaf553b048 Working towards routing support for miti-tenancy
Adding large-grained initialization steps for integration tests
Fixing a collection issue with shell descriptor records and manager
Adding index action to tenants controller

--HG--
branch : dev
2010-04-21 19:41:37 -07:00
Suha Can
5936a86d60 - Partial view for adding a new tenant...
--HG--
branch : dev
2010-04-21 16:30:24 -07:00
Suha Can
3a497a0c7b - Simple create tenant command for the tenant command handler.
--HG--
branch : dev
2010-04-21 16:00:03 -07:00
Suha Can
ed6b6a879e - CreateTenant on the service and related simple admin UI.
--HG--
branch : dev
2010-04-21 15:43:41 -07:00
Louis DeJardin
c0fac8d2ca Merge
--HG--
branch : dev
2010-04-21 15:01:30 -07:00
Louis DeJardin
19e694834d Setup integration test working
Added (very bad) cookie support to integration test lib
Workaround to resolving collections appears to have worked

--HG--
branch : dev
2010-04-21 15:01:01 -07:00
Suha Can
410c304bbc - MultiTenancy module lists current tenants of the site.
- TenantService abstraction to list/add tenants.
- TenantCommand and multitenancy admin controllers on top of the tenantservice.
- Simple Tenant list UI for the backend.

--HG--
branch : dev
2010-04-21 13:53:03 -07:00
Louis DeJardin
583138c7ed Updating Autofac.dll with small change for implicit collections issue
--HG--
branch : dev
2010-04-21 13:51:26 -07:00
Suha Can
8434039294 - Adding new module ref to the web app.
--HG--
branch : dev
2010-04-21 12:32:01 -07:00
Suha Can
ccd082f417 - Adding the multi-tenancy module.
--HG--
branch : dev
2010-04-21 12:25:23 -07:00
Louis DeJardin
e750edb514 Found what could be an Autofac bug
Made a test for repro and emailed the autofac group

--HG--
branch : dev
2010-04-21 00:36:36 -07:00
Louis DeJardin
5a07a5a8c4 Fixing more tests
Default Orchard host tests provides test components explicitly for resolving
Simple hosting tests use site in it's own basic folder

--HG--
branch : dev
2010-04-20 16:11:48 -07:00
Louis DeJardin
a03f0278f7 Merge
--HG--
branch : dev
2010-04-20 15:07:33 -07:00
Louis DeJardin
31995c55ca Setup submit scenario works
Minimum modules are copied
Form is submitted
Redirect is verified (should have a step to follow redirect)
Also changed .Named to .Keyed in a controller test

--HG--
branch : dev
2010-04-20 15:07:00 -07:00
Suha Can
1c8ff01ca2 - Fixing some Mvc unit tests...
--HG--
branch : dev
2010-04-20 15:01:32 -07:00
Louis DeJardin
ef8e3d4cce Merge
--HG--
branch : dev
2010-04-20 14:28:31 -07:00
Louis DeJardin
699d4c0f4d Merge
--HG--
branch : dev
2010-04-20 14:28:19 -07:00
Louis DeJardin
299a4ba74d Working SpecFlow POST support
Step named: When I hit "x"
locates input type submit with value "x"
locates the form surrounding that input
and sends a POST request to the embedded web host with all of the input values of that form element
Also added step: Given I have a clean site with
as a large-grained copier of extensions

--HG--
branch : dev
2010-04-20 14:27:43 -07:00
Louis DeJardin
5b3c213de4 Incremental work towards getting SpecFlow form "POST"
--HG--
branch : dev
2010-04-20 14:13:14 -07:00
Suha Can
dbc43a3a5c - Fixing some broken tests (table prefix and extension manager refactoring side effects)...
--HG--
branch : dev
2010-04-20 13:42:32 -07:00
Louis DeJardin
fc6acf68e1 Fixing an issue with order-of-execution in setup
Database created and schema generated before the rest of the setup info is applied
Known set of minimum modules are used to generate schema, and are saved in the shell's records

--HG--
branch : dev
2010-04-19 18:29:45 -07:00
Louis DeJardin
ffa92f76e9 Passing along ShellSettings to apply DataPrefix to RecordTopology
--HG--
branch : dev
2010-04-19 16:52:22 -07:00
Louis DeJardin
78d5711e1a Creating feature for extension name implicitly
Supports existing module.txt file format
Reduces the size of a minimalistic descriptor file

--HG--
branch : dev
2010-04-19 16:34:35 -07:00
Louis DeJardin
1800c632b6 Refactoring ShellTopology slightly
Merging IModule and IDependency information in ShellTopology
Avoids conceptual collision with Orchard Modules and Autofac IModule components

--HG--
branch : dev
2010-04-19 16:21:20 -07:00
Louis DeJardin
4ea2ff7327 Adding comments to some environment model classes
--HG--
branch : dev
2010-04-19 15:48:05 -07:00
Louis DeJardin
9495f5c557 Must remember to save all before commit
--HG--
branch : dev
2010-04-19 14:25:16 -07:00
Louis DeJardin
8d78fee02b Renaming ShellTopologyDescriptor to ShellDescriptor
More accurate and terse
Associated tests, interface, component names changed to follow suit

--HG--
branch : dev
2010-04-19 13:51:15 -07:00
Louis DeJardin
7c793f4e0a Cleaning up and fixing some tests. Refactoring.
Using auto mocking instead of some null stubs. Unclear if that practice will be adopted.
Builtin Orchard.Framework feature definition moved from ExtensioManager to CompositionStrategy

--HG--
branch : dev
2010-04-19 12:25:53 -07:00
Louis DeJardin
3509843b48 Compacting code and removing some obsolete things
--HG--
branch : dev
2010-04-17 22:14:31 -07:00
Louis DeJardin
71e019a0b8 Incremental changes towards enabling setup module
Setup controller can render initial screen
SafeMode container factory moved into Orchard.Setup module
ShellBuilders namespace files compacted a bit
Core feature named "Orchard.Framework" and is not used in setup mode

--HG--
branch : dev
2010-04-17 21:33:36 -07:00
Louis DeJardin
a137d84732 Working towards re-enabling setup context
--HG--
branch : dev
2010-04-17 19:22:26 -07:00
Louis DeJardin
1cfaae90b8 Building out composition strategy
Four main component types are populated from topology
Additional information for table/area/controller name populated
Some core types for records added automatically

--HG--
branch : dev
2010-04-17 17:03:07 -07:00
Louis DeJardin
6fb6ef0033 Relocating extensions to environment namespace
--HG--
branch : dev
2010-04-17 16:09:53 -07:00
Louis DeJardin
00d235c717 Merge
--HG--
branch : dev
2010-04-16 20:58:47 -07:00