Author: toshok
Date: 2005-12-13 20:11:03 -0500 (Tue, 13 Dec 2005)
New Revision: 54335

Added:
   trunk/mcs/class/System/System.Net.Configuration/FtpCachePolicyElement.cs
Modified:
   
trunk/mcs/class/System/System.Net.Configuration/AuthenticationModuleElement.cs
   
trunk/mcs/class/System/System.Net.Configuration/AuthenticationModuleElementCollection.cs
   
trunk/mcs/class/System/System.Net.Configuration/AuthenticationModulesSection.cs
   trunk/mcs/class/System/System.Net.Configuration/BypassElement.cs
   trunk/mcs/class/System/System.Net.Configuration/BypassElementCollection.cs
   trunk/mcs/class/System/System.Net.Configuration/ChangeLog
   
trunk/mcs/class/System/System.Net.Configuration/ConnectionManagementElement.cs
   
trunk/mcs/class/System/System.Net.Configuration/ConnectionManagementElementCollection.cs
   
trunk/mcs/class/System/System.Net.Configuration/ConnectionManagementSection.cs
   trunk/mcs/class/System/System.Net.Configuration/DefaultProxySection.cs
   trunk/mcs/class/System/System.Net.Configuration/HttpCachePolicyElement.cs
   trunk/mcs/class/System/System.Net.Configuration/HttpWebRequestElement.cs
   trunk/mcs/class/System/System.Net.Configuration/Ipv6Element.cs
   trunk/mcs/class/System/System.Net.Configuration/ModuleElement.cs
   trunk/mcs/class/System/System.Net.Configuration/NetSectionGroup.cs
   trunk/mcs/class/System/System.Net.Configuration/ProxyElement.cs
   trunk/mcs/class/System/System.Net.Configuration/RequestCachingSection.cs
Log:
2005-12-13  Chris Toshok  <[EMAIL PROTECTED]>

        * AuthenticationModuleElementCollection.cs,
        AuthenticationModuleElement.cs, AuthenticationModulesSection.cs,
        BypassElementCollection.cs, BypassElement.cs,
        ConnectionManagementElementCollection.cs,
        ConnectionManagementElement.cs, ConnectionManagementSection.cs,
        DefaultProxySection.cs, FtpCachePolicyElement.cs,
        HttpCachePolicyElement.cs, HttpWebRequestElement.cs,
        Ipv6Element.cs, ModuleElement.cs, NetSectionGroup.cs,
        ProxyElement.cs, RequestCachingSection.cs: 2.0 config cleanup work.



Modified: 
trunk/mcs/class/System/System.Net.Configuration/AuthenticationModuleElement.cs
===================================================================
--- 
trunk/mcs/class/System/System.Net.Configuration/AuthenticationModuleElement.cs  
    2005-12-14 01:02:24 UTC (rev 54334)
+++ 
trunk/mcs/class/System/System.Net.Configuration/AuthenticationModuleElement.cs  
    2005-12-14 01:11:03 UTC (rev 54335)
@@ -3,9 +3,10 @@
 //
 // Authors:
 //     Tim Coleman ([EMAIL PROTECTED])
+//     Chris Toshok ([EMAIL PROTECTED])
 //
 // Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004,2005 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -39,21 +40,26 @@
        {
                #region Fields
 
-               ConfigurationPropertyCollection properties;
-               static ConfigurationProperty type = new ConfigurationProperty 
("Type", typeof (string), null);
+               static ConfigurationPropertyCollection properties;
+               static ConfigurationProperty typeProp;
 
                #endregion // Fields
 
                #region Constructors
 
-               public AuthenticationModuleElement ()
+               static AuthenticationModuleElement ()
                {
+                       typeProp = new ConfigurationProperty ("type", typeof 
(string), null, ConfigurationPropertyOptions.IsRequired | 
ConfigurationPropertyOptions.IsKey);
                        properties = new ConfigurationPropertyCollection ();
-                       properties.Add (type);
+
+                       properties.Add (typeProp);
                }
 
+               public AuthenticationModuleElement ()
+               {
+               }
+
                public AuthenticationModuleElement (string typeName)
-                       : this ()
                {
                        Type = typeName;
                }
@@ -66,9 +72,10 @@
                        get { return properties; }
                }
 
+               [ConfigurationProperty ("type", Options = 
ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey)]
                public string Type {
-                       get { return (string) base [type]; }
-                       set { base [type] = value; }
+                       get { return (string) base [typeProp]; }
+                       set { base [typeProp] = value; }
                }
 
                #endregion // Properties

Modified: 
trunk/mcs/class/System/System.Net.Configuration/AuthenticationModuleElementCollection.cs
===================================================================
--- 
trunk/mcs/class/System/System.Net.Configuration/AuthenticationModuleElementCollection.cs
    2005-12-14 01:02:24 UTC (rev 54334)
+++ 
trunk/mcs/class/System/System.Net.Configuration/AuthenticationModuleElementCollection.cs
    2005-12-14 01:11:03 UTC (rev 54335)
@@ -3,9 +3,10 @@
 //
 // Authors:
 //     Tim Coleman ([EMAIL PROTECTED])
