lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove all traces of "default.aspx"

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-12-10 21:42:57 -08:00
parent 3bbdac0eb6
commit 9e0387c76a
10 changed files with 147 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Specs/Hosting/RequestExtensions.cs
View File

@@ -15,13 +15,15 @@ namespace Orchard.Specs.Hosting {
var physicalPath = Bleroy.FluentPath.Path.Get(webHost.PhysicalDirectory);
bool isHomepage = urlPath == "/";
if (!isHomepage)
urlPath = StripVDir(urlPath, webHost.VirtualDirectory);
var details = new RequestDetails {
HostName = webHost.HostName,
UrlPath = urlPath,
Page = physicalPath
.Combine(urlPath.TrimStart('/', '\\'))
.GetRelativePath(physicalPath)
Page = (isHomepage ? "" : physicalPath.Combine(urlPath.TrimStart('/', '\\')).GetRelativePath(physicalPath).ToString())
};
if (!string.IsNullOrEmpty(webHost.Cookies)) {

2
src/Orchard.Specs/MultiTenancy.feature
View File

@@ -89,7 +89,7 @@ Scenario: A new tenant runs the setup
| AdminPassword | 6655321 |
| ConfirmPassword | 6655321 |
And I hit "Finish Setup"
And I go to "/Default.aspx"
And I go to "/"
Then I should see "Scott Site"
And I should see "Welcome"

8
src/Orchard.Specs/MultiTenancy.feature.cs generated
View File

@@ -1,7 +1,7 @@
// ------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.3.2.0
// SpecFlow Version:1.4.0.0
// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
@@ -14,7 +14,7 @@ namespace Orchard.Specs
using TechTalk.SpecFlow;
[System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.3.2.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.4.0.0")]
[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[NUnit.Framework.TestFixtureAttribute()]
[NUnit.Framework.DescriptionAttribute("Multiple tenant management")]
@@ -31,7 +31,7 @@ namespace Orchard.Specs
{
testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Multiple tenant management", "In order to host several isolated web applications\r\nAs a root Orchard system oper" +
"ator\r\nI want to create and manage tenant configurations", ((string[])(null)));
"ator\r\nI want to create and manage tenant configurations", GenerationTargetLanguage.CSharp, ((string[])(null)));
testRunner.OnFeatureStart(featureInfo);
}
@@ -297,7 +297,7 @@ testRunner.And("I fill in", ((string)(null)), table6);
#line 91
testRunner.And("I hit \"Finish Setup\"");
#line 92
testRunner.And("I go to \"/Default.aspx\"");
testRunner.And("I go to \"/\"");
#line 93
testRunner.Then("I should see \"Scott Site\"");
#line 94

4
src/Orchard.Specs/Pages.feature
View File

@@ -50,7 +50,7 @@ Scenario: A new page marked to be the home page and publish does take over the h
| Body.Text | This is a draft of the new home page. |
| Routable.PromoteToHomePage | true |
And I hit "Publish Now"
And I go to "/Default.aspx"
And I go to "/"
Then I should see "<h1>Super Duper</h1>"
When I go to "super-duper"
Then the status should be 404 "Not Found"
@@ -64,5 +64,5 @@ Scenario: A new page marked to be the home page but only saved as draft does not
| Body.Text | This is a draft of the new home page. |
| Routable.PromoteToHomePage | true |
And I hit "Save"
And I go to "/Default.aspx"
And I go to "/"
Then I should see "<h1>Welcome to Orchard!</h1>"

4
src/Orchard.Specs/Pages.feature.cs generated
View File

@@ -195,7 +195,7 @@ this.ScenarioSetup(scenarioInfo);
#line 52
testRunner.And("I hit \"Publish Now\"");
#line 53
testRunner.And("I go to \"/Default.aspx\"");
testRunner.And("I go to \"/\"");
#line 54
testRunner.Then("I should see \"<h1>Super Duper</h1>\"");
#line 55
@@ -237,7 +237,7 @@ this.ScenarioSetup(scenarioInfo);
#line 66
testRunner.And("I hit \"Save\"");
#line 67
testRunner.And("I go to \"/Default.aspx\"");
testRunner.And("I go to \"/\"");
#line 68
testRunner.Then("I should see \"<h1>Welcome to Orchard!</h1>\"");
#line hidden

4
src/Orchard.Specs/Setup.feature
View File

@@ -9,7 +9,7 @@ Scenario: Root request shows setup form
| Module | Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Messaging, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.jQuery, TinyMce |
| Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc |
| Theme | SafeMode |
When I go to "/Default.aspx"
When I go to "/"
Then I should see "Welcome to Orchard"
And I should see "Finish Setup"
And the status should be 200 "OK"
@@ -49,6 +49,6 @@ Scenario: Calling setup on a brand new install
| AdminPassword | 6655321 |
| ConfirmPassword | 6655321 |
And I hit "Finish Setup"
And I go to "/Default.aspx"
And I go to "/"
Then I should see "My Site"
And I should see "Welcome, <strong>admin</strong>!"

10
src/Orchard.Specs/Setup.feature.cs generated
View File

@@ -1,7 +1,7 @@
// ------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.3.2.0
// SpecFlow Version:1.4.0.0
// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
@@ -14,7 +14,7 @@ namespace Orchard.Specs
using TechTalk.SpecFlow;
[System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.3.2.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.4.0.0")]
[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[NUnit.Framework.TestFixtureAttribute()]
[NUnit.Framework.DescriptionAttribute("Setup")]
@@ -31,7 +31,7 @@ namespace Orchard.Specs
{
testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Setup", "In order to install orchard\r\nAs a new user\r\nI want to setup a new site from the d" +
"efault screen", ((string[])(null)));
"efault screen", GenerationTargetLanguage.CSharp, ((string[])(null)));
testRunner.OnFeatureStart(featureInfo);
}
@@ -78,7 +78,7 @@ this.ScenarioSetup(scenarioInfo);
#line 7
testRunner.Given("I have a clean site with", ((string)(null)), table1);
#line 12
testRunner.When("I go to \"/Default.aspx\"");
testRunner.When("I go to \"/\"");
#line 13
testRunner.Then("I should see \"Welcome to Orchard\"");
#line 14
@@ -208,7 +208,7 @@ testRunner.When("I fill in", ((string)(null)), table5);
#line 51
testRunner.And("I hit \"Finish Setup\"");
#line 52
testRunner.And("I go to \"/Default.aspx\"");
testRunner.And("I go to \"/\"");
#line 53
testRunner.Then("I should see \"My Site\"");
#line 54

2
src/Orchard.Web/Web.config
View File

@@ -117,7 +117,6 @@
<httpHandlers>
<!-- see below -->
<clear />
<add path="default.aspx" verb="*" type="System.Web.UI.PageHandlerFactory" validate="true" />
<add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
</httpHandlers>
@@ -134,7 +133,6 @@
<!-- clear all handlers, prevents executing code file extensions, prevents returning any file contents -->
<clear/>
<!-- Return 404 for all requests via managed handler. The url routing handler will substitute the mvc request handler when routes match. -->
<add name="Default" path="default.aspx" verb="*" type="System.Web.UI.PageHandlerFactory" preCondition="integratedMode" requireAccess="Script"/>
<add name="NotFound" path="*" verb="*" type="System.Web.HttpNotFoundHandler" preCondition="integratedMode" requireAccess="Script"/>
</handlers>
</system.webServer>

4
src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/ExtraFiles.xml
View File

@@ -1,9 +1,5 @@
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Compile Include="Default.aspx.cs">
<DependentUpon>Default.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>

5
src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml
View File

@@ -74,17 +74,12 @@
<Reference Include="System.Web.Mobile" />
</ItemGroup>
<ItemGroup>
<Compile Include="Default.aspx.cs">
<DependentUpon>Default.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Default.aspx" />
<Content Include="Global.asax" />
<Content Include="Web.config" />
<Content Include="Views\Home\Index.ascx" />