Author: andrews
Date: 2006-09-11 11:07:26 -0400 (Mon, 11 Sep 2006)
New Revision: 65234

Modified:
   trunk/mcs/class/System.Web/System.Web.Caching/CacheDependency.cs
   trunk/mcs/class/System.Web/System.Web.Caching/ChangeLog
   trunk/mcs/class/System.Web/System.Web/ChangeLog
   trunk/mcs/class/System.Web/System.Web/XmlSiteMapProvider.cs
   trunk/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
   trunk/mcs/class/System.XML/System.Xml.Serialization/SchemaImporter.cs
   trunk/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
   trunk/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
Log:
ifdef TARGET_JVM 


Modified: trunk/mcs/class/System.Web/System.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web/ChangeLog     2006-09-11 15:03:53 UTC 
(rev 65233)
+++ trunk/mcs/class/System.Web/System.Web/ChangeLog     2006-09-11 15:07:26 UTC 
(rev 65234)
@@ -1,3 +1,7 @@
+2006-09-11  Andrew Skiba <[EMAIL PROTECTED]>
+
+       * XmlSiteMapProvider.cs: ifdef TARGET_JVM
+
 2006-09-11  Vladimir Krasnov  <[EMAIL PROTECTED]>
 
        * HttpWriter.cs: fixed WriteLine to work correctly in utf-16 encoding

Modified: trunk/mcs/class/System.Web/System.Web/XmlSiteMapProvider.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web/XmlSiteMapProvider.cs 2006-09-11 
15:03:53 UTC (rev 65233)
+++ trunk/mcs/class/System.Web/System.Web/XmlSiteMapProvider.cs 2006-09-11 
15:07:26 UTC (rev 65234)
@@ -228,12 +228,12 @@
                {
                        throw new NotImplementedException ();
                }
-
+#if !TARGET_JVM
                void OnFileChanged (object sender, FileSystemEventArgs args)
                {
                        Clear ();
                }
-
+#endif
                public override SiteMapNode RootNode {
                        get {
                                BuildSiteMap ();

Modified: trunk/mcs/class/System.Web/System.Web.Caching/CacheDependency.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Caching/CacheDependency.cs    
2006-09-11 15:03:53 UTC (rev 65233)
+++ trunk/mcs/class/System.Web/System.Web.Caching/CacheDependency.cs    
2006-09-11 15:07:26 UTC (rev 65234)
@@ -114,7 +114,7 @@
                                dependency.DependencyChanged += new 
EventHandler (OnChildDependencyChanged);
                        this.start = start;
                }
-               
+#if !TARGET_JVM
                void OnChanged (object sender, FileSystemEventArgs args)
                {
                        if (DateTime.Now < start)
@@ -125,14 +125,9 @@
                        if (cache != null)
                                cache.CheckExpiration ();
                }
-               
-#if TARGET_JVM
+       
                void DisposeWatchers ()
                {
-               }
-#else
-               void DisposeWatchers ()
-               {
                        lock (locker) {
                                if (watchers != null) {
                                        foreach (FileSystemWatcher w in 
watchers)
@@ -142,6 +137,10 @@
                                watchers = null;
                        }
                }
+#else
+               void DisposeWatchers ()
+               {
+               }
 #endif
                public void Dispose ()
                {

Modified: trunk/mcs/class/System.Web/System.Web.Caching/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Caching/ChangeLog     2006-09-11 
15:03:53 UTC (rev 65233)
+++ trunk/mcs/class/System.Web/System.Web.Caching/ChangeLog     2006-09-11 
15:07:26 UTC (rev 65234)
@@ -1,3 +1,7 @@
+2006-09-11 Andrew Skiba <[EMAIL PROTECTED]>
+
+       * CacheDependency.cs: ifdef TARGET_JVM
+
 2006-08-03 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
 
        * CacheDependency.cs:

Modified: trunk/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/System.Xml.Serialization/ChangeLog       
2006-09-11 15:03:53 UTC (rev 65233)
+++ trunk/mcs/class/System.XML/System.Xml.Serialization/ChangeLog       
2006-09-11 15:07:26 UTC (rev 65234)
@@ -1,3 +1,8 @@
+2006-09-11  Andrew Skiba <[EMAIL PROTECTED]>
+
+       * XmlSchemaImporter.cs,XmlMemberMapping.cs,SchemaImporter.cs: ifdef
+       TARGET_JVM
+
 2006-09-05  Lluis Sanchez Gual  <[EMAIL PROTECTED]> 
 
        * XmlSchemaImporter.cs: In MS.NET 2.0, simple type arrays are mapped

Modified: trunk/mcs/class/System.XML/System.Xml.Serialization/SchemaImporter.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml.Serialization/SchemaImporter.cs       
2006-09-11 15:03:53 UTC (rev 65233)
+++ trunk/mcs/class/System.XML/System.Xml.Serialization/SchemaImporter.cs       
2006-09-11 15:07:26 UTC (rev 65234)
@@ -31,7 +31,9 @@
 #if NET_2_0
 
 using System;
+#if !TARGET_JVM
 using System.Xml.Serialization.Advanced;
+#endif
 
 namespace System.Xml.Serialization 
 {

Modified: 
trunk/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs     
2006-09-11 15:03:53 UTC (rev 65233)
+++ trunk/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs     
2006-09-11 15:07:26 UTC (rev 65234)
@@ -128,13 +128,14 @@
                {
                        get { throw new NotImplementedException (); }
                }
-               
+#if !TARGET_JVM                
                [MonoTODO]
                public string GenerateTypeName 
(System.CodeDom.Compiler.CodeDomProvider codeProvider)
                {
                        throw new NotImplementedException ();
                }
 #endif
+#endif
 
 #if NET_1_1
                public bool CheckSpecified

Modified: 
trunk/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs    
2006-09-11 15:03:53 UTC (rev 65233)
+++ trunk/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs    
2006-09-11 15:07:26 UTC (rev 65234)
@@ -30,7 +30,9 @@
 //
 
 using System.Xml;
+#if !TARGET_JVM
 using System.CodeDom.Compiler;
+#endif
 using System.Xml.Schema;
 using System.Collections;
 
@@ -91,6 +93,7 @@
                }
                
 #if NET_2_0
+#if !TARGET_JVM
                [MonoTODO]
                public XmlSchemaImporter (XmlSchemas schemas, 
CodeGenerationOptions options, CodeDomProvider codeProvider, ImportContext 
context)
                {
@@ -103,7 +106,8 @@
                        else
                                typeIdentifiers = new CodeIdentifiers ();
                }
-               
+#endif
+
                public XmlSchemaImporter (XmlSchemas schemas, 
CodeGenerationOptions options, ImportContext context)
                {
                        this.schemas = schemas;
@@ -123,7 +127,7 @@
                        this.schemas = schemas;
                        this.options = options;
                }
-               
+
                void InitSharedData (ImportContext context)
                {
                        if (context.ShareTypes) {

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

Reply via email to