+//     Chris Toshok ([EMAIL PROTECTED])
 //
 // Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004,2005 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -35,6 +36,7 @@
 
 namespace System.Net.Configuration 
 {
+       [ConfigurationCollection (typeof (AuthenticationModuleElement), 
CollectionType = ConfigurationElementCollectionType.AddRemoveClearMap)]
        public sealed class AuthenticationModuleElementCollection : 
ConfigurationElementCollection
        {
                #region Constructors
@@ -64,30 +66,28 @@
 
                #region Methods
 
-               [MonoTODO]
                public void Add (AuthenticationModuleElement element)
                {
                        BaseAdd (element);
                }
 
-               [MonoTODO]
                public void Clear ()
                {
                        BaseClear ();
                }
 
-               [MonoTODO]
                protected override ConfigurationElement CreateNewElement ()
                {
                        return new AuthenticationModuleElement ();
                }
 
-               [MonoTODO]
+               [MonoTODO ("argument exception?")]
                protected override object GetElementKey (ConfigurationElement 
element)
                {
                        if (!(element is AuthenticationModuleElement))
                                throw new ArgumentException ("element");
-                       throw new NotImplementedException ();
+
+                       return ((AuthenticationModuleElement)element).Type;
                }
 
                public int IndexOf (AuthenticationModuleElement element)

Modified: 
trunk/mcs/class/System/System.Net.Configuration/AuthenticationModulesSection.cs
===================================================================
--- 
trunk/mcs/class/System/System.Net.Configuration/AuthenticationModulesSection.cs 
    2005-12-14 01:02:24 UTC (rev 54334)
+++ 
trunk/mcs/class/System/System.Net.Configuration/AuthenticationModulesSection.cs 
    2005-12-14 01:11:03 UTC (rev 54335)
@@ -3,9 +3,10 @@
 //
 // Authors:
 //     Tim Coleman ([EMAIL PROTECTED])
+//     Chris Toshok ([EMAIL PROTECTED])
 //
 // Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004,2005 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -39,19 +40,26 @@
        {
                #region Fields
 
-               ConfigurationPropertyCollection properties;
-               static ConfigurationProperty authenticationModules = new 
ConfigurationProperty ("AuthenticationModules", typeof 
(AuthenticationModuleElementCollection), new 
AuthenticationModuleElementCollection ());
+               static ConfigurationPropertyCollection properties;
+               static ConfigurationProperty authenticationModulesProp;
 
                #endregion // Fields
 
                #region Constructors
 
-               public AuthenticationModulesSection ()
+               static AuthenticationModulesSection ()
                {
+                       authenticationModulesProp = new ConfigurationProperty 
("", typeof (AuthenticationModuleElementCollection),
+                                                                              
null, ConfigurationPropertyOptions.IsDefaultCollection);
+                                                                              
                        properties = new ConfigurationPropertyCollection ();
-                       properties.Add (authenticationModules);
+                       properties.Add (authenticationModulesProp);
                }
 
+               public AuthenticationModulesSection ()
+               {
+               }
+
                #endregion // Constructors
 
                #region Properties
@@ -60,8 +68,9 @@
                        get { return properties; }
                }
 
+               [ConfigurationProperty ("", Options = 
ConfigurationPropertyOptions.IsDefaultCollection)]
                public AuthenticationModuleElementCollection 
AuthenticationModules {
-                       get { return (AuthenticationModuleElementCollection) 
base [authenticationModules]; }
+                       get { return (AuthenticationModuleElementCollection) 
base [authenticationModulesProp]; }
                }
 
                #endregion // Properties

Modified: trunk/mcs/class/System/System.Net.Configuration/BypassElement.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Configuration/BypassElement.cs    
2005-12-14 01:02:24 UTC (rev 54334)
+++ trunk/mcs/class/System/System.Net.Configuration/BypassElement.cs    
2005-12-14 01:11:03 UTC (rev 54335)
@@ -3,9 +3,10 @@
 //
 // Authors:
 //     Tim Coleman ([EMAIL PROTECTED])
+//     Chris Toshok ([EMAIL PROTECTED])
 //
 // Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004,2005 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -39,21 +40,27 @@
        {
                #region Fields
 
-               ConfigurationPropertyCollection properties;
-               static ConfigurationProperty address = new 
ConfigurationProperty ("Address", typeof (string), null);
+               static ConfigurationPropertyCollection properties;
+               static ConfigurationProperty addressProp;
 
                #endregion // Fields
 
                #region Constructors
 
-               public BypassElement ()
+               static BypassElement ()
                {
+                       addressProp = new ConfigurationProperty ("Address", 
typeof (string),
+                                                                null, 
ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey);
+
                        properties = new ConfigurationPropertyCollection ();
-                       properties.Add (address);
+                       properties.Add (addressProp);
                }
 
+               public BypassElement ()
+               {
+               }
+
                public BypassElement (string address)
-                       : this ()
                {
                        Address = address;
                }
@@ -62,9 +69,10 @@
 
                #region Properties
 
+               [ConfigurationProperty ("address", Options = 
ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey)]
                public string Address {
-                       get { return (string) base [address]; }
-                       set { base [address] = value; }
+                       get { return (string) base [addressProp]; }
+                       set { base [addressProp] = value; }
                }
 
                protected override ConfigurationPropertyCollection Properties {

Modified: 
trunk/mcs/class/System/System.Net.Configuration/BypassElementCollection.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Configuration/BypassElementCollection.cs  
2005-12-14 01:02:24 UTC (rev 54334)
+++ trunk/mcs/class/System/System.Net.Configuration/BypassElementCollection.cs  
2005-12-14 01:11:03 UTC (rev 54335)
@@ -35,11 +35,11 @@
 
 namespace System.Net.Configuration 
 {
+       [ConfigurationCollection (typeof (BypassElement), CollectionType = 
ConfigurationElementCollectionType.AddRemoveClearMap)]
        public sealed class BypassElementCollection : 
ConfigurationElementCollection
        {
                #region Constructors
 
-               [MonoTODO]
                public BypassElementCollection ()
                {
                }
@@ -63,30 +63,28 @@
 
                #region Methods
 
-               [MonoTODO]
                public void Add (BypassElement element)
                {
                        BaseAdd (element);
                }
 
-               [MonoTODO]
                public void Clear ()
                {
                        BaseClear ();
                }
 
-               [MonoTODO]
                protected override ConfigurationElement CreateNewElement ()
                {
                        return new BypassElement ();
                }
 
-               [MonoTODO]
+               [MonoTODO ("argument exception?")]
                protected override object GetElementKey (ConfigurationElement 
element)
                {
                        if (!(element is BypassElement))
                                throw new ArgumentException ("element");
-                       throw new NotImplementedException ();
+
+                       return ((BypassElement)element).Address;
                }
 
                public int IndexOf (BypassElement element)

Modified: trunk/mcs/class/System/System.Net.Configuration/ChangeLog
===================================================================
--- trunk/mcs/class/System/System.Net.Configuration/ChangeLog   2005-12-14 
01:02:24 UTC (rev 54334)
+++ trunk/mcs/class/System/System.Net.Configuration/ChangeLog   2005-12-14 
01:11:03 UTC (rev 54335)
@@ -1,3 +1,15 @@
+2005-12-13  Chris Toshok  <[EMAIL PROTECTED]>
+
+       * AuthenticationModuleElementCollection.cs,
+       AuthenticationModuleElement.cs, AuthenticationModulesSection.cs,
+       BypassElementCollection.cs, BypassElement.cs,
+       ConnectionManagementElementCollection.cs,
+       ConnectionManagementElement.cs, ConnectionManagementSection.cs,
+       DefaultProxySection.cs, FtpCachePolicyElement.cs,
+       HttpCachePolicyElement.cs, HttpWebRequestElement.cs,
+       Ipv6Element.cs, ModuleElement.cs, NetSectionGroup.cs,
+       ProxyElement.cs, RequestCachingSection.cs: 2.0 config cleanup work.
+
 2005-11-09 Michael Hutchinson <[EMAIL PROTECTED]>
 
        * DefaultProxyHandler.cs: Read proxy address from environment, fall

Modified: 
trunk/mcs/class/System/System.Net.Configuration/ConnectionManagementElement.cs
===================================================================
--- 
trunk/mcs/class/System/System.Net.Configuration/ConnectionManagementElement.cs  
    2005-12-14 01:02:24 UTC (rev 54334)
+++ 
trunk/mcs/class/System/System.Net.Configuration/ConnectionManagementElement.cs  
    2005-12-14 01:11:03 UTC (rev 54335)
@@ -3,9 +3,10 @@
 //
 // Authors:
 //     Tim Coleman ([EMAIL PROTECTED])
+//     Chris Toshok ([EMAIL PROTECTED])
 //
 // Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004,2005 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -39,21 +40,31 @@
        {
                #region Fields
 
-               ConfigurationPropertyCollection properties;
-               static ConfigurationProperty address = new 
ConfigurationProperty ("Address", typeof (string), null);
-               static ConfigurationProperty maxConnection = new 
ConfigurationProperty ("MaxConnection", typeof (int), 1);
+               static ConfigurationPropertyCollection properties;
+               static ConfigurationProperty addressProp;
+               static ConfigurationProperty maxConnectionProp;
 
                #endregion // Fields
 
                #region Constructors
 
-               public ConnectionManagementElement ()
+               static ConnectionManagementElement ()
                {
+                       addressProp = new ConfigurationProperty ("address", 
typeof (string),
+                                                                null, 
ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey);
+                       maxConnectionProp = new ConfigurationProperty 
("maxconnection", typeof (int),
+                                                                      1, 
ConfigurationPropertyOptions.IsRequired);
                        properties = new ConfigurationPropertyCollection ();
+
+                       properties.Add (addressProp);
+                       properties.Add (maxConnectionProp);
                }
 
+               public ConnectionManagementElement ()
+               {
+               }
+
                public ConnectionManagementElement (string address, int 
maxConnection)
-                       : this ()
                {
                        Address = address;
                        MaxConnection = maxConnection;
@@ -63,14 +74,16 @@
 
                #region Properties
 
+               [ConfigurationProperty ("address", Options = 
ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey)]
                public string Address {
-                       get { return (string) base [address]; }
-                       set { base [address] = value; }
+                       get { return (string) base [addressProp]; }
+                       set { base [addressProp] = value; }
                }
 
+               [ConfigurationProperty ("maxconnection", DefaultValue = "1", 
Options = ConfigurationPropertyOptions.IsRequired)]
                public int MaxConnection {
-                       get { return (int) base [maxConnection]; }
-                       set { base [maxConnection] = value; } 
+                       get { return (int) base [maxConnectionProp]; }
+                       set { base [maxConnectionProp] = value; } 
                }
 
                protected override ConfigurationPropertyCollection Properties {

Modified: 
trunk/mcs/class/System/System.Net.Configuration/ConnectionManagementElementCollection.cs
===================================================================
--- 
trunk/mcs/class/System/System.Net.Configuration/ConnectionManagementElementCollection.cs
    2005-12-14 01:02:24 UTC (rev 54334)
+++ 
trunk/mcs/class/System/System.Net.Configuration/ConnectionManagementElementCollection.cs
    2005-12-14 01:11:03 UTC (rev 54335)
@@ -3,9 +3,10 @@
 //
 // Authors:
 //     Tim Coleman ([EMAIL PROTECTED])
+//     Chris Toshok ([EMAIL PROTECTED])
 //
 // Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004,2005 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -35,11 +36,11 @@
 
 namespace System.Net.Configuration 
 {
+       [ConfigurationCollection (typeof (ConnectionManagementElement), 
CollectionType = ConfigurationElementCollectionType.AddRemoveClearMap)]
        public sealed class ConnectionManagementElementCollection : 
ConfigurationElementCollection
        {
                #region Constructors
 
-               [MonoTODO]
                public ConnectionManagementElementCollection ()
                {
                }
@@ -63,30 +64,28 @@
 
                #region Methods
 
-               [MonoTODO]
                public void Add (ConnectionManagementElement element)
                {
                        BaseAdd (element);
                }
 
-               [MonoTODO]
                public void Clear ()
                {
                        BaseClear ();
                }
 
-               [MonoTODO]
                protected override ConfigurationElement CreateNewElement ()
                {
                        return new AuthenticationModuleElement ();
                }
 
-               [MonoTODO]
+               [MonoTODO ("argument exception?")]
                protected override object GetElementKey (ConfigurationElement 
element)
                {
                        if (!(element is ConnectionManagementElement))
                                throw new ArgumentException ("element");
-                       throw new NotImplementedException ();
+
+                       return ((ConnectionManagementElement)element).Address;
                }
 
                public int IndexOf (ConnectionManagementElement element)

Modified: 
trunk/mcs/class/System/System.Net.Configuration/ConnectionManagementSection.cs
===================================================================
--- 
trunk/mcs/class/System/System.Net.Configuration/ConnectionManagementSection.cs  
    2005-12-14 01:02:24 UTC (rev 54334)
+++ 
trunk/mcs/class/System/System.Net.Configuration/ConnectionManagementSection.cs  
    2005-12-14 01:11:03 UTC (rev 54335)
@@ -3,9 +3,10 @@
 //
 // Authors:
 //     Tim Coleman ([EMAIL PROTECTED])
+//     Chris Toshok ([EMAIL PROTECTED])
 //
 // Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004,2005 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -39,25 +40,33 @@
        {
                #region Fields
 
-               ConfigurationPropertyCollection properties;
-               static ConfigurationProperty connectionManagement = new 
ConfigurationProperty ("ConnectionManagement", typeof 
(ConnectionManagementElementCollection), new 
ConnectionManagementElementCollection ());
+               static ConfigurationProperty connectionManagementProp;
+               static ConfigurationPropertyCollection properties;
 
                #endregion // Fields
 
                #region Constructors
 
-               public ConnectionManagementSection ()
+               static ConnectionManagementSection ()
                {
+                       connectionManagementProp = new ConfigurationProperty 
("ConnectionManagement", typeof (ConnectionManagementElementCollection),
+                                                                             
null, ConfigurationPropertyOptions.IsDefaultCollection);
+
                        properties = new ConfigurationPropertyCollection ();
-                       properties.Add (connectionManagement);
+                       properties.Add (connectionManagementProp);
                }
 
+               public ConnectionManagementSection ()
+               {
+               }
+
                #endregion // Constructors
 
                #region Properties
 
+               [ConfigurationProperty ("", Options = 
ConfigurationPropertyOptions.IsDefaultCollection)]
                public ConnectionManagementElementCollection 
ConnectionManagement {
-                       get { return (ConnectionManagementElementCollection) 
base [connectionManagement]; }
+                       get { return (ConnectionManagementElementCollection) 
base [connectionManagementProp]; }
                }
 
                protected override ConfigurationPropertyCollection Properties {
@@ -65,16 +74,6 @@
                }
 
                #endregion // Properties
-
-               #region Methods
-
-               [MonoTODO]
-               protected override object GetRuntimeObject ()
-               {
-                       throw new NotImplementedException ();
-               }
-
-               #endregion // Methods
        }
 }
 

Modified: trunk/mcs/class/System/System.Net.Configuration/DefaultProxySection.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Configuration/DefaultProxySection.cs      
2005-12-14 01:02:24 UTC (rev 54334)
+++ trunk/mcs/class/System/System.Net.Configuration/DefaultProxySection.cs      
2005-12-14 01:11:03 UTC (rev 54335)
@@ -3,9 +3,10 @@
 //
 // Authors:
 //     Tim Coleman ([EMAIL PROTECTED])
+//     Chris Toshok ([EMAIL PROTECTED])
 //
 // Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004,2005 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -39,53 +40,86 @@
        {
                #region Fields
 
-               ConfigurationPropertyCollection properties;
-               static ConfigurationProperty bypassList = new 
ConfigurationProperty ("BypassList", typeof (BypassElementCollection), new 
BypassElementCollection ());
-               static ConfigurationProperty module = new ConfigurationProperty 
("Module", typeof (ModuleElement), new ModuleElement ());
-               static ConfigurationProperty proxy = new ConfigurationProperty 
("Proxy", typeof (ProxyElement), new ProxyElement ());
+               static ConfigurationPropertyCollection properties;
+               static ConfigurationProperty bypassListProp;
+               static ConfigurationProperty enabledProp;
+               static ConfigurationProperty moduleProp;
+               static ConfigurationProperty proxyProp;
+               static ConfigurationProperty useDefaultCredentialsProp;
 
                #endregion // Fields
 
                #region Constructors
 
-               public DefaultProxySection ()
+               static DefaultProxySection ()
                {
+                       bypassListProp = new ConfigurationProperty 
("bypasslist", typeof (BypassElementCollection), null);
+                       enabledProp = new ConfigurationProperty ("enabled", 
typeof (bool), true);
+                       moduleProp = new ConfigurationProperty ("module", 
typeof (ModuleElement), null);
+                       proxyProp = new ConfigurationProperty ("proxy", typeof 
(ProxyElement), null);
+                       useDefaultCredentialsProp = new ConfigurationProperty 
("useDefaultCredentials", typeof (bool), false);
                        properties = new ConfigurationPropertyCollection ();
-                       properties.Add (bypassList);
-                       properties.Add (module);
-                       properties.Add (proxy);
+
+                       properties.Add (bypassListProp);
+                       properties.Add (moduleProp);
+                       properties.Add (proxyProp);
                }
 
+               public DefaultProxySection ()
+               {
+               }
+
                #endregion // Constructors
 
                #region Properties
 
+               [ConfigurationProperty ("bypasslist")]
                public BypassElementCollection BypassList {
-                       get { return (BypassElementCollection) base 
[bypassList]; }
+                       get { return (BypassElementCollection) base 
[bypassListProp]; }
                }
 
+               [ConfigurationProperty ("enabled", DefaultValue = "True")]
+               public bool Enabled {
+                       get { return (bool) base [enabledProp]; }
+                       set { base [enabledProp] = value; }
+               }
+
+               [ConfigurationProperty ("module")]
                public ModuleElement Module {
-                       get { return (ModuleElement) base [module]; }
+                       get { return (ModuleElement) base [moduleProp]; }
                }
 
+               [ConfigurationProperty ("proxy")]
+               public ProxyElement Proxy {
+                       get { return (ProxyElement) base [proxyProp]; }
+               }
+
+               [ConfigurationProperty ("useDefaultCredentials", DefaultValue = 
"False")]
+               public bool UseDefaultCredentials {
+                       get { return (bool) base [useDefaultCredentialsProp]; }
+                       set { base [useDefaultCredentialsProp] = value; }
+               }
+
                protected override ConfigurationPropertyCollection Properties {
                        get { return properties; }
                }
 
-               public ProxyElement Proxy {
-                       get { return (ProxyElement) base [proxy]; }
-               }
-
                #endregion // Properties
 
                #region Methods
 
                [MonoTODO]
-               protected override object GetRuntimeObject ()
+               protected override void PostDeserialize ()
                {
                        throw new NotImplementedException ();
                }
 
+               [MonoTODO]
+               protected override void Reset (ConfigurationElement 
parentElement)
+               {
+                       throw new NotImplementedException ();
+               }
+
                #endregion // Methods
        }
 }

Added: trunk/mcs/class/System/System.Net.Configuration/FtpCachePolicyElement.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Configuration/FtpCachePolicyElement.cs    
2005-12-14 01:02:24 UTC (rev 54334)
+++ trunk/mcs/class/System/System.Net.Configuration/FtpCachePolicyElement.cs    
2005-12-14 01:11:03 UTC (rev 54335)
@@ -0,0 +1,97 @@
+//
+// System.Net.Configuration.HttpCachePolicyElement.cs
+//
+// Authors:
+//     Chris Toshok ([EMAIL PROTECTED])
+//
+// (C) 2005 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.
+//
+
+#if NET_2_0 && CONFIGURATION_DEP
+
+using System;
+using System.Configuration;
+using System.Net.Cache;
+using System.Xml;
+
+namespace System.Net.Configuration 
+{
+       public sealed class FtpCachePolicyElement : ConfigurationElement
+       {
+               #region Fields
+
+               static ConfigurationProperty policyLevelProp;
+               static ConfigurationPropertyCollection properties;
+
+               #endregion // Fields
+
+               #region Constructors
+
+               static FtpCachePolicyElement ()
+               {
+                       policyLevelProp = new ConfigurationProperty 
("policyLevel", typeof (RequestCacheLevel), RequestCacheLevel.Default);
+                       properties = new ConfigurationPropertyCollection ();
+
+                       properties.Add (policyLevelProp);
+               }
+
+               public FtpCachePolicyElement ()
+               {
+               }
+
+               #endregion // Constructors
+
+               #region Properties
+
+               [ConfigurationProperty ("policyLevel", DefaultValue = 
"Default")]
+               public RequestCacheLevel PolicyLevel {
+                       get { return (RequestCacheLevel) base 
[policyLevelProp]; }
+                       set { base [policyLevelProp] = value; }
+               }
+
+               protected override ConfigurationPropertyCollection Properties {
+                       get { return properties; }
+               }
+
+               #endregion // Properties
+
+               #region Methods
+
+               [MonoTODO]
+               protected override void DeserializeElement (XmlReader reader, 
bool serializeCollectionKey)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               protected override void Reset (ConfigurationElement 
parentElement)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               #endregion // Methods
+       }
+}
+
+#endif

Modified: 
trunk/mcs/class/System/System.Net.Configuration/HttpCachePolicyElement.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Configuration/HttpCachePolicyElement.cs   
2005-12-14 01:02:24 UTC (rev 54334)
+++ trunk/mcs/class/System/System.Net.Configuration/HttpCachePolicyElement.cs   
2005-12-14 01:11:03 UTC (rev 54335)
@@ -3,9 +3,10 @@
 //
 // Authors:
 //     Tim Coleman ([EMAIL PROTECTED])
+//     Chris Toshok ([EMAIL PROTECTED])
 //
 // Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004,2005 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -42,47 +43,61 @@
        {
                #region Fields
 
-               ConfigurationPropertyCollection properties;
-               static ConfigurationProperty maximumAge = new 
ConfigurationProperty ("MaximumAge", typeof (TimeSpan), TimeSpan.MaxValue);
-               static ConfigurationProperty maximumStale = new 
ConfigurationProperty ("MaximumStale", typeof (TimeSpan), TimeSpan.MinValue);
-               static ConfigurationProperty minimumFresh = new 
ConfigurationProperty ("MinimumFresh", typeof (TimeSpan), TimeSpan.MinValue);
-               static ConfigurationProperty policyLevel = new 
ConfigurationProperty ("PolicyLevel", typeof (HttpRequestCacheLevel), 
HttpRequestCacheLevel.Default);
+               static ConfigurationProperty maximumAgeProp;
+               static ConfigurationProperty maximumStaleProp;
+               static ConfigurationProperty minimumFreshProp;
+               static ConfigurationProperty policyLevelProp;
+               static ConfigurationPropertyCollection properties;
 
                #endregion // Fields
 
                #region Constructors
 
-               public HttpCachePolicyElement ()
+               static HttpCachePolicyElement ()
                {
+                       maximumAgeProp = new ConfigurationProperty 
("maximumAge", typeof (TimeSpan), TimeSpan.MaxValue);
+                       maximumStaleProp = new ConfigurationProperty 
("maximumStale", typeof (TimeSpan), TimeSpan.MinValue);
+                       minimumFreshProp = new ConfigurationProperty 
("minimumFresh", typeof (TimeSpan), TimeSpan.MinValue);
+                       policyLevelProp = new ConfigurationProperty 
("policyLevel", typeof (HttpRequestCacheLevel),
+                                                                    
HttpRequestCacheLevel.Default, ConfigurationPropertyOptions.IsRequired);
                        properties = new ConfigurationPropertyCollection ();
-                       properties.Add (maximumAge);
-                       properties.Add (maximumStale);
-                       properties.Add (minimumFresh);
-                       properties.Add (policyLevel);
+
+                       properties.Add (maximumAgeProp);
+                       properties.Add (maximumStaleProp);
+                       properties.Add (minimumFreshProp);
+                       properties.Add (policyLevelProp);
                }
 
+               public HttpCachePolicyElement ()
+               {
+               }
+
                #endregion // Constructors
 
                #region Properties
 
+               [ConfigurationProperty ("maximumAge", DefaultValue = 
"10675199.02:48:05.4775807")]
                public TimeSpan MaximumAge {
-                       get { return (TimeSpan) base [maximumAge]; }
-                       set { base [maximumAge] = value; }
+                       get { return (TimeSpan) base [maximumAgeProp]; }
+                       set { base [maximumAgeProp] = value; }
                }
 
+               [ConfigurationProperty ("maximumStale", DefaultValue = 
"-10675199.02:48:05.4775808")]
                public TimeSpan MaximumStale {
-                       get { return (TimeSpan) base [maximumStale]; }
-                       set { base [maximumStale] = value; }
+                       get { return (TimeSpan) base [maximumStaleProp]; }
+                       set { base [maximumStaleProp] = value; }
                }
 
+               [ConfigurationProperty ("minimumFresh", DefaultValue = 
"-10675199.02:48:05.4775808")]
                public TimeSpan MinimumFresh {
-                       get { return (TimeSpan) base [minimumFresh]; }
-                       set { base [minimumFresh] = value; }
+                       get { return (TimeSpan) base [minimumFreshProp]; }
+                       set { base [minimumFreshProp] = value; }
                }
 
+               [ConfigurationProperty ("policyLevel", DefaultValue = 
HttpRequestCacheLevel.Default, Options = 
ConfigurationPropertyOptions.IsRequired)]
                public HttpRequestCacheLevel PolicyLevel {
-                       get { return (HttpRequestCacheLevel) base 
[policyLevel]; }
-                       set { base [policyLevel] = value; }
+                       get { return (HttpRequestCacheLevel) base 
[policyLevelProp]; }
+                       set { base [policyLevelProp] = value; }
                }
 
                protected override ConfigurationPropertyCollection Properties {

Modified: 
trunk/mcs/class/System/System.Net.Configuration/HttpWebRequestElement.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Configuration/HttpWebRequestElement.cs    
2005-12-14 01:02:24 UTC (rev 54334)
+++ trunk/mcs/class/System/System.Net.Configuration/HttpWebRequestElement.cs    
2005-12-14 01:11:03 UTC (rev 54335)
@@ -3,9 +3,10 @@
 //
 // Authors:
 //     Tim Coleman ([EMAIL PROTECTED])
+//     Chris Toshok ([EMAIL PROTECTED])
 //
 // Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004,2005 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -39,60 +40,78 @@
        {
                #region Fields
 
-               ConfigurationPropertyCollection properties;
-               static ConfigurationProperty maximumErrorResponseLength = new 
ConfigurationProperty("maximumErrorResponseLength", typeof(int), 64);
-               static ConfigurationProperty maximumResponseHeadersLength = new 
ConfigurationProperty ("maximumResponseHeadersLength", typeof (int), 64);
-               static ConfigurationProperty maximumUnauthorizedUploadLength = 
new ConfigurationProperty("maximumUnauthorizedUploadLength", typeof(int), -1);
-               static ConfigurationProperty useUnsafeHeaderParsing = new 
ConfigurationProperty("useUnsafeHeaderParsing", typeof(bool), false);
+               static ConfigurationProperty maximumErrorResponseLengthProp;
+               static ConfigurationProperty maximumResponseHeadersLengthProp;
+               static ConfigurationProperty 
maximumUnauthorizedUploadLengthProp;
+               static ConfigurationProperty useUnsafeHeaderParsingProp;
+               static ConfigurationPropertyCollection properties;
 
                #endregion // Fields
 
                #region Constructors
 
-               public HttpWebRequestElement ()
+               static HttpWebRequestElement ()
                {
+                       maximumErrorResponseLengthProp = new 
ConfigurationProperty ("maximumErrorResponseLength", typeof (int), 64);
+                       maximumResponseHeadersLengthProp = new 
ConfigurationProperty ("maximumResponseHeadersLength", typeof (int), 64);
+                       maximumUnauthorizedUploadLengthProp = new 
ConfigurationProperty ("maximumUnauthorizedUploadLength", typeof (int), -1);
+                       useUnsafeHeaderParsingProp = new ConfigurationProperty 
("useUnsafeHeaderParsing", typeof (bool), false);
                        properties = new ConfigurationPropertyCollection ();
-                       properties.Add (maximumErrorResponseLength);
-                       properties.Add (maximumResponseHeadersLength);
-                       properties.Add (maximumUnauthorizedUploadLength);
-                       properties.Add (useUnsafeHeaderParsing);
+
+                       properties.Add (maximumErrorResponseLengthProp);
+                       properties.Add (maximumResponseHeadersLengthProp);
+                       properties.Add (maximumUnauthorizedUploadLengthProp);
+                       properties.Add (useUnsafeHeaderParsingProp);
                }
 
+               public HttpWebRequestElement ()
+               {
+               }
+
                #endregion // Constructors
 
                #region Properties
 
-               protected override ConfigurationPropertyCollection Properties {
-                       get { return properties; }
-               }
-
-               [MonoTODO ("Use value for 
HttpWebRequest.DefaultMaximumErrorResponseLength?")]
-               [ConfigurationProperty("maximumErrorResponseLength", 
DefaultValue=64)]
+               [ConfigurationProperty("maximumErrorResponseLength", 
DefaultValue = "64")]
                public int MaximumErrorResponseLength {
-                       get { return (int) base[maximumErrorResponseLength]; }
-                       set { base [maximumErrorResponseLength] = value; }
+                       get { return (int) 
base[maximumErrorResponseLengthProp]; }
+                       set { base [maximumErrorResponseLengthProp] = value; }
                }
 
-               [MonoTODO ("Use value for 
HttpWebRequest.DefaultMaximumResponseHeadersLength?")]
-               [ConfigurationProperty("maximumResponseHeadersLength", 
DefaultValue=64)]
+               [ConfigurationProperty("maximumResponseHeadersLength", 
DefaultValue = "64")]
                public int MaximumResponseHeadersLength {
-                       get { return (int) base [maximumResponseHeadersLength]; 
}
-                       set { base [maximumResponseHeadersLength] = value; }
+                       get { return (int) base 
[maximumResponseHeadersLengthProp]; }
+                       set { base [maximumResponseHeadersLengthProp] = value; }
                }
 
-               [ConfigurationProperty("maximumUnauthorizedUploadLength", 
DefaultValue=-1)]
+               [ConfigurationProperty("maximumUnauthorizedUploadLength", 
DefaultValue = "-1")]
                public int MaximumUnauthorizedUploadLength {
-                       get { return (int) base 
[maximumUnauthorizedUploadLength]; }
-                       set { base [maximumUnauthorizedUploadLength] = value; }
+                       get { return (int) base 
[maximumUnauthorizedUploadLengthProp]; }
+                       set { base [maximumUnauthorizedUploadLengthProp] = 
value; }
                }
 
-               [ConfigurationProperty("useUnsafeHeaderParsing", 
DefaultValue=false)]
+               [ConfigurationProperty("useUnsafeHeaderParsing", DefaultValue = 
"False")]
                public bool UseUnsafeHeaderParsing {
-                       get { return (bool) base [useUnsafeHeaderParsing]; }
-                       set { base[useUnsafeHeaderParsing] = value; }
+                       get { return (bool) base [useUnsafeHeaderParsingProp]; }
+                       set { base[useUnsafeHeaderParsingProp] = value; }
                }
 
+               protected override ConfigurationPropertyCollection Properties {
+                       get { return properties; }
+               }
+
                #endregion // Properties
+
+
+               #region Methods
+
+               [MonoTODO]
+               protected override void PostDeserialize ()
+               {
+                       base.PostDeserialize ();
+               }
+
+               #endregion // Methods
        }
 }
 

Modified: trunk/mcs/class/System/System.Net.Configuration/Ipv6Element.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Configuration/Ipv6Element.cs      
2005-12-14 01:02:24 UTC (rev 54334)
+++ trunk/mcs/class/System/System.Net.Configuration/Ipv6Element.cs      
2005-12-14 01:11:03 UTC (rev 54335)
@@ -3,9 +3,10 @@
 //
 // Authors:
 //     Tim Coleman ([EMAIL PROTECTED])
+//     Chris Toshok ([EMAIL PROTECTED])
 //
 // Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004,2005 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -39,26 +40,32 @@
        {
                #region Fields
 
-               ConfigurationPropertyCollection properties;
-               static ConfigurationProperty enabled = new 
ConfigurationProperty ("Enabled", typeof (bool), false);
+               static ConfigurationPropertyCollection properties;
+               static ConfigurationProperty enabledProp;
 
                #endregion // Fields
 
                #region Constructors
 
-               public Ipv6Element ()
+               static Ipv6Element ()
                {
+                       enabledProp = new ConfigurationProperty ("enabled", 
typeof (bool), false);
                        properties = new ConfigurationPropertyCollection ();
-                       properties.Add (enabled);
+                       properties.Add (enabledProp);
                }
 
+               public Ipv6Element ()
+               {
+               }
+
                #endregion // Constructors
 
                #region Properties
 
+               [ConfigurationProperty ("enabled", DefaultValue = "False")]
                public bool Enabled {
-                       get { return (bool) base [enabled]; }
-                       set { base [enabled] = value; }
+                       get { return (bool) base [enabledProp]; }
+                       set { base [enabledProp] = value; }
                }
 
                protected override ConfigurationPropertyCollection Properties {

Modified: trunk/mcs/class/System/System.Net.Configuration/ModuleElement.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Configuration/ModuleElement.cs    
2005-12-14 01:02:24 UTC (rev 54334)
+++ trunk/mcs/class/System/System.Net.Configuration/ModuleElement.cs    
2005-12-14 01:11:03 UTC (rev 54335)
@@ -3,9 +3,10 @@
 //
 // Authors:
 //     Tim Coleman ([EMAIL PROTECTED])
+//     Chris Toshok ([EMAIL PROTECTED])
 //
 // Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004,2005 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -39,19 +40,25 @@
        {
                #region Fields
 
-               ConfigurationPropertyCollection properties;
-               static ConfigurationProperty type = new ConfigurationProperty 
("Type", typeof (string), null);
+               static ConfigurationPropertyCollection properties;
+               static ConfigurationProperty typeProp;
 
                #endregion // Fields
 
                #region Constructors
 
-               public ModuleElement ()
+               static ModuleElement ()
                {
+                       typeProp = new ConfigurationProperty ("type", typeof 
(string), null);
                        properties = new ConfigurationPropertyCollection ();
-                       properties.Add (type);
+
+                       properties.Add (typeProp);
                }
 
+               public ModuleElement ()
+               {
+               }
+
                #endregion // Constructors
 
                #region Properties
@@ -60,9 +67,10 @@
                        get { return properties; }
                }
 
+               [ConfigurationProperty ("type")]
                public string Type {
-                       get { return (string) base [type]; }
-                       set { base [type] = value; }
+                       get { return (string) base [typeProp]; }
+                       set { base [typeProp] = value; }
                }
 
                #endregion // Properties

Modified: trunk/mcs/class/System/System.Net.Configuration/NetSectionGroup.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Configuration/NetSectionGroup.cs  
2005-12-14 01:02:24 UTC (rev 54334)
+++ trunk/mcs/class/System/System.Net.Configuration/NetSectionGroup.cs  
2005-12-14 01:11:03 UTC (rev 54335)
@@ -48,44 +48,42 @@
 
                #region Properties
 
-               [MonoTODO]
+               [ConfigurationProperty ("authenticationModules")]
                public AuthenticationModulesSection AuthenticationModules {
-                       get { throw new NotImplementedException (); }
+                       get { return (AuthenticationModulesSection) Sections 
["authenticationModules"]; }
                }
 
-               [MonoTODO]
+               [ConfigurationProperty ("connectionManagement")]
                public ConnectionManagementSection ConnectionManagement {
-                       get { throw new NotImplementedException (); }
+                       get { return (ConnectionManagementSection) Sections 
["connectionManagement"]; }
                }
 
-               [MonoTODO]
+               [ConfigurationProperty ("defaultProxy")]
                public DefaultProxySection DefaultProxy {
-                       get { throw new NotImplementedException (); }
+                       get { return (DefaultProxySection) Sections 
["defaultProxy"]; }
                }
 
-               [MonoTODO]
-               public MailSettingsSection MailSettings {
-                       get { throw new NotImplementedException (); }
+#if notyet
+               [ConfigurationProperty ("mailSettings")]
+               public MailSettingsSectionGroup MailSettings {
+                       get { return (MailSettingsSectionGroup) SectionGroups 
["mailSettings"]; }
                }
+#endif
 
-               [MonoTODO]
+               [ConfigurationProperty ("requestCaching")]
                public RequestCachingSection RequestCaching {
-                       get { throw new NotImplementedException (); }
+                       get { return (RequestCachingSection) Sections 
["requestCaching"]; }
                }
 
-               [MonoTODO]
+               
+               [ConfigurationProperty ("settings")]
                public SettingsSection Settings {
-                       get { throw new NotImplementedException (); }
+                       get { return (SettingsSection) Sections ["settings"]; }
                }
 
-               [MonoTODO]
-               public UriParserSection UriParser {
-                       get { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]
+               [ConfigurationProperty ("webRequestModules")]
                public WebRequestModulesSection WebRequestModules {
-                       get { throw new NotImplementedException (); }
+                       get { return (WebRequestModulesSection) Sections 
["webRequestModules"]; }
                }
 
                #endregion // Properties

Modified: trunk/mcs/class/System/System.Net.Configuration/ProxyElement.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Configuration/ProxyElement.cs     
2005-12-14 01:02:24 UTC (rev 54334)
+++ trunk/mcs/class/System/System.Net.Configuration/ProxyElement.cs     
2005-12-14 01:11:03 UTC (rev 54335)
@@ -3,9 +3,10 @@
 //
 // Authors:
 //     Tim Coleman ([EMAIL PROTECTED])
+//     Chris Toshok ([EMAIL PROTECTED])
 //
 // Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004,2005 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -40,80 +41,94 @@
        {
                #region Fields
 
-               ConfigurationPropertyCollection properties;
-               static ConfigurationProperty bypassOnLocal = new 
ConfigurationProperty ("BypassOnLocal", typeof (BypassOnLocalValues), 
BypassOnLocalValues.Default);
-               static ConfigurationProperty proxyAddress = new 
ConfigurationProperty ("ProxyAddress", typeof (string), null);
-               static ConfigurationProperty scriptDownloadInterval = new 
ConfigurationProperty ("ScriptDownloadInterval", typeof (TimeSpan), 
TimeSpan.MinValue);
-               static ConfigurationProperty scriptDownloadTimeout = new 
ConfigurationProperty ("ScriptDownloadTimeout", typeof (TimeSpan), 
TimeSpan.MinValue);
-               static ConfigurationProperty useDefaultCredentials = new 
ConfigurationProperty ("UseDefaultCredentials", typeof (bool), false);
-               static ConfigurationProperty 
useDefaultCredentialsForScriptDownload = new ConfigurationProperty 
("UseDefaultCredentialsForScriptDownload", typeof (bool), false);
-               static ConfigurationProperty useSystemDefault = new 
ConfigurationProperty ("UseSystemDefault", typeof (bool), true);
+               static ConfigurationPropertyCollection properties;
+               static ConfigurationProperty autoDetectProp;
+               static ConfigurationProperty bypassOnLocalProp;
+               static ConfigurationProperty proxyAddressProp;
+               static ConfigurationProperty scriptLocationProp;
+               static ConfigurationProperty useSystemDefaultProp;
 
                #endregion // Fields
 
                #region Constructors
 
-               [MonoTODO]
-               public ProxyElement ()
+               static ProxyElement ()
                {
+                       autoDetectProp = new ConfigurationProperty 
("autoDetect", typeof (AutoDetectValues), AutoDetectValues.Unspecified);
+                       bypassOnLocalProp = new ConfigurationProperty 
("bypassonlocal", typeof (BypassOnLocalValues), 
BypassOnLocalValues.Unspecified);
+                       proxyAddressProp = new ConfigurationProperty 
("proxyaddress", typeof (Uri), null);
+                       scriptLocationProp = new ConfigurationProperty 
("scriptLocation", typeof (Uri), null);
+                       useSystemDefaultProp = new ConfigurationProperty 
("UseSystemDefault", typeof (UseSystemDefaultValues), 
UseSystemDefaultValues.Unspecified);
+
                        properties = new ConfigurationPropertyCollection ();
-                       properties.Add (bypassOnLocal);
-                       properties.Add (proxyAddress);
-                       properties.Add (scriptDownloadInterval);
-                       properties.Add (scriptDownloadTimeout);
-                       properties.Add (useDefaultCredentials);
-                       properties.Add (useDefaultCredentialsForScriptDownload);
-                       properties.Add (useSystemDefault);
+                                                                   
+                       properties.Add (bypassOnLocalProp);
+                       properties.Add (proxyAddressProp);
+                       properties.Add (scriptLocationProp);
+                       properties.Add (useSystemDefaultProp);
                }
 
+               public ProxyElement ()
+               {
+               }
+
                #endregion // Constructors
 
                #region Properties
 
-               public BypassOnLocalValues BypassOnLocal {
-                       get { return (BypassOnLocalValues) base 
[bypassOnLocal]; }
-                       set { base [bypassOnLocal] = value; }
+               [ConfigurationProperty ("autoDetect", DefaultValue = 
"Unspecified")]
+               public AutoDetectValues AutoDetect {
+                       get { return (AutoDetectValues) base [autoDetectProp]; }
+                       set { base [autoDetectProp] = value; }
                }
 
-               protected override ConfigurationPropertyCollection Properties {
-                       get { return properties; }
+               [ConfigurationProperty ("bypassonlocal", DefaultValue = 
"Unspecified")]
+               public BypassOnLocalValues BypassOnLocal {
+                       get { return (BypassOnLocalValues) base 
[bypassOnLocalProp]; }
+                       set { base [bypassOnLocalProp] = value; }
                }
 
-               public string ProxyAddress {
-                       get { return (string) base [proxyAddress]; }
-                       set { base [proxyAddress] = value; }
+               [ConfigurationProperty ("proxyaddress")]
+               public Uri ProxyAddress {
+                       get { return (Uri) base [proxyAddressProp]; }
+                       set { base [proxyAddressProp] = value; }
                }
 
-               public TimeSpan ScriptDownloadInterval {
-                       get { return (TimeSpan) base [scriptDownloadInterval]; }
-                       set { base [scriptDownloadInterval] = value; }
+               [ConfigurationProperty ("scriptLocation")]
+               public Uri ScriptLocation {
+                       get { return (Uri) base [scriptLocationProp]; }
+                       set { base [scriptLocationProp] = value; }
                }
 
-               public TimeSpan ScriptDownloadTimeout {
-                       get { return (TimeSpan) base [scriptDownloadTimeout]; }
-                       set { base [scriptDownloadTimeout] = value; }
+               [ConfigurationProperty ("usesystemdefault", DefaultValue = 
"Unspecified")]
+               public UseSystemDefaultValues UseSystemDefault {
+                       get { return (UseSystemDefaultValues) base 
[useSystemDefaultProp]; }
+                       set { base [useSystemDefaultProp] = value; }
                }
 
-               public bool UseDefaultCredentials {
-                       get { return (bool) base [useDefaultCredentials]; }
-                       set { base [useDefaultCredentials] = value; }
+               protected override ConfigurationPropertyCollection Properties {
+                       get { return properties; }
                }
 
-               public bool UseDefaultCredentialsForScriptDownload {
-                       get { return (bool) base 
[useDefaultCredentialsForScriptDownload]; }
-                       set { base [useDefaultCredentialsForScriptDownload] = 
value; }
+               #endregion // Properties
+
+               public enum BypassOnLocalValues
+               {
+                       Unspecified = -1,
+                       True = 1,
+                       False = 0
                }
 
-               public bool UseSystemDefault {
-                       get { return (bool) base [useSystemDefault]; }
-                       set { base [useSystemDefault] = value; }
+               public enum UseSystemDefaultValues
+               {
+                       Unspecified = -1,
+                       True = 1,
+                       False = 0
                }
 
-               #endregion // Properties
-
-               public enum BypassOnLocalValues
+               public enum AutoDetectValues
                {
-                       Default = -1,
+                       Unspecified = -1,
                        True = 1,
                        False = 0
                }

Modified: 
trunk/mcs/class/System/System.Net.Configuration/RequestCachingSection.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Configuration/RequestCachingSection.cs    
2005-12-14 01:02:24 UTC (rev 54334)
+++ trunk/mcs/class/System/System.Net.Configuration/RequestCachingSection.cs    
2005-12-14 01:11:03 UTC (rev 54335)
@@ -3,9 +3,10 @@
 //
 // Authors:
 //     Tim Coleman ([EMAIL PROTECTED])
+//     Chris Toshok ([EMAIL PROTECTED])
 //
 // Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004,2005 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -34,6 +35,7 @@
 using System;
 using System.Configuration;
 using System.Net.Cache;
+using System.Xml;
 
 namespace System.Net.Configuration 
 {
@@ -41,69 +43,98 @@
        {
                #region Fields
 
-               ConfigurationPropertyCollection properties;
-               static ConfigurationProperty defaultHttpCachePolicy = new 
ConfigurationProperty ("DefaultHttpCachePolicy", typeof 
(HttpCachePolicyElement), new HttpCachePolicyElement ());
-               static ConfigurationProperty defaultPolicyLevel = new 
ConfigurationProperty ("DefaultPolicyLevel", typeof (RequestCacheLevel), 
RequestCacheLevel.BypassCache);
-               static ConfigurationProperty disableAllCaching = new 
ConfigurationProperty ("DisableAllCaching", typeof (bool), false);
-               static ConfigurationProperty isPrivateCache = new 
ConfigurationProperty ("IsPrivateCache", typeof (bool), true);
-               static ConfigurationProperty unspecifiedMaximumAge = new 
ConfigurationProperty ("UnspecifiedMaximumAge", typeof (TimeSpan), new TimeSpan 
(1, 0, 0, 0));
+               static ConfigurationPropertyCollection properties;
+               static ConfigurationProperty defaultFtpCachePolicyProp;
+               static ConfigurationProperty defaultHttpCachePolicyProp;
+               static ConfigurationProperty defaultPolicyLevelProp;
+               static ConfigurationProperty disableAllCachingProp;
+               static ConfigurationProperty isPrivateCacheProp;
+               static ConfigurationProperty unspecifiedMaximumAgeProp;
 
                #endregion // Fields
 
                #region Constructors
 
-               public RequestCachingSection ()
+               static RequestCachingSection ()
                {
+                       defaultFtpCachePolicyProp = new ConfigurationProperty 
("defaultFtpCachePolicy", typeof (FtpCachePolicyElement));
+                       defaultHttpCachePolicyProp = new ConfigurationProperty 
("defaultHttpCachePolicy", typeof (HttpCachePolicyElement));
+                       defaultPolicyLevelProp = new ConfigurationProperty 
("defaultPolicyLevel", typeof (RequestCacheLevel), 
RequestCacheLevel.BypassCache);
+                       disableAllCachingProp = new ConfigurationProperty 
("disableAllCaching", typeof (bool), false);
+                       isPrivateCacheProp = new ConfigurationProperty 
("isPrivateCache", typeof (bool), true);
+                       unspecifiedMaximumAgeProp = new ConfigurationProperty 
("unspecifiedMaximumAge", typeof (TimeSpan), new TimeSpan (1, 0, 0, 0));
                        properties = new ConfigurationPropertyCollection ();
-                       properties.Add (defaultHttpCachePolicy);
-                       properties.Add (defaultPolicyLevel);
-                       properties.Add (disableAllCaching);
-                       properties.Add (isPrivateCache);
-                       properties.Add (unspecifiedMaximumAge);
+
+                       properties.Add (defaultFtpCachePolicyProp);
+                       properties.Add (defaultHttpCachePolicyProp);
+                       properties.Add (defaultPolicyLevelProp);
+                       properties.Add (disableAllCachingProp);
+                       properties.Add (isPrivateCacheProp);
+                       properties.Add (unspecifiedMaximumAgeProp);
                }
 
+               public RequestCachingSection ()
+               {
+               }
+
                #endregion // Constructors
 
                #region Properties
 
+               [ConfigurationProperty ("defaultFtpCachePolicy")]
+               public FtpCachePolicyElement DefaultFtpCachePolicy {
+                       get { return (FtpCachePolicyElement) base 
[defaultFtpCachePolicyProp]; }
+               }
+
+               [ConfigurationProperty ("defaultHttpCachePolicy")]
                public HttpCachePolicyElement DefaultHttpCachePolicy {
-                       get { return (HttpCachePolicyElement) base 
[defaultHttpCachePolicy]; }
+                       get { return (HttpCachePolicyElement) base 
[defaultHttpCachePolicyProp]; }
                }
 
+               [ConfigurationProperty ("defaultPolicyLevel", DefaultValue = 
"BypassCache")]
                public RequestCacheLevel DefaultPolicyLevel {
-                       get { return (RequestCacheLevel) base 
[defaultPolicyLevel]; }
-                       set { base [defaultPolicyLevel] = value; }
+                       get { return (RequestCacheLevel) base 
[defaultPolicyLevelProp]; }
+                       set { base [defaultPolicyLevelProp] = value; }
                }
 
+               [ConfigurationProperty ("disableAllCaching", DefaultValue = 
"False")]
                public bool DisableAllCaching {
-                       get { return (bool) base [disableAllCaching]; }
-                       set { base [disableAllCaching] = value; }
+                       get { return (bool) base [disableAllCachingProp]; }
+                       set { base [disableAllCachingProp] = value; }
                }
 
+               [ConfigurationProperty ("isPrivateCache", DefaultValue = 
"True")]
                public bool IsPrivateCache {
-                       get { return (bool) base [isPrivateCache]; }
-                       set { base [isPrivateCache] = value; }
+                       get { return (bool) base [isPrivateCacheProp]; }
+                       set { base [isPrivateCacheProp] = value; }
                }
 
+               [ConfigurationProperty ("unspecifiedMaximumAge", DefaultValue = 
"1.00:00:00")]
+               public TimeSpan UnspecifiedMaximumAge {
+                       get { return (TimeSpan) base 
[unspecifiedMaximumAgeProp]; }
+                       set { base [unspecifiedMaximumAgeProp] = value; }
+               }
+
                protected override ConfigurationPropertyCollection Properties {
                        get { return properties; }
                }
 
-               public TimeSpan UnspecifiedMaximumAge {
-                       get { return (TimeSpan) base [unspecifiedMaximumAge]; }
-                       set { base [unspecifiedMaximumAge] = value; }
-               }
-
                #endregion // Properties
 
                #region Methods
 
                [MonoTODO]
-               protected override object GetRuntimeObject ()
+               protected override void PostDeserialize ()
                {
-                       throw new NotImplementedException ();
+                       base.PostDeserialize ();
                }
 
+               [MonoTODO]
+               protected override void DeserializeElement (XmlReader reader, 
bool serializeCollectionKey)
+               {
+                       base.DeserializeElement (reader, 
serializeCollectionKey);
+               }
+
                #endregion // Methods
        }
 }

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

Reply via email to