Author: atsushi
Date: 2008-02-16 09:10:21 -0500 (Sat, 16 Feb 2008)
New Revision: 95871

Added:
   
trunk/olive/class/System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactoryBase.cs
Modified:
   
trunk/olive/class/System.ServiceModel/System.ServiceModel.Activation/ChangeLog
   
trunk/olive/class/System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactory.cs
   trunk/olive/class/System.ServiceModel/System.ServiceModel.dll.sources
Log:
2008-02-16  Atsushi Enomoto  <[EMAIL PROTECTED]>

        * ServiceHostFactoryBase.cs, ServiceHostFactory.cs :
          updated inheritance. new file.
        * IServiceHostFactory.cs : removed old code.



Modified: 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Activation/ChangeLog
===================================================================
--- 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Activation/ChangeLog  
    2008-02-16 13:57:04 UTC (rev 95870)
+++ 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Activation/ChangeLog  
    2008-02-16 14:10:21 UTC (rev 95871)
@@ -1,3 +1,9 @@
+2008-02-16  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
+       * ServiceHostFactoryBase.cs, ServiceHostFactory.cs :
+         updated inheritance. new file.
+       * IServiceHostFactory.cs : removed old code.
+
 2006-05-29  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * AspNetIntegrationRequirementsAttribute.cs,

Modified: 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactory.cs
===================================================================
--- 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactory.cs
  2008-02-16 13:57:04 UTC (rev 95870)
+++ 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactory.cs
  2008-02-16 14:10:21 UTC (rev 95871)
@@ -30,20 +30,20 @@
 
 namespace System.ServiceModel.Activation
 {
-       public class ServiceHostFactory : IServiceHostFactory
+       public class ServiceHostFactory : ServiceHostFactoryBase
        {
-               [MonoTODO ("untested")]
-               protected virtual ServiceHost CreateServiceHost (
-                       Type type, Uri [] baseAddresses)
+               [MonoTODO]
+               public override ServiceHostBase CreateServiceHost (
+                       string constructorString, Uri [] baseAddresses)
                {
-                       return new ServiceHost (type, baseAddresses);
+                       throw new NotImplementedException ();
                }
 
-               [MonoTODO ("what does constructorString mean?")]
-               ServiceHostBase IServiceHostFactory.CreateServiceHost (
-                       string constructorString, Uri [] baseAddresses)
+               [MonoTODO ("untested")]
+               protected virtual ServiceHost CreateServiceHost (
+                       Type serviceType, Uri [] baseAddresses)
                {
-                       throw new NotImplementedException ();
+                       return new ServiceHost (serviceType, baseAddresses);
                }
        }
 }

Added: 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactoryBase.cs
===================================================================
--- 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactoryBase.cs
      2008-02-16 13:57:04 UTC (rev 95870)
+++ 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactoryBase.cs
      2008-02-16 14:10:21 UTC (rev 95871)
@@ -0,0 +1,38 @@
+//
+// ServiceHostFactoryBase.cs
+//
+// Author:
+//     Atsushi Enomoto <[EMAIL PROTECTED]>
+//
+// Copyright (C) 2008 Novell, Inc.  http://www.novell.com
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System;
+using System.ServiceModel;
+
+namespace System.ServiceModel.Activation
+{
+       public abstract class ServiceHostFactoryBase
+       {
+               public abstract ServiceHostBase CreateServiceHost (
+                       string constructorString, Uri [] baseAddresses);
+       }
+}


Property changes on: 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactoryBase.cs
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/olive/class/System.ServiceModel/System.ServiceModel.dll.sources
===================================================================
--- trunk/olive/class/System.ServiceModel/System.ServiceModel.dll.sources       
2008-02-16 13:57:04 UTC (rev 95870)
+++ trunk/olive/class/System.ServiceModel/System.ServiceModel.dll.sources       
2008-02-16 14:10:21 UTC (rev 95871)
@@ -128,8 +128,8 @@
 System.Collections.Generic/SynchronizedKeyedCollection.cs
 System.Collections.Generic/SynchronizedReadOnlyCollection.cs
 System.ServiceModel.Activation/AspNetIntegrationRequirementsAttribute.cs
-System.ServiceModel.Activation/IServiceHostFactory.cs
 System.ServiceModel.Activation/ServiceHostFactory.cs
+System.ServiceModel.Activation/ServiceHostFactoryBase.cs
 System.ServiceModel.Channels/AddressHeader.cs
 System.ServiceModel.Channels/AddressHeaderCollection.cs
 System.ServiceModel.Channels/AddressingVersion.cs

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to