[mapguide-commits] r7667 - in branches/2.5/MgDev: Oem/SWIGEx/Lib/csharp Web/src/DotNetUnmanagedApi/Foundation Web/src/DotNetUnmanagedApi/Foundation/FoundationCustom Web/src/MapGuideApi

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-07-08 02:03:52 -0700 (Mon, 08 Jul 2013)
New Revision: 7667

Added:
   branches/2.5/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationCustom/MgResourceTagNotFoundException
Modified:
   branches/2.5/MgDev/Oem/SWIGEx/Lib/csharp/csharphead.swg
   branches/2.5/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApiGen.xml
   branches/2.5/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml
Log:
#2315, #2316: Merge r7658 and r7666 to 2.5 branch

Modified: branches/2.5/MgDev/Oem/SWIGEx/Lib/csharp/csharphead.swg
===================================================================
--- branches/2.5/MgDev/Oem/SWIGEx/Lib/csharp/csharphead.swg	2013-07-06 18:27:07 UTC (rev 7666)
+++ branches/2.5/MgDev/Oem/SWIGEx/Lib/csharp/csharphead.swg	2013-07-08 09:03:52 UTC (rev 7667)
@@ -81,7 +81,7 @@
                 }
             }
             if (type == null)
-                exception = new Exception();
+                exception = new Exception("Exception (" + className + ") was thrown. No .net type could be found for this exception type");
             else
                 exception = Activator.CreateInstance(type, parameters);
         }

Modified: branches/2.5/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApiGen.xml
===================================================================
--- branches/2.5/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApiGen.xml	2013-07-06 18:27:07 UTC (rev 7666)
+++ branches/2.5/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApiGen.xml	2013-07-08 09:03:52 UTC (rev 7667)
@@ -149,6 +149,7 @@
     <Header path="../../../../Common/Foundation/Exception/PlatformNotSupportedException.h" />
     <Header path="../../../../Common/Foundation/Exception/ResourcesException.h" />
     <Header path="../../../../Common/Foundation/Exception/ResourcesLoadFailedException.h" />
+    <Header path="../../../../Common/Foundation/Exception/ResourceTagNotFoundException.h" />
     <Header path="../../../../Common/Foundation/Exception/RuntimeException.h" />
     <Header path="../../../../Common/Foundation/Exception/TemporaryFileNotAvailableException.h" />
     <Header path="../../../../Common/Foundation/Exception/ThirdPartyException.h" />

Copied: branches/2.5/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationCustom/MgResourceTagNotFoundException (from rev 7658, trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationCustom/MgResourceTagNotFoundException)
===================================================================
--- branches/2.5/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationCustom/MgResourceTagNotFoundException	                        (rev 0)
+++ branches/2.5/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationCustom/MgResourceTagNotFoundException	2013-07-08 09:03:52 UTC (rev 7667)
@@ -0,0 +1 @@
+DESERIALIZATION

Modified: branches/2.5/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml
===================================================================
--- branches/2.5/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml	2013-07-06 18:27:07 UTC (rev 7666)
+++ branches/2.5/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml	2013-07-08 09:03:52 UTC (rev 7667)
@@ -158,6 +158,7 @@
     <Header path="../../../Common/Foundation/Exception/PlatformNotSupportedException.h" />
     <Header path="../../../Common/Foundation/Exception/ResourcesException.h" />
     <Header path="../../../Common/Foundation/Exception/ResourcesLoadFailedException.h" />
+    <Header path="../../../Common/Foundation/Exception/ResourceTagNotFoundException.h" />
     <Header path="../../../Common/Foundation/Exception/RuntimeException.h" />
     <Header path="../../../Common/Foundation/Exception/TemporaryFileNotAvailableException.h" />
     <Header path="../../../Common/Foundation/Exception/ThirdPartyException.h" />