2009-10-07 Atsushi Enomoto <atsushi@ximian.com>

	* WebScriptServiceHostFactory.cs : I have to again revert the
	  previous change; it does fill endpoints regardless of hosting
	  environment (now with tests).

	* WebScriptEnablingBehavior.cs : validate body style.
	* WebHttpBehavior.cs : operations could miss WebGet/WebInvoke and
	  we should not crash by NRE because of missing of those atts.

	* WebScriptServiceHostFactoryTest.cs : add tests for contract and
	  wrapped validity.


svn path=/trunk/mcs/; revision=143637

1 files changed, 9 insertions, 0 deletions

diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Activation/WebScriptServiceHostFactory.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Activation/WebScriptServiceHostFactory.cs
index a13b703c628..e517ee95d9d 100644
--- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Activation/WebScriptServiceHostFactory.cs
+++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Activation/WebScriptServiceHostFactory.cs
@@ -55,6 +55,7 @@ namespace System.ServiceModel.Activation
 					throw new ArgumentNullException ("serviceType");
 			}
 
+#if false
 			protected override void ApplyConfiguration ()
 			{
 				base.ApplyConfiguration ();
@@ -68,9 +69,17 @@ namespace System.ServiceModel.Activation
 							AddServiceEndpoint (iface, new WebHttpBinding (), new Uri (String.Empty, UriKind.Relative));
 				}
 			}
+#endif
 
 			protected override void OnOpening ()
 			{
+				if (Description.Endpoints.Count == 0) {
+					if (ImplementedContracts.Count > 1)
+						throw new InvalidOperationException ("WebScriptServiceHostFactory does not allow more than one service contract in the service type");
+					foreach (var pair in ImplementedContracts) // actually one
+						AddServiceEndpoint (pair.Key, new WebHttpBinding (), new Uri (String.Empty, UriKind.Relative));
+				}
+
 				foreach (ServiceEndpoint se in Description.Endpoints)
 					if (se.Behaviors.Find<WebHttpBehavior> () == null)
 						se.Behaviors.Add (new WebScriptEnablingBehavior ());