fix merge bug in Northwind

mythz · mythz · commit 6b40ddf336d2 · 2011-11-01T02:28:22.000-04:00
diff --git a/src/ServiceStack.Northwind/ServiceStack.Northwind.ServiceModel/Operations/Orders.cs b/src/ServiceStack.Northwind/ServiceStack.Northwind.ServiceModel/Operations/Orders.cs
@@ -1,70 +1,31 @@
 using System.Collections.Generic;
 using ServiceStack.Northwind.ServiceModel.Types;
+using ServiceStack.ServiceHost;
 using ServiceStack.ServiceInterface.ServiceModel;
 
-public class Customers {}
-public class CustomerResponse : IHasResponseStatus
+namespace ServiceStack.Northwind.ServiceModel.Operations
 {
-	public CustomerResponse()
+	[RestService("/orders")]
+	[RestService("/orders/page/{Page}")]
+	[RestService("/customers/{CustomerId}/orders")]
+	public class Orders
 	{
-		this.ResponseStatus = new ResponseStatus();
+		public int? Page { get; set; }
+
+		public string CustomerId { get; set; }
 	}
-	
-	public Customer Customer { get; set; }
-	
-	public ResponseStatus ResponseStatus { get; set; }
-}
-public class CustomersResponse : IHasResponseStatus
-{
-	public CustomersResponse()
+
+	public class OrdersResponse : IHasResponseStatus
 	{
-		this.ResponseStatus = new ResponseStatus();
-		this.Customers = new List<Customer>();
-	}
-	
-	public List<Customer> Customers { get; set; }
-	
-	public ResponseStatus ResponseStatus { get; set; }
-}
-public class CustomerDetails
-{
-	
-	public string Id { get; set; }
-}
+		public OrdersResponse()
+		{
+			this.ResponseStatus = new ResponseStatus();
+			this.Results = new List<CustomerOrder>();
+		}
 
+		public List<CustomerOrder> Results { get; set; }
 
-public class CustomerDetailsResponse : IHasResponseStatus
-{
-	public CustomerDetailsResponse()
-	{
-		this.ResponseStatus = new ResponseStatus();
-		this.CustomerOrders = new List<CustomerOrder>();
+		public ResponseStatus ResponseStatus { get; set; }
 	}
-	
-	public Customer Customer { get; set; }
-	
-	public List<CustomerOrder> CustomerOrders { get; set; }
-	
-	public ResponseStatus ResponseStatus { get; set; }
-}
-public class Orders
-{
-	
-	public int? Page { get; set; }
-	
-	public string CustomerId { get; set; }
-}
-public class OrdersResponse : IHasResponseStatus
-{
-	public OrdersResponse()
-	{
-		this.ResponseStatus = new ResponseStatus();
-		this.Results = new List<CustomerOrder>();
-	}
-	
-	public List<CustomerOrder> Results { get; set; }
-	
-	public ResponseStatus ResponseStatus { get; set; }
-}
-
 
+}
diff --git a/src/ServiceStack.Northwind/ServiceStack.Northwind/Web.config b/src/ServiceStack.Northwind/ServiceStack.Northwind/Web.config
@@ -35,16 +35,16 @@
 		<!--
             The <authentication> section enables configuration 
             of the security authentication mode used by 
-            ASP.NET to identify an incoming user. 
+            ASP.NET to identify an incoming user.    
         -->
 		<authentication mode="Windows"/>
 		<!--
             The <customErrors> section enables configuration 
             of what to do if/when an unhandled error occurs 
             during the execution of a request. Specifically, 
-            it enables developers to configure html error pages 
+            it enables developers to configure html error pages  
             to be displayed in place of a error stack trace.
-
+ 
         <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
             <error statusCode="403" redirect="NoAccess.htm" />
             <error statusCode="404" redirect="FileNotFound.htm" />
