Merge branch 'master' of github.com:ServiceStack/ServiceStack

ServiceStack · Oct 3, 2012 · f50de44 · f50de44
2 parents 419dfca + 85352db
commit f50de44
Show file tree

Hide file tree

Showing 5 changed files with 459 additions and 395 deletions.
diff --git a/NuGet/ServiceStack.Plugins.MsgPack/servicestack.plugins.msgpack.nuspec b/NuGet/ServiceStack.Plugins.MsgPack/servicestack.plugins.msgpack.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>ServiceStack.Plugins.MsgPack</id> 
+    <title>Message Pack support for ServiceStack. Includes typed MsgPack Client</title>
+    <version>3.9.20</version> 
+    <authors>Demis Bellot</authors> 
+    <owners>Demis Bellot</owners>
+    <summary>MsgPack Format Serializer ContentType ServiceClients for ServiceStack</summary>
+    <description>
+        Add the MsgPack binary format and endpoint to a ServiceStack web service host.
+    </description> 
+    <projectUrl>https://github.com/ServiceStack/ServiceStack</projectUrl>
+    <licenseUrl>https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE</licenseUrl>
+    <iconUrl>http://www.servicestack.net/logo-100x100.png</iconUrl>
+    <tags>MsgPack MessagePack Message Pack Fast Binary Serializer Format ContentType ServiceStack REST Web Services</tags>
+    <language>en-US</language>
+    <copyright>servicestack.net 2012 and contributors</copyright>
+    <dependencies>
+        <dependency id="ServiceStack.Common" />
+    </dependencies> 
+  </metadata> 
+</package>
diff --git a/NuGet/ServiceStack.Razor/servicestack.razor.nuspec b/NuGet/ServiceStack.Razor/servicestack.razor.nuspec
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>ServiceStack.Razor</id>
+    <title>ServiceStack.Razor - ServiceStack's HTML story including MVC Razor</title>
+    <version>3.9.21</version> 
+	<authors>Demis Bellot</authors> 
+    <owners>Demis Bellot</owners>
+    <summary>Provides ServiceStack's HTML Story including integrated support for MVC Razor's ViewEngine</summary>
+    <description>
+        ServiceStack Razor Documentation: http://razor.servicestack.net
+
+        - Turns ServiceStack into a Complete Web + REST Services Stack. Replaces need for ASP.NET MVC. 
+        - Runs In ASP.NET or Self-host, first-class cross-platform support on .NET / Mono runtimes.
+        - Add HTML views to existing services.
+        - Change Views and Layout templates at runtime.
+        - No Ceremony development options - Pages without controllers, with typed and dynamic View Models.
+        - Include Partial Markdown views in Razor pages.
+        - Cascading Layout templates.
+        - Pretty urls by default (no custom Routes needed).
+        - Keep all views and assets together.
+        - Smart View Pages.
+    </description> 
+    <projectUrl>http://razor.servicestack.net</projectUrl>
+    <licenseUrl>https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE</licenseUrl>
+    <iconUrl>http://www.servicestack.net/logo-100x100.png</iconUrl>
+    <tags>ServiceStack Razor ViewEngine View Templates Controllers Mono ASP.NET Self-Host</tags>
+    <language>en-US</language> 
+    <copyright>servicestack.net 2012 and contributors</copyright>
+    <dependencies>
+      <dependency id="ServiceStack" />
+    </dependencies> 
+  </metadata> 
+</package>
diff --git a/src/ServiceStack.Interfaces/ServiceHost/IServiceController.cs b/src/ServiceStack.Interfaces/ServiceHost/IServiceController.cs
@@ -1,45 +1,50 @@
-using System;
-using System.Collections.Generic;
-
-namespace ServiceStack.ServiceHost
-{
-	/// <summary>
-	/// Responsible for executing the operation within the specified context.
-	/// </summary>
-	/// <value>The operation types.</value>
-	public interface IServiceController
-	{
-		/// <summary>
-		/// Returns a list of operation types available in this service
-		/// </summary>
-		/// <value>The operation types.</value>
-		IList<Type> OperationTypes { get; }
-
-		/// <summary>
-		/// Returns a list of ALL operation types available in this service
-		/// </summary>
-		/// <value>The operation types.</value>
-		IList<Type> AllOperationTypes { get; }
-
-		/// <summary>
-		/// Returns the first matching RestPath
-		/// </summary>
-		/// <param name="httpMethod"></param>
-		/// <param name="pathInfo"></param>
-		/// <returns></returns>
-		IRestPath GetRestPathForRequest(string httpMethod, string pathInfo);
-
-		/// <summary>
-		/// Allow the registration of custom routes
-		/// </summary>
-		IServiceRoutes Routes { get; }
-
-		/// <summary>
-		/// Executes the DTO request under the supplied requestContext.
-		/// </summary>
-		/// <param name="request"></param>
-		/// <param name="requestContext"></param>
-		/// <returns></returns>
-		object Execute(object request, IRequestContext requestContext);
-	}
+using System;
+using System.Collections.Generic;
+
+namespace ServiceStack.ServiceHost
+{
+	/// <summary>
+	/// Responsible for executing the operation within the specified context.
+	/// </summary>
+	/// <value>The operation types.</value>
+	public interface IServiceController
+	{
+		/// <summary>
+		/// Returns a list of operation types available in this service
+		/// </summary>
+		/// <value>The operation types.</value>
+		IList<Type> OperationTypes { get; }
+
+		/// <summary>
+		/// Returns a list of ALL operation types available in this service
+		/// </summary>
+		/// <value>The operation types.</value>
+		IList<Type> AllOperationTypes { get; }
+
+		/// <summary>
+		/// Returns the first matching RestPath
+		/// </summary>
+		/// <param name="httpMethod"></param>
+		/// <param name="pathInfo"></param>
+		/// <returns></returns>
+		IRestPath GetRestPathForRequest(string httpMethod, string pathInfo);
+
+		/// <summary>
+		/// Allow the registration of custom routes
+		/// </summary>
+		IServiceRoutes Routes { get; }
+
+        /// <summary>
+        /// Executes the DTO request with no requestContext.
+        /// </summary>
+        object Execute(object dto);
+
+		/// <summary>
+		/// Executes the DTO request under the supplied requestContext.
+		/// </summary>
+		/// <param name="request"></param>
+		/// <param name="requestContext"></param>
+		/// <returns></returns>
+		object Execute(object request, IRequestContext requestContext);
+	}
 }