Author: toshok
Date: 2005-11-23 22:07:02 -0500 (Wed, 23 Nov 2005)
New Revision: 53425
Added:
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/MachineKeyValidationConverter.cs
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/HostingEnvironmentSection.cs
Log:
2005-11-23 Chris Toshok <[EMAIL PROTECTED]>
* MachineKeyValidationConverter.cs: new converter (and a pretty
silly one, considering all it seems to do is convert "TripleDES"
to "3DES").
* HostingEnvironmentSection.cs (.cctor): use
PositiveTimeSpanValidator like MS does.
Modified: trunk/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
2005-11-23 22:51:39 UTC (rev 53424)
+++ trunk/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
2005-11-24 03:07:02 UTC (rev 53425)
@@ -1,3 +1,12 @@
+2005-11-23 Chris Toshok <[EMAIL PROTECTED]>
+
+ * MachineKeyValidationConverter.cs: new converter (and a pretty
+ silly one, considering all it seems to do is convert "TripleDES"
+ to "3DES").
+
+ * HostingEnvironmentSection.cs (.cctor): use
+ PositiveTimeSpanValidator like MS does.
+
2005-11-18 Chris Toshok <[EMAIL PROTECTED]>
* HostingEnvironmentSection.cs (.cctor): add validators.
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/HostingEnvironmentSection.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/HostingEnvironmentSection.cs
2005-11-23 22:51:39 UTC (rev 53424)
+++
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/HostingEnvironmentSection.cs
2005-11-24 03:07:02 UTC (rev 53425)
@@ -46,13 +46,13 @@
static HostingEnvironmentSection ()
{
idleTimeoutProp = new ConfigurationProperty
("idleTimeout", typeof (TimeSpan), TimeSpan.MaxValue,
- new
TimeSpanMinutesOrInfiniteConverter (),
- new
TimeSpanValidator (TimeSpan.Zero, TimeSpan.MaxValue),
+
PropertyHelper.TimeSpanMinutesOrInfiniteConverter,
+
PropertyHelper.PositiveTimeSpanValidator,
ConfigurationPropertyOptions.None);
shadowCopyBinAssembliesProp = new ConfigurationProperty
("shadowCopyBinAssemblies", typeof (bool), true);
shutdownTimeoutProp = new ConfigurationProperty
("shutdownTimeout", typeof (TimeSpan), TimeSpan.FromSeconds (30),
- new
TimeSpanSecondsConverter (),
- new
TimeSpanValidator (TimeSpan.Zero, TimeSpan.MaxValue),
+
PropertyHelper.TimeSpanSecondsConverter,
+
PropertyHelper.PositiveTimeSpanValidator,
ConfigurationPropertyOptions.None);
properties = new ConfigurationPropertyCollection ();
Added:
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/MachineKeyValidationConverter.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/MachineKeyValidationConverter.cs
2005-11-23 22:51:39 UTC (rev 53424)
+++
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/MachineKeyValidationConverter.cs
2005-11-24 03:07:02 UTC (rev 53425)
@@ -0,0 +1,80 @@
+//
+// System.Web.Configuration.MachineKeyValidationConverter
+//
+// Authors:
+// Chris Toshok ([EMAIL PROTECTED])
+//
+// (c) Copyright 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.
+//
+
+using System;
+using System.ComponentModel;
+using System.Configuration;
+using System.Globalization;
+
+#if NET_2_0
+
+namespace System.Web.Configuration {
+
+ public sealed class MachineKeyValidationConverter :
ConfigurationConverterBase
+ {
+ public MachineKeyValidationConverter ()
+ {
+ }
+
+ public override object ConvertFrom (ITypeDescriptorContext ctx,
CultureInfo ci, object data)
+ {
+ if ((string)data == "MD5")
+ return MachineKeyValidation.MD5;
+ else if ((string)data == "SHA1")
+ return MachineKeyValidation.SHA1;
+ else if ((string)data == "3DES")
+ return MachineKeyValidation.TripleDES;
+ else if ((string)data == "AES")
+ return MachineKeyValidation.AES;
+ else
+ throw new ArgumentException ("The enumeration
value must be one of the following: SHA1, MD5, 3DES, AES.");
+ }
+
+ public override object ConvertTo (ITypeDescriptorContext ctx,
CultureInfo ci, object value, Type type)
+ {
+ if (value.GetType () != typeof (MachineKeyValidation)) {
+ /* MS throws this exception on an invalid */
+ throw new FormatException ("invalid validation
value");
+ }
+
+ MachineKeyValidation v = (MachineKeyValidation)value;
+
+ if (v == MachineKeyValidation.MD5) return "MD5";
+ else if (v == MachineKeyValidation.SHA1) return "SHA1";
+ else if (v == MachineKeyValidation.TripleDES) return
"3DES";
+ else if (v == MachineKeyValidation.AES) return "AES";
+ else
+ /* MS throws this exception on an invalid */
+ throw new FormatException ("invalid validation
value");
+ }
+ }
+}
+
+#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
