From 494b7f1d78bc648739fa771639e5be0b191f45ba Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Fri, 1 Oct 2010 18:54:19 -0700 Subject: [PATCH] Removed secutiry patch and updated Azure project --HG-- branch : dev --- AzurePackage.proj | 2 +- .../Orchard.Azure.Web/Error.aspx | 27 ----- .../Orchard.Azure.Web.csproj | 21 ++-- .../Orchard.Azure.Web/Web.config | 106 ++++++------------ src/Orchard.Web/Error.aspx | 27 ----- src/Orchard.Web/Orchard.Web.csproj | 1 - src/Orchard.Web/Web.config | 44 +------- 7 files changed, 48 insertions(+), 180 deletions(-) delete mode 100644 src/Orchard.Azure/Orchard.Azure.Web/Error.aspx delete mode 100644 src/Orchard.Web/Error.aspx diff --git a/AzurePackage.proj b/AzurePackage.proj index fc89edb21..d776806b3 100644 --- a/AzurePackage.proj +++ b/AzurePackage.proj @@ -18,7 +18,7 @@ - + diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Error.aspx b/src/Orchard.Azure/Orchard.Azure.Web/Error.aspx deleted file mode 100644 index 452b1c914..000000000 --- a/src/Orchard.Azure/Orchard.Azure.Web/Error.aspx +++ /dev/null @@ -1,27 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" %> -<%@ Import Namespace="System.Security.Cryptography" %> -<%@ Import Namespace="System.Threading" %> - - - - - - Error - - -
- An error occurred while processing your request. -
- - diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj index 2af78b278..e83783e99 100644 --- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj +++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj @@ -6,7 +6,7 @@ 9.0.30729 2.0 {0DF8F426-9F30-4918-8F64-A5B40BA12D10} - {e53f8fea-eae0-44a6-8774-ffd645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library Properties Orchard.Azure.Web @@ -146,7 +146,6 @@ - @@ -167,10 +166,6 @@ {9916839C-39FC-4CEB-A5AF-89CA7E87119F} Orchard.Core - - {E65E5633-C0FF-453C-A906-481C14F969D6} - Futures.Widgets - {D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D} Lucene @@ -179,6 +174,10 @@ {63FBD4D9-E1DA-4A7B-AA6A-D6074FE50867} Orchard.Blogs + + {C0C45321-B51D-4D8D-9B7B-AA4C2E0B2962} + Orchard.CodeGeneration + {14C049FD-B35B-415A-A824-87F26B26E7FD} Orchard.Comments @@ -187,9 +186,9 @@ {0E7646E8-FE8F-43C1-8799-D97860925EC4} Orchard.ContentTypes - - {67C1D3AF-A0EC-46B2-BAE1-DF1DA8E0B890} - Orchard.DevTools + + {AB3C207C-0126-4143-8D62-1119DF80D366} + Orchard.Experimental {EA2B9121-EF54-40A6-A53E-6593C86EE696} @@ -215,10 +214,6 @@ {D10AD48F-407D-4DB5-A328-173EC7CB010F} Orchard.Roles - - {17C44253-65A2-4597-98C7-16EE576824B6} - Orchard.Sandbox - {4BE4EB01-AC56-4048-924E-2CA77F509ABA} Orchard.Search diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Web.config b/src/Orchard.Azure/Orchard.Azure.Web/Web.config index 3f7f25c01..111739ab3 100644 --- a/src/Orchard.Azure/Orchard.Azure.Web/Web.config +++ b/src/Orchard.Azure/Orchard.Azure.Web/Web.config @@ -8,9 +8,31 @@ \Windows\Microsoft.Net\Framework\v2.x\Config --> - + + +
+
+ + + + + + + + + + + + + + + + + + + - - - - - - - - - + - - + + - + @@ -101,17 +98,11 @@ - - - - - - - - - - + + + + @@ -124,38 +115,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/src/Orchard.Web/Error.aspx b/src/Orchard.Web/Error.aspx deleted file mode 100644 index 452b1c914..000000000 --- a/src/Orchard.Web/Error.aspx +++ /dev/null @@ -1,27 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" %> -<%@ Import Namespace="System.Security.Cryptography" %> -<%@ Import Namespace="System.Threading" %> - - - - - - Error - - -
- An error occurred while processing your request. -
- - diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 64d973465..ff902849e 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -98,7 +98,6 @@ - diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index 8050ee9f1..1a3179ee2 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -30,7 +30,7 @@ - + - + @@ -97,16 +98,6 @@ - - - - - - - - - - @@ -124,35 +115,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -