Permalink
Browse files

Deleted MVC 3 test app and added MVC 4 test app.

  • Loading branch information...
1 parent 3cd3940 commit f9b1f15ab023a76f1ae28eb2ae40074de7831bae @elishnevsky committed Oct 27, 2012
Showing with 460 additions and 234 deletions.
  1. +0 −6 Ext.Direct.Mvc3.sln
  2. +33 −0 Ext.Direct.Mvc4.sln
  3. +1 −1 packages/repositories.config
  4. +0 −5 src/Ext.Direct.Mvc/Ext.Direct.Mvc3.csproj
  5. +98 −0 src/Ext.Direct.Mvc/Ext.Direct.Mvc4.csproj
  6. +1 −1 src/Ext.Direct.Mvc/Properties/AssemblyInfo.cs
  7. +0 −19 test/Ext.Direct.Mvc3Test/Controllers/BasicController.cs
  8. +0 −16 test/Ext.Direct.Mvc3Test/Controllers/HomeController.cs
  9. +0 −30 test/Ext.Direct.Mvc3Test/Global.asax.cs
  10. +0 −19 test/Ext.Direct.Mvc3Test/Properties/AssemblyInfo.cs
  11. +0 −31 test/Ext.Direct.Mvc3Test/Views/Home/Index.cshtml
  12. +0 −48 test/Ext.Direct.Mvc3Test/Web.config
  13. +0 −4 test/Ext.Direct.Mvc3Test/packages.config
  14. +10 −0 test/Ext.Direct.Mvc4Test/App_Start/FilterConfig.cs
  15. +20 −0 test/Ext.Direct.Mvc4Test/App_Start/RouteConfig.cs
  16. +16 −0 test/Ext.Direct.Mvc4Test/App_Start/WebApiConfig.cs
  17. +20 −0 test/Ext.Direct.Mvc4Test/Controllers/HomeController.cs
  18. +16 −0 test/Ext.Direct.Mvc4Test/Controllers/TestController.cs
  19. +81 −37 ...{Ext.Direct.Mvc3Test/Ext.Direct.Mvc3Test.csproj → Ext.Direct.Mvc4Test/Ext.Direct.Mvc4Test.csproj}
  20. +1 −1 test/{Ext.Direct.Mvc3Test → Ext.Direct.Mvc4Test}/Global.asax
  21. +21 −0 test/Ext.Direct.Mvc4Test/Global.asax.cs
  22. +35 −0 test/Ext.Direct.Mvc4Test/Properties/AssemblyInfo.cs
  23. +20 −0 test/Ext.Direct.Mvc4Test/Views/Home/Index.cshtml
  24. +8 −8 test/{Ext.Direct.Mvc3Test → Ext.Direct.Mvc4Test}/Views/Web.config
  25. +4 −4 test/{Ext.Direct.Mvc3Test → Ext.Direct.Mvc4Test}/Web.Debug.config
  26. +4 −4 test/{Ext.Direct.Mvc3Test → Ext.Direct.Mvc4Test}/Web.Release.config
  27. +39 −0 test/Ext.Direct.Mvc4Test/Web.config
  28. +19 −0 test/Ext.Direct.Mvc4Test/app/app.js
  29. +13 −0 test/Ext.Direct.Mvc4Test/packages.config
View
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ext.Direct.Mvc3", "src\Ext.Direct.Mvc\Ext.Direct.Mvc3.csproj", "{A521832A-D1FB-468F-BA7C-1FAE0F7F45EA}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ext.Direct.Mvc3Test", "test\Ext.Direct.Mvc3Test\Ext.Direct.Mvc3Test.csproj", "{D689FA7E-74DC-477B-A69F-EA6FF4C7739B}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{64FA027D-43BA-4FF9-B83C-C6B39B7B73D5}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.Config = .nuget\NuGet.Config
@@ -22,10 +20,6 @@ Global
{A521832A-D1FB-468F-BA7C-1FAE0F7F45EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A521832A-D1FB-468F-BA7C-1FAE0F7F45EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A521832A-D1FB-468F-BA7C-1FAE0F7F45EA}.Release|Any CPU.Build.0 = Release|Any CPU
- {D689FA7E-74DC-477B-A69F-EA6FF4C7739B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D689FA7E-74DC-477B-A69F-EA6FF4C7739B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D689FA7E-74DC-477B-A69F-EA6FF4C7739B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D689FA7E-74DC-477B-A69F-EA6FF4C7739B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
@@ -0,0 +1,33 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ext.Direct.Mvc4", "src\Ext.Direct.Mvc\Ext.Direct.Mvc4.csproj", "{A521832A-D1FB-468F-BA7C-1FAE0F7F45EA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{64FA027D-43BA-4FF9-B83C-C6B39B7B73D5}"
+ ProjectSection(SolutionItems) = preProject
+ .nuget\NuGet.Config = .nuget\NuGet.Config
+ .nuget\NuGet.exe = .nuget\NuGet.exe
+ .nuget\NuGet.targets = .nuget\NuGet.targets
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ext.Direct.Mvc4Test", "test\Ext.Direct.Mvc4Test\Ext.Direct.Mvc4Test.csproj", "{323DA49A-6F49-4478-8AF2-8C0F421C54F8}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {A521832A-D1FB-468F-BA7C-1FAE0F7F45EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A521832A-D1FB-468F-BA7C-1FAE0F7F45EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A521832A-D1FB-468F-BA7C-1FAE0F7F45EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A521832A-D1FB-468F-BA7C-1FAE0F7F45EA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {323DA49A-6F49-4478-8AF2-8C0F421C54F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {323DA49A-6F49-4478-8AF2-8C0F421C54F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {323DA49A-6F49-4478-8AF2-8C0F421C54F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {323DA49A-6F49-4478-8AF2-8C0F421C54F8}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<repositories>
<repository path="..\src\Ext.Direct.Mvc\packages.config" />
- <repository path="..\test\Ext.Direct.Mvc3Test\packages.config" />
+ <repository path="..\test\Ext.Direct.Mvc4Test\packages.config" />
</repositories>
@@ -48,11 +48,6 @@
<Reference Include="System.Web" />
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Routing" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Attributes\DirectEventAttribute.cs" />
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{A521832A-D1FB-468F-BA7C-1FAE0F7F45EA}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Ext.Direct.Mvc</RootNamespace>
+ <AssemblyName>Ext.Direct.Mvc</AssemblyName>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile />
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\Mvc4\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
+ </PropertyGroup>
+ <PropertyGroup>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup>
+ <AssemblyOriginatorKeyFile>Ext.Direct.Mvc.snk</AssemblyOriginatorKeyFile>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.10\lib\net40\Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.configuration" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Web" />
+ <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Attributes\DirectEventAttribute.cs" />
+ <Compile Include="Attributes\DirectHandleErrorAttribute.cs" />
+ <Compile Include="Attributes\DirectIgnoreAttribute.cs" />
+ <Compile Include="Attributes\FormHandlerAttribute.cs" />
+ <Compile Include="Attributes\NamedArgumentsAttributes.cs" />
+ <Compile Include="DirectAction.cs" />
+ <Compile Include="DirectApiController.cs" />
+ <Compile Include="DirectController.cs" />
+ <Compile Include="DirectDataResponse.cs" />
+ <Compile Include="DirectErrorResponse.cs" />
+ <Compile Include="DirectEventResponse.cs" />
+ <Compile Include="DirectException.cs" />
+ <Compile Include="DirectMethod.cs" />
+ <Compile Include="DirectMethodInvoker.cs" />
+ <Compile Include="DirectProvider.cs" />
+ <Compile Include="DirectRequest.cs" />
+ <Compile Include="DirectResponse.cs" />
+ <Compile Include="DirectResult.cs" />
+ <Compile Include="DirectRouterController.cs" />
+ <Compile Include="DirectValueProvider.cs" />
+ <Compile Include="Extensions\JsonExtensions.cs" />
+ <Compile Include="Extensions\MethodExtensions.cs" />
+ <Compile Include="Extensions\TypeExtensions.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="ProviderConfiguration.cs" />
+ <Compile Include="RequestDataConverter.cs" />
+ <Compile Include="Resources\DirectResources.Designer.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\DirectResources.resx" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Ext.Direct.Mvc.snk" />
+ <None Include="packages.config" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
@@ -20,7 +20,7 @@
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("27285a57-6192-44cd-aeaa-cd6ebba7b5ef")]
+[assembly: Guid("53b3707a-db12-4df0-89c5-9bb73e75a7d9")]
// Version information for an assembly consists of the following four values:
//
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using Ext.Direct.Mvc;
-
-namespace Ext.Direct.Mvc3Test.Controllers {
-
- public class BasicController : DirectController {
-
- public ActionResult Echo(string text, DateTime date) {
- return Json(new {
- text,
- date
- });
- }
- }
-}
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-
-namespace Ext.Direct.Mvc3Test.Controllers {
-
- public class HomeController : Controller {
-
- // GET: /Index/
- public ActionResult Index() {
- return View();
- }
- }
-}
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
-
-namespace Ext.Direct.Mvc3Test {
- // Note: For instructions on enabling IIS6 or IIS7 classic mode,
- // visit http://go.microsoft.com/?LinkId=9394801
-
- public class MvcApplication : System.Web.HttpApplication {
- public static void RegisterRoutes(RouteCollection routes) {
- routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
-
- routes.MapRoute(
- "Default", // Route name
- "{controller}/{action}/{id}", // URL with parameters
- new { controller = "Home", action = "Index", id = UrlParameter.Optional } // Parameter defaults
- );
-
- }
-
- protected void Application_Start() {
- AreaRegistration.RegisterAllAreas();
-
- RegisterRoutes(RouteTable.Routes);
- }
- }
-}
@@ -1,19 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Ext.Direct.Mvc3Test")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Ext.Direct.Mvc3Test")]
-[assembly: AssemblyCopyright("Copyright © 2012")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("20e8af73-00de-4998-b20f-3d0402c2dc74")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Ext.Direct.Mvc Test Page</title>
- <link href="http://cdn.sencha.io/ext-3.4.0/resources/css/ext-all.css" rel="stylesheet" type="text/css" />
- <script type="text/javascript" src="http://cdn.sencha.io/ext-3.4.0/adapter/ext/ext-base.js"></script>
- <script type="text/javascript" src="http://cdn.sencha.io/ext-3.4.0/ext-all.js"></script>
- <script type="text/javascript" src="@Url.Content("~/directapi")"></script>
- <script type="text/javascript">
- Ext.onReady(function () {
- Ext.BLANK_IMAGE_URL = 'http://cdn.sencha.io/ext-3.4.0/resources/images/default/s.gif';
- Ext.Direct.addProvider(Ext.app.REMOTING_API);
- Ext.QuickTips.init();
-
- Ext.fly('testButton').on('click', function () {
- Basic.Echo("lorem ipsum dolor sit amet", new Date(), function (result, event) {
- if (event.status == true) {
- var date = Date.parseDate(result.date, 'c').format('l, F d, Y g:i:s A');
- console.log(result.text, date);
- }
- });
- });
- });
- </script>
-</head>
-<body>
- <div style="margin:20px">
- <input type="button" value="Test Button" id="testButton"/>
- </div>
-</body>
-</html>
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
- For more information on how to configure your ASP.NET application, please visit
- http://go.microsoft.com/fwlink/?LinkId=152368
- -->
-<configuration>
- <appSettings>
- <add key="webpages:Version" value="1.0.0.0"/>
- <add key="ClientValidationEnabled" value="true"/>
- <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
- </appSettings>
- <system.web>
- <compilation debug="true" targetFramework="4.0">
- <assemblies>
- <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
- <add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
- <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
- <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
- <add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
- </assemblies>
- </compilation>
- <authentication mode="Forms">
- <forms loginUrl="~/Account/LogOn" timeout="2880"/>
- </authentication>
- <pages controlRenderingCompatibilityVersion="4.0">
- <namespaces>
- <add namespace="System.Web.Helpers"/>
- <add namespace="System.Web.Mvc"/>
- <add namespace="System.Web.Mvc.Ajax"/>
- <add namespace="System.Web.Mvc.Html"/>
- <add namespace="System.Web.Routing"/>
- <add namespace="System.Web.WebPages"/>
- </namespaces>
- </pages>
- </system.web>
- <system.webServer>
- <validation validateIntegratedModeConfiguration="false"/>
- <modules runAllManagedModulesForAllRequests="true"/>
- </system.webServer>
- <runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
- <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0"/>
- </dependentAssembly>
- </assemblyBinding>
- </runtime>
-</configuration>
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Newtonsoft.Json" version="4.5.10" targetFramework="net40" />
-</packages>
@@ -0,0 +1,10 @@
+using System.Web;
+using System.Web.Mvc;
+
+namespace Ext.Direct.Mvc4Test {
+ public class FilterConfig {
+ public static void RegisterGlobalFilters(GlobalFilterCollection filters) {
+ filters.Add(new HandleErrorAttribute());
+ }
+ }
+}
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Routing;
+
+namespace Ext.Direct.Mvc4Test {
+ public class RouteConfig {
+ public static void RegisterRoutes(RouteCollection routes) {
+ routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
+
+ routes.MapRoute(
+ name: "Default",
+ url: "{controller}/{action}/{id}",
+ defaults: new { controller = "Home", action = "Index", id = UrlParameter.Optional }
+ );
+ }
+ }
+}
Oops, something went wrong.

0 comments on commit f9b1f15

Please sign in to comment.