[mapguide-commits] r4710 - in sandbox/adsk/2.2gp: Common/CoordinateSystem Common/Foundation Common/Foundation/Exception Common/Foundation/System Common/Geometry/CoordinateSystem Common/MapGuideCommon/MapLayer Common/MapGuideCommon/Services Common/PlatformBase/Services Server/src/Common/Base Server/src/Common/Manager Server/src/Core Server/src/Gws/GwsCommon Server/src/Gws/GwsCommon/inc Server/src/Gws/Include Server/src/Services/Mapping Server/src/Services/Rendering Server/src/Services/Tile Server/src/UnitTesting Web/src/ApacheAgent Web/src/CgiAgent Web/src/DotNetApi/Foundation Web/src/HttpHandler Web/src/IsapiAgent Web/src/JavaApi/org/osgeo/mapguide Web/src/WebApp

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Fri Mar 26 16:47:32 EDT 2010


Author: brucedechant
Date: 2010-03-26 16:47:31 -0400 (Fri, 26 Mar 2010)
New Revision: 4710

Modified:
   sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSys.cpp
   sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSys.h
   sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysCatalog.cpp
   sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysDatum.cpp
   sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysDatum.h
   sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysEllipsoid.cpp
   sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysEllipsoid.h
   sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysFormatConverter.cpp
   sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp
   sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysTransform.cpp
   sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysUtil.h
   sandbox/adsk/2.2gp/Common/Foundation/Exception/ConfigurationLoadFailedException.cpp
   sandbox/adsk/2.2gp/Common/Foundation/Exception/ConfigurationLoadFailedException.h
   sandbox/adsk/2.2gp/Common/Foundation/Exception/Exception.cpp
   sandbox/adsk/2.2gp/Common/Foundation/Exception/Exception.h
   sandbox/adsk/2.2gp/Common/Foundation/Exception/InvalidArgumentException.cpp
   sandbox/adsk/2.2gp/Common/Foundation/Exception/InvalidArgumentException.h
   sandbox/adsk/2.2gp/Common/Foundation/Exception/ResourcesLoadFailedException.cpp
   sandbox/adsk/2.2gp/Common/Foundation/Exception/ResourcesLoadFailedException.h
   sandbox/adsk/2.2gp/Common/Foundation/Foundation.h
   sandbox/adsk/2.2gp/Common/Foundation/System/Resources.cpp
   sandbox/adsk/2.2gp/Common/Foundation/System/Resources.h
   sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystem.h
   sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h
   sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h
   sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp
   sandbox/adsk/2.2gp/Common/MapGuideCommon/MapLayer/Map.h
   sandbox/adsk/2.2gp/Common/MapGuideCommon/Services/PackageStatusInformation.cpp
   sandbox/adsk/2.2gp/Common/MapGuideCommon/Services/SiteManager.cpp
   sandbox/adsk/2.2gp/Common/PlatformBase/Services/Warnings.cpp
   sandbox/adsk/2.2gp/Common/PlatformBase/Services/Warnings.h
   sandbox/adsk/2.2gp/Server/src/Common/Base/ClientHandler.cpp
   sandbox/adsk/2.2gp/Server/src/Common/Base/ServiceOperation.cpp
   sandbox/adsk/2.2gp/Server/src/Common/Manager/CacheManager.cpp
   sandbox/adsk/2.2gp/Server/src/Common/Manager/LoadBalanceManager.cpp
   sandbox/adsk/2.2gp/Server/src/Common/Manager/LogManager.cpp
   sandbox/adsk/2.2gp/Server/src/Common/Manager/LogThread.cpp
   sandbox/adsk/2.2gp/Server/src/Common/Manager/PackageLogWriter.cpp
   sandbox/adsk/2.2gp/Server/src/Common/Manager/WorkerThread.cpp
   sandbox/adsk/2.2gp/Server/src/Core/OperationThread.cpp
   sandbox/adsk/2.2gp/Server/src/Core/Server.cpp
   sandbox/adsk/2.2gp/Server/src/Core/TimedEventHandler.cpp
   sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/GwsException.cpp
   sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/GwsObjectImpl.cpp
   sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/inc/GwsStatus.h
   sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/inc/GwsThreads.h
   sandbox/adsk/2.2gp/Server/src/Gws/Include/GwsCommon.h
   sandbox/adsk/2.2gp/Server/src/Services/Mapping/MappingUtil.cpp
   sandbox/adsk/2.2gp/Server/src/Services/Mapping/RSMgFeatureReader.cpp
   sandbox/adsk/2.2gp/Server/src/Services/Rendering/ServerRenderingService.cpp
   sandbox/adsk/2.2gp/Server/src/Services/Tile/ServerTileService.cpp
   sandbox/adsk/2.2gp/Server/src/UnitTesting/TestCoordinateSystem.cpp
   sandbox/adsk/2.2gp/Server/src/UnitTesting/TestCoordinateSystem.h
   sandbox/adsk/2.2gp/Server/src/UnitTesting/TestServerAdminService.cpp
   sandbox/adsk/2.2gp/Web/src/ApacheAgent/ApacheResponseHandler.cpp
   sandbox/adsk/2.2gp/Web/src/CgiAgent/CgiResponseHandler.cpp
   sandbox/adsk/2.2gp/Web/src/DotNetApi/Foundation/ManagedException.cs
   sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpGetSiteInfo.cpp
   sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpGetSiteStatus.cpp
   sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpGetSiteVersion.cpp
   sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpResult.cpp
   sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpWmsGetMap.cpp
   sandbox/adsk/2.2gp/Web/src/IsapiAgent/IsapiResponseHandler.cpp
   sandbox/adsk/2.2gp/Web/src/JavaApi/org/osgeo/mapguide/AppThrowable.java
   sandbox/adsk/2.2gp/Web/src/WebApp/WebInvokeScriptCommand.cpp
   sandbox/adsk/2.2gp/Web/src/WebApp/WebInvokeScriptCommand.h
   sandbox/adsk/2.2gp/Web/src/WebApp/WebLayout.cpp
Log:
Fix for trac ticket 1292 - Update to PHP 5.3
http://trac.osgeo.org/mapguide/ticket/1292

Notes:
- Implement RFC89 - http://trac.osgeo.org/mapguide/wiki/MapGuideRfc89


Modified: sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSys.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSys.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSys.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -934,7 +934,7 @@
 //
 //Corresponds to cs_Csdef_::key_nm.
 //
-STRING CCoordinateSystem::GetCode()
+STRING CCoordinateSystem::GetCsCode()
 {
     STRING sName;
 
@@ -942,11 +942,11 @@
     wchar_t* pName = Convert_Ascii_To_Wide(m_csprm.csdef.key_nm);
     if (NULL == pName)
     {
-        throw new MgOutOfMemoryException(L"MgCoordinateSystem.GetCode", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgOutOfMemoryException(L"MgCoordinateSystem.GetCsCode", __LINE__, __WFILE__, NULL, L"", NULL);
     }
     sName=pName;
     delete[] pName;
-    MG_CATCH_AND_THROW(L"MgCoordinateSystem.GetCode")
+    MG_CATCH_AND_THROW(L"MgCoordinateSystem.GetCsCode")
 
     return sName;
 }
@@ -956,27 +956,27 @@
 //Throws an exception MgInvalidArgumentException if the provided string is not
 //a legal coordinate system name.
 //
-void CCoordinateSystem::SetCode(CREFSTRING sCode)
+void CCoordinateSystem::SetCsCode(CREFSTRING sCode)
 {
     MG_TRY()
 
     if (Protected())
     {
         //Can't modify a read-only object.
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
     }
 
     if (sCode.empty())
     {
         //null pointer is obviously not legal...
-        throw new MgInvalidArgumentException(L"MgCoordinateSystem.SetCode", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgInvalidArgumentException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     //Convert to a C++ string, for Mentor's sake
     char *pStr = Convert_Wide_To_Ascii(sCode.c_str()); //need to delete[] pStr
     if (NULL == pStr)
     {
-        throw new MgOutOfMemoryException(L"MgCoordinateSystem.SetCode", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgOutOfMemoryException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     //Try to make a legal name.  CS_nampp() legalizes the
@@ -988,7 +988,7 @@
     {
         //illegal string
         delete [] pStr;
-        throw new MgInvalidArgumentException(L"MgCoordinateSystem.SetCode", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgInvalidArgumentException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     //Copy into the definition
@@ -999,13 +999,13 @@
     delete [] pStr;
 
     //And we're done!
-    MG_CATCH_AND_THROW(L"MgCoordinateSystem.SetCode")
+    MG_CATCH_AND_THROW(L"MgCoordinateSystem.SetCsCode")
 }
 
 //Checks whether the specified string is a legal
 //coordinate system key name.
 //
-bool CCoordinateSystem::IsLegalCode(CREFSTRING sCode)
+bool CCoordinateSystem::IsLegalCsCode(CREFSTRING sCode)
 {
     return IsLegalMentorName(sCode.c_str());
 }
@@ -1309,7 +1309,7 @@
         {
             Ptr<MgStringCollection> pCsNameColl=pEnumSystemsInCategory->NextName(1);
             if (1 != pCsNameColl->GetCount()) break;
-            if (GetCode()==pCsNameColl->GetItem(0))
+            if (GetCsCode()==pCsNameColl->GetItem(0))
             {
                 //we are in this category, let's get it and move on to the next category
                 pCategoryNames->Add(pCtDef->GetName());

Modified: sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSys.h
===================================================================
--- sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSys.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSys.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -63,7 +63,7 @@
     virtual double GetMinY();  /// __get
     virtual double GetMaxX();  /// __get
     virtual double GetMaxY();  /// __get
-    virtual STRING GetCode();  /// __get
+    virtual STRING GetCsCode();  /// __get
     virtual STRING GetDescription();  /// __get
     virtual STRING GetProjection();  /// __get
     virtual STRING GetProjectionDescription();  /// __get
@@ -76,8 +76,8 @@
     virtual MgStringCollection* GetCategories();
     virtual MgCoordinateSystemCatalog* GetCatalog();
     virtual void SetCatalog(MgCoordinateSystemCatalog* pCatalog);
-    virtual void SetCode(CREFSTRING sCode);
-    virtual bool IsLegalCode(CREFSTRING sCode);
+    virtual void SetCsCode(CREFSTRING sCode);
+    virtual bool IsLegalCsCode(CREFSTRING sCode);
     virtual bool IsValid();
     virtual bool IsUsable(MgCoordinateSystemCatalog *pCatalog);
     virtual bool IsSameAs(MgGuardDisposable *pDef);

Modified: sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysCatalog.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysCatalog.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysCatalog.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -42,16 +42,10 @@
 #include "csNameMapper.hpp"                 //for csReleaseNameMapper
 
 #ifdef _WIN32
-#ifdef UNICODE
-#define GetMessage  GetMessageW
-#else
-#define GetMessage  GetMessageA
-#endif // !UNICODE
 #include <atlbase.h>
 #include <atlconv.h>
 #include <tchar.h>                          //for _tsplitpath
 #include <shlobj.h>                         //for SHGetFolderPath
-#undef GetMessage
 #endif
 
 #ifndef _WIN32

Modified: sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysDatum.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysDatum.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysDatum.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -187,7 +187,7 @@
 //
 //Corresponds to cs_Dtdef_::key_nm.
 //
-STRING CCoordinateSystemDatum::GetCode()
+STRING CCoordinateSystemDatum::GetDtCode()
 {
     STRING sCode;
 
@@ -195,11 +195,11 @@
     wchar_t* pName = Convert_Ascii_To_Wide(m_DtDef.key_nm);
     if (NULL == pName)
     {
-        throw new MgOutOfMemoryException(L"MgCoordinateSystemDatum.GetCode", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgOutOfMemoryException(L"MgCoordinateSystemDatum.GetDtCode", __LINE__, __WFILE__, NULL, L"", NULL);
     }
     sCode=pName;
     delete[] pName;
-    MG_CATCH_AND_THROW(L"MgCoordinateSystemDatum.GetCode")
+    MG_CATCH_AND_THROW(L"MgCoordinateSystemDatum.GetDtCode")
 
     return sCode;
 }
@@ -209,27 +209,27 @@
 //if the provided string is not
 //a legal datum name.
 //
-void CCoordinateSystemDatum::SetCode(CREFSTRING sCode)
+void CCoordinateSystemDatum::SetDtCode(CREFSTRING sCode)
 {
     MG_TRY()
 
     if (Protected())
     {
         //Can't modify a read-only object.
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemDatum.SetCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
+        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemDatum.SetDtCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
     }
 
     if (sCode.empty())
     {
         //null pointer is obviously not legal...
-        throw new MgInvalidArgumentException(L"MgCoordinateSystemDatum.SetCode", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgInvalidArgumentException(L"MgCoordinateSystemDatum.SetDtCode", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     //Convert to a C++ string, for Mentor's sake
     char *pStr = Convert_Wide_To_Ascii(sCode.c_str()); //need to delete[] pStr
     if (NULL == pStr)
     {
-        throw new MgOutOfMemoryException(L"MgCoordinateSystemDatum.SetCode", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgOutOfMemoryException(L"MgCoordinateSystemDatum.SetDtCode", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     //Try to make a legal name.  CS_nampp() legalizes the
@@ -241,7 +241,7 @@
     {
         //illegal string
         delete [] pStr;
-        throw new MgInvalidArgumentException(L"MgCoordinateSystemDatum.SetCode", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgInvalidArgumentException(L"MgCoordinateSystemDatum.SetDtCode", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     //Copy into the definitions, dtdef and cs_datum_ must be in synch
@@ -255,12 +255,12 @@
     delete [] pStr;
 
     //And we're done!
-    MG_CATCH_AND_THROW(L"MgCoordinateSystemDatum.SetCode")
+    MG_CATCH_AND_THROW(L"MgCoordinateSystemDatum.SetDtCode")
 }
 
 //Checks whether the specified string is a legal datum key name.
 //
-bool CCoordinateSystemDatum::IsLegalCode(CREFSTRING sCode)
+bool CCoordinateSystemDatum::IsLegalDtCode(CREFSTRING sCode)
 {
     return IsLegalMentorName(sCode.c_str());
 }
@@ -808,7 +808,7 @@
         throw new MgNullArgumentException(L"MgCoordinateSystemDatum.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
-    STRING sEllipsoid=pEllipsoidDef->GetCode();
+    STRING sEllipsoid=pEllipsoidDef->GetElCode();
 
     //Make sure it's a legal datum name
     if (!IsLegalMentorName(sEllipsoid.c_str()))

Modified: sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysDatum.h
===================================================================
--- sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysDatum.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysDatum.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -30,9 +30,9 @@
     void InitFromCatalog(const cs_Dtdef_& def);
     void GetMentorDef(cs_Dtdef_& def){def=m_DtDef;};
 
-    virtual STRING GetCode();
-    virtual void SetCode(CREFSTRING sCode);
-    virtual bool IsLegalCode(CREFSTRING sCode);
+    virtual STRING GetDtCode();
+    virtual void SetDtCode(CREFSTRING sCode);
+    virtual bool IsLegalDtCode(CREFSTRING sCode);
     virtual bool IsValid();
     virtual bool IsUsable(MgCoordinateSystemCatalog *pCatalog);
     virtual bool IsSameAs(MgGuardDisposable *pDef);

Modified: sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysEllipsoid.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysEllipsoid.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysEllipsoid.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -111,7 +111,7 @@
 //
 //Corresponds to cs_Eldef_::key_nm.
 //
-STRING CCoordinateSystemEllipsoid::GetCode()
+STRING CCoordinateSystemEllipsoid::GetElCode()
 {
     STRING sName;
 
@@ -120,11 +120,11 @@
     wchar_t *pName = Convert_Ascii_To_Wide(m_def.key_nm);
     if (NULL == pName)
     {
-        throw new MgOutOfMemoryException(L"MgCoordinateSystemEllipsoidEllipsoid.GetCode", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgOutOfMemoryException(L"MgCoordinateSystemEllipsoidEllipsoid.GetElCode", __LINE__, __WFILE__, NULL, L"", NULL);
     }
     sName=pName;
     delete[] pName;
-    MG_CATCH_AND_THROW(L"MgCoordinateSystemEllipsoidEllipsoid.SetProjectionCode")
+    MG_CATCH_AND_THROW(L"MgCoordinateSystemEllipsoidEllipsoid.GetElCode")
 
     return sName;
 }
@@ -132,26 +132,26 @@
 //Sets the key name of the ellipsoid.
 //Throws an exception if the provided string is not
 //a legal ellipsoid name.
-void CCoordinateSystemEllipsoid::SetCode(CREFSTRING sCode)
+void CCoordinateSystemEllipsoid::SetElCode(CREFSTRING sCode)
 {
     MG_TRY()
 
     if (Protected())
     {
         //Can't modify a read-only object.
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemEllipsoid.SetCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemEllipsoidProtectedException", NULL);
+        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemEllipsoidProtectedException", NULL);
     }
 
     if (sCode.empty())
     {
-        throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.SetCode", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     //Convert to a C++ string, for Mentor's sake
     char *pStr = Convert_Wide_To_Ascii(sCode.c_str()); //need to delete[] pStr
     if (NULL == pStr)
     {
-        throw new MgOutOfMemoryException(L"MgCoordinateSystemEllipsoid.SetCode", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgOutOfMemoryException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     //Try to make a legal name.  CS_nampp() legalizes the
@@ -163,7 +163,7 @@
     {
         //illegal string
         delete [] pStr;
-        throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.SetCode", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     //Copy into the definition
@@ -174,11 +174,11 @@
     delete [] pStr;
 
     //And we're done!
-    MG_CATCH_AND_THROW(L"MgCoordinateSystemEllipsoid.SetCode")
+    MG_CATCH_AND_THROW(L"MgCoordinateSystemEllipsoid.SetElCode")
 }
 
 //Checks whether the specified string is a legal ellipsoid key name.
-bool CCoordinateSystemEllipsoid::IsLegalCode(CREFSTRING sCode)
+bool CCoordinateSystemEllipsoid::IsLegalElCode(CREFSTRING sCode)
 {
     return IsLegalMentorName(sCode.c_str());
 }

Modified: sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysEllipsoid.h
===================================================================
--- sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysEllipsoid.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysEllipsoid.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -30,9 +30,9 @@
     void GetMentorDef(cs_Eldef_& def){def=m_def;};
 
     //MgCoordinateSystemEllipsoid
-    virtual STRING GetCode();  /// __get
-    virtual void SetCode(CREFSTRING sCode);
-    virtual bool IsLegalCode(CREFSTRING sCode);
+    virtual STRING GetElCode();  /// __get
+    virtual void SetElCode(CREFSTRING sCode);
+    virtual bool IsLegalElCode(CREFSTRING sCode);
     virtual bool IsValid();
     virtual bool IsUsable();
     virtual bool IsSameAs(MgGuardDisposable *pDef);

Modified: sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysFormatConverter.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysFormatConverter.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysFormatConverter.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -300,7 +300,7 @@
 
             if (NULL != pCsFromDict.p)
             {
-                sCsNameFromDict=pCsFromDict->GetCode();
+                sCsNameFromDict=pCsFromDict->GetCsCode();
                 sDtNameFromDict=pCsFromDict->GetDatum();
                 sElNameFromDict=pCsFromDict->GetEllipsoid();
 
@@ -744,7 +744,7 @@
     }
 
     //get the name of the source system
-    STRING sCsSource=pSource->GetCode();
+    STRING sCsSource=pSource->GetCsCode();
     if (sCsSource.empty())
     {
         throw new MgInvalidArgumentException(L"MgCoordinateSystemFormatConverter.DefinitionToCode", __LINE__, __WFILE__, NULL, L"", NULL);

Modified: sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -402,7 +402,7 @@
         return false;
     }
     //if not WGS84 for the target system, bye bye!
-    if (m_pDtTarget->GetCode()!=kpWGS84Datum)
+    if (m_pDtTarget->GetDtCode()!=kpWGS84Datum)
     {
         return false;
     }
@@ -491,7 +491,7 @@
         throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"", NULL);
     }
     //if not WGS84 for the target system, bye bye!
-    if (m_pDtTarget->GetCode()!=kpWGS84Datum)
+    if (m_pDtTarget->GetDtCode()!=kpWGS84Datum)
     {
         throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
     }
@@ -630,7 +630,7 @@
         throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetBursaWolfeTransform", __LINE__, __WFILE__, NULL, L"", NULL);
     }
     //if not WGS84 for the target system, bye bye!
-    if (m_pDtTarget->GetCode()!=kpWGS84Datum)
+    if (m_pDtTarget->GetDtCode()!=kpWGS84Datum)
     {
         throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetBursaWolfeTransform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
     }
@@ -712,7 +712,7 @@
         throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"", NULL);
     }
     //if not WGS84 for the target system, bye bye!
-    if (m_pDtTarget->GetCode()!=kpWGS84Datum)
+    if (m_pDtTarget->GetDtCode()!=kpWGS84Datum)
     {
         throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
     }

Modified: sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysTransform.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysTransform.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysTransform.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -436,7 +436,7 @@
 
     // Leave commented except for temporary debugging.  The printf output gets
     // sent to stdout and ends up being included in the web-tier HTTP response.
-//  printf("\nTransform(envelope) -- Source: %S  Dest: %S\n", m_pCsSource->GetCode().c_str(), m_pCsTarget->GetCode().c_str());
+//  printf("\nTransform(envelope) -- Source: %S  Dest: %S\n", m_pCsSource->GetCsCode().c_str(), m_pCsTarget->GetCsCode().c_str());
 
     if((m_pCsSource->GetType() == MgCoordinateSystemType::Projected) && (m_pCsTarget->GetType() == MgCoordinateSystemType::Geographic))
     {

Modified: sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysUtil.h
===================================================================
--- sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysUtil.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/CoordinateSystem/CoordSysUtil.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -30,8 +30,6 @@
 
 #ifdef WIN32
 #include "windows.h"
-// To undefine GetMessage macro defined in windows
-#undef GetMessage
 #endif // WIN32 defined
 
 // Mentor specific information

Modified: sandbox/adsk/2.2gp/Common/Foundation/Exception/ConfigurationLoadFailedException.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/Foundation/Exception/ConfigurationLoadFailedException.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Foundation/Exception/ConfigurationLoadFailedException.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -43,7 +43,7 @@
 /// \brief
 /// Retrieve the formatted exception message for the specified locale.
 ///
-STRING MgConfigurationLoadFailedException::GetMessage(CREFSTRING locale) throw()
+STRING MgConfigurationLoadFailedException::GetExceptionMessage(CREFSTRING locale) throw()
 {
-    return MgException::GetMessage(locale, MgResources::FailedToLoadConfigurationFile);
+    return MgException::GetExceptionMessage(locale, MgResources::FailedToLoadConfigurationFile);
 }

Modified: sandbox/adsk/2.2gp/Common/Foundation/Exception/ConfigurationLoadFailedException.h
===================================================================
--- sandbox/adsk/2.2gp/Common/Foundation/Exception/ConfigurationLoadFailedException.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Foundation/Exception/ConfigurationLoadFailedException.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -68,7 +68,7 @@
     /// \return
     /// Formatted exception message
     ///
-    virtual STRING GetMessage(CREFSTRING locale) throw();
+    virtual STRING GetExceptionMessage(CREFSTRING locale) throw();
 
 INTERNAL_API:
 

Modified: sandbox/adsk/2.2gp/Common/Foundation/Exception/Exception.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/Foundation/Exception/Exception.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Foundation/Exception/Exception.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -17,11 +17,6 @@
 
 #include "Foundation.h"
 
-// To undefine GetMessage macro defined in windows
-#ifdef _WIN32
-    #undef GetMessage
-#endif
-
 IMPLEMENT_EXCEPTION_ABSTRACT(MgException)
 
 MgException::LocaleCallbackFunc MgException::sm_localeCallbackFunc = NULL;
@@ -437,7 +432,7 @@
 /// This method should be called for critical errors when the configuration
 /// or resource file has not been loaded.
 ///
-STRING MgException::GetMessage(CREFSTRING locale, CREFSTRING resourceStr) throw()
+STRING MgException::GetExceptionMessage(CREFSTRING locale, CREFSTRING resourceStr) throw()
 {
     //
     // Format:
@@ -475,7 +470,7 @@
 /// \brief
 /// Retrieve the formatted exception message for the specified locale.
 ///
-STRING MgException::GetMessage(CREFSTRING locale) throw()
+STRING MgException::GetExceptionMessage(CREFSTRING locale) throw()
 {
     //
     // Format:
@@ -535,7 +530,7 @@
 
     if (m_details.empty())
     {
-        m_details = GetMessage(locale);
+        m_details = GetExceptionMessage(locale);
         m_details += L"\n";
         m_details += FormatDetails(locale);
     }
@@ -579,9 +574,9 @@
 /// \brief
 /// Retrieve the formatted exception message for the specified locale.
 ///
-STRING MgException::GetMessage() throw()
+STRING MgException::GetExceptionMessage() throw()
 {
-    return GetMessage(GetLocale());
+    return GetExceptionMessage(GetLocale());
 }
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: sandbox/adsk/2.2gp/Common/Foundation/Exception/Exception.h
===================================================================
--- sandbox/adsk/2.2gp/Common/Foundation/Exception/Exception.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Foundation/Exception/Exception.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -20,11 +20,6 @@
 
 /// \ingroup Exceptions_Module
 
-// To undefine GetMessage macro defined in windows
-#ifdef _WIN32
-    #undef GetMessage
-#endif
-
 class MgByteReader;
 class MgStringCollection;
 
@@ -45,20 +40,20 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// string GetMessage() throw();
+    /// string GetExceptionMessage() throw();
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// String GetMessage() throw();
+    /// String GetExceptionMessage() throw();
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// string GetMessage() throw();
+    /// string GetExceptionMessage() throw();
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \return
     /// Localized exception message.  See MgSiteConnection for information on specifying
     /// the locale.
     ///
-    STRING GetMessage() throw();
+    STRING GetExceptionMessage() throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
@@ -120,7 +115,7 @@
     /// \return
     /// Formatted exception message
     ///
-    virtual STRING GetMessage(CREFSTRING locale) throw();
+    virtual STRING GetExceptionMessage(CREFSTRING locale) throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
@@ -274,7 +269,7 @@
     /// This method should be called for critical errors when the configuration
     /// or resource file has not been loaded.
     ///
-    STRING GetMessage(CREFSTRING locale, CREFSTRING resourceStr) throw();
+    STRING GetExceptionMessage(CREFSTRING locale, CREFSTRING resourceStr) throw();
 
 private:
 

Modified: sandbox/adsk/2.2gp/Common/Foundation/Exception/InvalidArgumentException.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/Foundation/Exception/InvalidArgumentException.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Foundation/Exception/InvalidArgumentException.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -45,7 +45,7 @@
 /// <param name="nLocale">The locale identifier to format the message text.</param>
 ///
 ///
-STRING MgInvalidArgumentException::GetMessage(CREFSTRING locale) throw()
+STRING MgInvalidArgumentException::GetExceptionMessage(CREFSTRING locale) throw()
 {
     //
     // Format:

Modified: sandbox/adsk/2.2gp/Common/Foundation/Exception/InvalidArgumentException.h
===================================================================
--- sandbox/adsk/2.2gp/Common/Foundation/Exception/InvalidArgumentException.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Foundation/Exception/InvalidArgumentException.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -73,7 +73,7 @@
     /// \return
     /// Formatted exception message
     ///
-    virtual STRING GetMessage(CREFSTRING locale) throw();
+    virtual STRING GetExceptionMessage(CREFSTRING locale) throw();
 
 CLASS_ID:
 

Modified: sandbox/adsk/2.2gp/Common/Foundation/Exception/ResourcesLoadFailedException.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/Foundation/Exception/ResourcesLoadFailedException.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Foundation/Exception/ResourcesLoadFailedException.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -43,7 +43,7 @@
 /// \brief
 /// Retrieve the formatted exception message for the specified locale.
 ///
-STRING MgResourcesLoadFailedException::GetMessage(CREFSTRING locale) throw()
+STRING MgResourcesLoadFailedException::GetExceptionMessage(CREFSTRING locale) throw()
 {
-    return MgException::GetMessage(locale, MgResources::FailedToLoadResourcesFile);
+    return MgException::GetExceptionMessage(locale, MgResources::FailedToLoadResourcesFile);
 }

Modified: sandbox/adsk/2.2gp/Common/Foundation/Exception/ResourcesLoadFailedException.h
===================================================================
--- sandbox/adsk/2.2gp/Common/Foundation/Exception/ResourcesLoadFailedException.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Foundation/Exception/ResourcesLoadFailedException.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -76,7 +76,7 @@
     /// \return
     /// Formatted exception message
     ///
-    virtual STRING GetMessage(CREFSTRING locale) throw();
+    virtual STRING GetExceptionMessage(CREFSTRING locale) throw();
 
 CLASS_ID:
 

Modified: sandbox/adsk/2.2gp/Common/Foundation/Foundation.h
===================================================================
--- sandbox/adsk/2.2gp/Common/Foundation/Foundation.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Foundation/Foundation.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -68,7 +68,6 @@
 #include "ace/Process_Manager.h"
 #include "ace/Date_Time.h"
 
-#undef GetMessage
 #undef GetObject
 #include "FoundationDefs.h"
 #include "System/FoundationClassId.h"

Modified: sandbox/adsk/2.2gp/Common/Foundation/System/Resources.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/Foundation/System/Resources.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Foundation/System/Resources.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -592,7 +592,7 @@
 /// \return
 /// The formatted message string.
 ///
-STRING MgResources::GetMessage(CREFSTRING section, CREFSTRING resourceId,
+STRING MgResources::GetResourceMessage(CREFSTRING section, CREFSTRING resourceId,
     MgStringCollection* arguments)
 {
     STRING message;
@@ -616,7 +616,7 @@
 
     message = FormatMessage(resourceStr, arguments);
 
-    MG_RESOURCES_CATCH_AND_THROW(L"MgResources.GetMessage")
+    MG_RESOURCES_CATCH_AND_THROW(L"MgResources.GetResourceMessage")
 
     return message;
 }

Modified: sandbox/adsk/2.2gp/Common/Foundation/System/Resources.h
===================================================================
--- sandbox/adsk/2.2gp/Common/Foundation/System/Resources.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Foundation/System/Resources.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -161,7 +161,7 @@
     /// \return
     /// The formatted message string.
     ///
-    STRING GetMessage(CREFSTRING section, CREFSTRING resourceId,
+    STRING GetResourceMessage(CREFSTRING section, CREFSTRING resourceId,
         MgStringCollection* arguments);
 
     /// Resource Components

Modified: sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystem.h
===================================================================
--- sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystem.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystem.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -49,7 +49,7 @@
     virtual double GetMinY()=0;  /// __get
     virtual double GetMaxX()=0;  /// __get
     virtual double GetMaxY()=0;  /// __get
-    virtual STRING GetCode()=0;  /// __get
+    virtual STRING GetCsCode()=0;  /// __get
     virtual STRING GetDescription()=0;  /// __get
     virtual STRING GetProjection()=0;  /// __get
     virtual STRING GetProjectionDescription()=0;  /// __get
@@ -61,8 +61,8 @@
     virtual MgCoordinateSystemMeasure* GetMeasure()=0;
     virtual MgStringCollection* GetCategories()=0;
     virtual MgCoordinateSystemCatalog* GetCatalog()=0;
-    virtual void SetCode(CREFSTRING sCode)=0;
-    virtual bool IsLegalCode(CREFSTRING sCode)=0;
+    virtual void SetCsCode(CREFSTRING sCode)=0;
+    virtual bool IsLegalCsCode(CREFSTRING sCode)=0;
     virtual bool IsValid()=0;
     virtual bool IsUsable(MgCoordinateSystemCatalog *pCatalog)=0;
     virtual bool IsSameAs(MgGuardDisposable *pDef)=0;

Modified: sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h
===================================================================
--- sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -26,9 +26,9 @@
     DECLARE_CLASSNAME(MgCoordinateSystemDatum)
 
 PUBLISHED_API:
-    virtual STRING GetCode()=0;
-    virtual void SetCode(CREFSTRING sCode)=0;
-    virtual bool IsLegalCode(CREFSTRING sCode)=0;
+    virtual STRING GetDtCode()=0;
+    virtual void SetDtCode(CREFSTRING sCode)=0;
+    virtual bool IsLegalDtCode(CREFSTRING sCode)=0;
     virtual bool IsValid()=0;
     virtual bool IsUsable(MgCoordinateSystemCatalog *pCatalog)=0;
     virtual bool IsSameAs(MgGuardDisposable *pDef)=0;

Modified: sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h
===================================================================
--- sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -23,9 +23,9 @@
     DECLARE_CLASSNAME(MgCoordinateSystemEllipsoid)
 
 PUBLISHED_API:
-    virtual STRING GetCode()=0;  /// __get
-    virtual void SetCode(CREFSTRING sCode)=0;
-    virtual bool IsLegalCode(CREFSTRING sCode)=0;
+    virtual STRING GetElCode()=0;  /// __get
+    virtual void SetElCode(CREFSTRING sCode)=0;
+    virtual bool IsLegalElCode(CREFSTRING sCode)=0;
     virtual bool IsValid()=0;
     virtual bool IsUsable()=0;
     virtual bool IsSameAs(MgGuardDisposable *pDef)=0;

Modified: sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -402,7 +402,7 @@
 
         // Coordinate system properties
         // Add the Code
-        pProperty = new MgStringProperty(CCoordinateSystem::CoordinateSystemCode, pCsDef->GetCode());
+        pProperty = new MgStringProperty(CCoordinateSystem::CoordinateSystemCode, pCsDef->GetCsCode());
         pCoordSysProperties->Add(pProperty);
 
         // Add the Description

Modified: sandbox/adsk/2.2gp/Common/MapGuideCommon/MapLayer/Map.h
===================================================================
--- sandbox/adsk/2.2gp/Common/MapGuideCommon/MapLayer/Map.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/MapGuideCommon/MapLayer/Map.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -128,7 +128,7 @@
 /// }
 /// catch (MgException $e)
 /// {
-///     echo "ERROR: " . $e->GetMessage() . "n";
+///     echo "ERROR: " . $e->GetExceptionMessage() . "n";
 ///     echo $e->GetDetails() . "n";
 ///     echo $e->GetStackTrace() . "n";
 /// }

Modified: sandbox/adsk/2.2gp/Common/MapGuideCommon/Services/PackageStatusInformation.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/MapGuideCommon/Services/PackageStatusInformation.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/MapGuideCommon/Services/PackageStatusInformation.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -246,7 +246,7 @@
     }
     else
     {
-        statusMessage = resources->GetMessage(MgResources::ResourceService,
+        statusMessage = resources->GetResourceMessage(MgResources::ResourceService,
             resourceId, &arguments);
     }
 

Modified: sandbox/adsk/2.2gp/Common/MapGuideCommon/Services/SiteManager.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/MapGuideCommon/Services/SiteManager.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/MapGuideCommon/Services/SiteManager.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -78,7 +78,7 @@
                     if(NULL != mgException.p)
                     {
                         // Exception was thrown
-                        STRING message = mgException->GetMessage();
+                        STRING message = mgException->GetExceptionMessage();
                     }
                 }
             }

Modified: sandbox/adsk/2.2gp/Common/PlatformBase/Services/Warnings.cpp
===================================================================
--- sandbox/adsk/2.2gp/Common/PlatformBase/Services/Warnings.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/PlatformBase/Services/Warnings.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -18,11 +18,6 @@
 #include "PlatformBase.h"
 #include <assert.h>
 
-// To undefine GetMessage macro defined in windows
-#ifdef _WIN32
-    #undef GetMessage
-#endif
-
 MG_IMPL_DYNCREATE(MgWarnings);
 
 

Modified: sandbox/adsk/2.2gp/Common/PlatformBase/Services/Warnings.h
===================================================================
--- sandbox/adsk/2.2gp/Common/PlatformBase/Services/Warnings.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Common/PlatformBase/Services/Warnings.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -22,11 +22,6 @@
 /// \ingroup Common_Module
 /// \{
 
-// To undefine GetMessage macro defined in windows
-#ifdef _WIN32
-    #undef GetMessage
-#endif
-
 class MgWarnings;
 template class MG_PLATFORMBASE_API Ptr<MgWarnings>;
 

Modified: sandbox/adsk/2.2gp/Server/src/Common/Base/ClientHandler.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Common/Base/ClientHandler.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Common/Base/ClientHandler.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -178,7 +178,7 @@
         stream = new MgMapGuideStream( m_pStreamHelper );
 
         // TODO: use locale from client connection
-        mgException->GetMessage(MgResources::DefaultMessageLocale);
+        mgException->GetExceptionMessage(MgResources::DefaultMessageLocale);
         mgException->GetDetails(MgResources::DefaultMessageLocale);
         mgException->GetStackTrace(MgResources::DefaultMessageLocale);
 

Modified: sandbox/adsk/2.2gp/Server/src/Common/Base/ServiceOperation.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Common/Base/ServiceOperation.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Common/Base/ServiceOperation.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -233,7 +233,7 @@
             }
         }
 
-        STRING message = except->GetMessage(locale);
+        STRING message = except->GetExceptionMessage(locale);
         STRING details = except->GetDetails(locale);
         STRING stackTrace = except->GetStackTrace(locale);
 
@@ -609,7 +609,7 @@
         m_currConnection->SetCurrentOperationStatus(MgConnection::OpFailed);
     }
 
-    except->GetMessage();
+    except->GetExceptionMessage();
     except->GetDetails();
     except->GetStackTrace();
 

Modified: sandbox/adsk/2.2gp/Server/src/Common/Manager/CacheManager.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Common/Manager/CacheManager.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Common/Manager/CacheManager.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -234,7 +234,7 @@
         {
             MgResources* resources = MgResources::GetInstance();
             ACE_ASSERT(NULL != resources);
-            STRING message = resources->GetMessage(MgResources::FeatureService,
+            STRING message = resources->GetResourceMessage(MgResources::FeatureService,
                 L"MgInvalidFdoProvider", NULL);
             MgStringCollection arguments;
             arguments.Add(message);

Modified: sandbox/adsk/2.2gp/Server/src/Common/Manager/LoadBalanceManager.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Common/Manager/LoadBalanceManager.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Common/Manager/LoadBalanceManager.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -678,7 +678,7 @@
 
             ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
             MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
-            MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+            MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
 
             SAFE_RELEASE(e);
         }
@@ -768,7 +768,7 @@
 
             ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
             MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
-            MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+            MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
 
             SAFE_RELEASE(e);
         }
@@ -973,7 +973,7 @@
 
                 ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
                 MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
-                MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+                MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
 
                 SAFE_RELEASE(e);
             }
@@ -1579,7 +1579,7 @@
 
                 ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
                 MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
-                MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+                MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
 
                 SAFE_RELEASE(e);
             }
@@ -1649,7 +1649,7 @@
 
                     ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
                     MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
-                    MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+                    MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
 
                     SAFE_RELEASE(e);
                 }
@@ -1751,7 +1751,7 @@
 
                 ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
                 MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
-                MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+                MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
 
                 SAFE_RELEASE(e);
             }
@@ -1778,7 +1778,7 @@
 
             ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
             MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
-            MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+            MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
 
             SAFE_RELEASE(e);
         }
@@ -1845,7 +1845,7 @@
 
                 ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
                 MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
-                MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+                MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
 
                 SAFE_RELEASE(e);
             }
@@ -1873,7 +1873,7 @@
 
             ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
             MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
-            MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+            MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
 
             SAFE_RELEASE(e);
         }

Modified: sandbox/adsk/2.2gp/Server/src/Common/Manager/LogManager.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Common/Manager/LogManager.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Common/Manager/LogManager.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -2041,7 +2041,7 @@
     if (mgException != NULL)
     {
         // Use default message with just the given info.
-        logEntry = mgException->GetMessage();
+        logEntry = mgException->GetExceptionMessage();
     }
 
     QueueLogEntry(mltPerformance, logEntry, LM_INFO);
@@ -2198,7 +2198,7 @@
         ACE_ASSERT(NULL != serverManager);
 
         STRING locale = serverManager->GetDefaultMessageLocale();
-        STRING message = except->GetMessage(locale);
+        STRING message = except->GetExceptionMessage(locale);
         STRING details = except->GetDetails(locale);
         STRING stackTrace = except->GetStackTrace(locale);
 

Modified: sandbox/adsk/2.2gp/Server/src/Common/Manager/LogThread.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Common/Manager/LogThread.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Common/Manager/LogThread.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -98,7 +98,7 @@
                             MgServerManager* pServerManager = MgServerManager::GetInstance();
 
                             ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
-                            MG_LOG_EXCEPTION_ENTRY(e->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+                            MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
 
                             SAFE_RELEASE(e);
                         }
@@ -118,7 +118,7 @@
 
                             mgException = new MgFdoException(L"MgLogThread.svc", __LINE__, __WFILE__, NULL, messageId, &arguments);
                             ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
-                            MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+                            MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
 
                             FDO_SAFE_RELEASE(e);
                         }
@@ -128,7 +128,7 @@
 
                             mgException = MgSystemException::Create(e, L"MgLogThread.svc", __LINE__, __WFILE__);
                             ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
-                            MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+                            MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
                         }
                         catch(...)
                         {
@@ -136,7 +136,7 @@
 
                             mgException = new MgUnclassifiedException(L"MgLogThread.svc", __LINE__, __WFILE__, NULL, L"", NULL);
                             ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
-                            MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+                            MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
                         }
                     }
                 }
@@ -152,7 +152,7 @@
         MgServerManager* pServerManager = MgServerManager::GetInstance();
 
         ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
-        MG_LOG_EXCEPTION_ENTRY(e->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+        MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
 
         SAFE_RELEASE(e);
 
@@ -164,7 +164,7 @@
 
         mgException = MgSystemException::Create(e, L"MgLogThread.svc", __LINE__, __WFILE__);
         ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
-        MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+        MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
 
         nResult = -1;
     }
@@ -174,7 +174,7 @@
 
         mgException = new MgUnclassifiedException(L"MgLogThread.svc", __LINE__, __WFILE__, NULL, L"", NULL);
         ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
-        MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+        MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
 
         nResult = -1;
     }

Modified: sandbox/adsk/2.2gp/Server/src/Common/Manager/PackageLogWriter.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Common/Manager/PackageLogWriter.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Common/Manager/PackageLogWriter.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -53,7 +53,7 @@
     else
     {
         m_statusInfo.SetStatusCode(MgPackageStatusCode::Failed);
-        m_statusInfo.SetErrorMessage(except->GetMessage());
+        m_statusInfo.SetErrorMessage(except->GetExceptionMessage());
         m_statusInfo.SetStackTrace(except->GetStackTrace());
     }
 }

Modified: sandbox/adsk/2.2gp/Server/src/Common/Manager/WorkerThread.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Common/Manager/WorkerThread.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Common/Manager/WorkerThread.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -104,7 +104,7 @@
                             MgServerManager* pServerManager = MgServerManager::GetInstance();
 
                             ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
-                            MG_LOG_EXCEPTION_ENTRY(e->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+                            MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
 
                             SAFE_RELEASE(e);
                         }
@@ -124,7 +124,7 @@
 
                             mgException = new MgFdoException(L"MgWorkerThread.svc", __LINE__, __WFILE__, NULL, messageId, &arguments);
                             ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
-                            MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+                            MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
 
                             FDO_SAFE_RELEASE(e);
                         }
@@ -134,7 +134,7 @@
 
                             mgException = MgSystemException::Create(e, L"MgWorkerThread.svc", __LINE__, __WFILE__);
                             ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
-                            MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+                            MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
                         }
                         catch(...)
                         {
@@ -142,7 +142,7 @@
 
                             mgException = new MgUnclassifiedException(L"MgWorkerThread.svc", __LINE__, __WFILE__, NULL, L"", NULL);
                             ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
-                            MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+                            MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
                         }
                     }
                 }
@@ -158,7 +158,7 @@
         MgServerManager* pServerManager = MgServerManager::GetInstance();
 
         ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
-        MG_LOG_EXCEPTION_ENTRY(e->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+        MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
 
         SAFE_RELEASE(e);
 
@@ -170,7 +170,7 @@
 
         mgException = MgSystemException::Create(e, L"MgWorkerThread.svc", __LINE__, __WFILE__);
         ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
-        MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+        MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
 
         nResult = -1;
     }
@@ -180,7 +180,7 @@
 
         mgException = new MgUnclassifiedException(L"MgWorkerThread.svc", __LINE__, __WFILE__, NULL, L"", NULL);
         ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
-        MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+        MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
 
         nResult = -1;
     }

Modified: sandbox/adsk/2.2gp/Server/src/Core/OperationThread.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Core/OperationThread.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Core/OperationThread.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -151,7 +151,7 @@
         MgServerManager* serverManager = MgServerManager::GetInstance();
         STRING locale = (NULL == serverManager) ?
             MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
-        STRING message = mgException->GetMessage(locale);
+        STRING message = mgException->GetExceptionMessage(locale);
         STRING details = mgException->GetDetails(locale);
         STRING stackTrace = mgException->GetStackTrace(locale);
 
@@ -281,7 +281,7 @@
             MgServerManager* serverManager = MgServerManager::GetInstance();
             STRING locale = (NULL == serverManager) ?
                 MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
-            STRING message = mgException->GetMessage(locale);
+            STRING message = mgException->GetExceptionMessage(locale);
             STRING details = mgException->GetDetails(locale);
             STRING stackTrace = mgException->GetStackTrace(locale);
 
@@ -435,7 +435,7 @@
         MgServerManager* serverManager = MgServerManager::GetInstance();
         STRING locale = (NULL == serverManager) ?
             MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
-        STRING message = mgException->GetMessage(locale);
+        STRING message = mgException->GetExceptionMessage(locale);
         STRING details = mgException->GetDetails(locale);
         STRING stackTrace = mgException->GetStackTrace(locale);
 

Modified: sandbox/adsk/2.2gp/Server/src/Core/Server.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Core/Server.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Core/Server.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -1121,7 +1121,7 @@
         MgServerManager* serverManager = MgServerManager::GetInstance();
         STRING locale = (NULL == serverManager) ?
             MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
-        STRING message = mgException->GetMessage(locale);
+        STRING message = mgException->GetExceptionMessage(locale);
         STRING details = mgException->GetDetails(locale);
         STRING stackTrace = mgException->GetStackTrace(locale);
 

Modified: sandbox/adsk/2.2gp/Server/src/Core/TimedEventHandler.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Core/TimedEventHandler.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Core/TimedEventHandler.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -153,7 +153,7 @@
         CREFSTRING locale = serverManager->GetDefaultMessageLocale();
 
         ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e.GetDetails(locale).c_str()));
-        MG_LOG_EXCEPTION_ENTRY(e.GetMessage(locale).c_str(), e.GetStackTrace(locale).c_str());
+        MG_LOG_EXCEPTION_ENTRY(e.GetExceptionMessage(locale).c_str(), e.GetStackTrace(locale).c_str());
     }
 
     MG_CATCH_AND_RELEASE()

Modified: sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/GwsException.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/GwsException.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/GwsException.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -106,12 +106,12 @@
 
 FdoString* CGwsException::GetExceptionMessage()
 {
-    return m_status.GetMessage ();
+    return m_status.GetErrorMessage ();
 }
 
 FdoString* CGwsException::ToString()
 {
-    return m_status.GetMessage ();
+    return m_status.GetErrorMessage ();
 }
 
 

Modified: sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/GwsObjectImpl.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/GwsObjectImpl.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/GwsObjectImpl.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -75,7 +75,7 @@
     return m_status;
 }
 
-FdoString *CGwsStatus::GetMessage () const
+FdoString *CGwsStatus::GetErrorMessage () const
 {
     if (m_message.empty ()) {
         CGwsResourceModule::GwsStatusMessage (m_status, ((CGwsStatus *)this)->m_message);

Modified: sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/inc/GwsStatus.h
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/inc/GwsStatus.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/inc/GwsStatus.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -40,7 +40,7 @@
     GWS_COMMON_API
     EGwsStatus      GetStatus  () const ;
     GWS_COMMON_API
-    FdoString*      GetMessage    () const;
+    FdoString*      GetErrorMessage    () const;
 
     // get diagnostincs parameters
     GWS_COMMON_API

Modified: sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/inc/GwsThreads.h
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/inc/GwsThreads.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Gws/GwsCommon/inc/GwsThreads.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -194,8 +194,8 @@
         Post(); // wake up any waiting threads
     }
 
-    //GetMessage doesn't wait unless you tell it to
-    T* GetMessage(bool bWait = false, unsigned long bWaitTimeMS = IGNORE) {
+    //GetErrorMessage doesn't wait unless you tell it to
+    T* GetErrorMessage(bool bWait = false, unsigned long bWaitTimeMS = IGNORE) {
         if(bWait)
             GWSSemaphore::Wait(bWaitTimeMS); // wait for something to show up
         Lock();

Modified: sandbox/adsk/2.2gp/Server/src/Gws/Include/GwsCommon.h
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Gws/Include/GwsCommon.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Gws/Include/GwsCommon.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -639,7 +639,7 @@
     /// Gets the message associated with the error if any.
     /// </summary>
     /// <returns>Returns the error message.</returns>
-    virtual FdoString*      GetMessage() const = 0;
+    virtual FdoString*      GetErrorMessage() const = 0;
 
     /// <summary>
     /// Gets the name value pair at index. These values may be the name of the

Modified: sandbox/adsk/2.2gp/Server/src/Services/Mapping/MappingUtil.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Services/Mapping/MappingUtil.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Services/Mapping/MappingUtil.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -246,7 +246,7 @@
     Ptr<MgCoordinate> ur = new MgCoordinateXY(extent.maxx, extent.maxy);
     Ptr<MgEnvelope> mapExt = new MgEnvelope(ll, ur);
     Ptr<MgEnvelope> rasterExt;
-    if (NULL != layerCs && NULL != mapCs && layerCs->GetCode() != mapCs->GetCode())
+    if (NULL != layerCs && NULL != mapCs && layerCs->GetCsCode() != mapCs->GetCsCode())
     {
         Ptr<MgCoordinateSystemFactory> csFactory = new MgCoordinateSystemFactory();
 
@@ -614,7 +614,7 @@
                     MgCSTrans* xformer = item? item->GetTransform() : NULL;
 
                     // Test if layer and map are using the same coordinate systems
-                    if (NULL == layerCs.p || NULL == dstCs || layerCs->GetCode() == dstCs->GetCode())
+                    if (NULL == layerCs.p || NULL == dstCs || layerCs->GetCsCode() == dstCs->GetCsCode())
                     {
                         // No transform required
                         xformer = NULL;
@@ -798,12 +798,12 @@
 
             // Get the reason why the layer failed to stylize
             MgStringCollection argumentsWhy;
-            argumentsWhy.Add(mgException->GetMessage(locale));
+            argumentsWhy.Add(mgException->GetExceptionMessage(locale));
 
             Ptr<MgStylizeLayerFailedException> exception;
             exception = new MgStylizeLayerFailedException(L"MgMappingUtil.StylizeLayers", __LINE__, __WFILE__, &arguments, L"MgFormatInnerExceptionMessage", &argumentsWhy);
 
-            STRING message = exception->GetMessage(locale);
+            STRING message = exception->GetExceptionMessage(locale);
             STRING stackTrace = exception->GetStackTrace(locale);
             MG_LOG_EXCEPTION_ENTRY(message.c_str(), stackTrace.c_str());
 
@@ -1177,7 +1177,7 @@
     MgServerManager* serverManager = MgServerManager::GetInstance();
     STRING locale = (NULL == serverManager) ?
         MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
-    STRING message = mgException->GetMessage(locale);
+    STRING message = mgException->GetExceptionMessage(locale);
     STRING details = mgException->GetDetails(locale);
     STRING stackTrace = mgException->GetStackTrace(locale);
 

Modified: sandbox/adsk/2.2gp/Server/src/Services/Mapping/RSMgFeatureReader.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Services/Mapping/RSMgFeatureReader.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Services/Mapping/RSMgFeatureReader.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -31,7 +31,7 @@
                        catch (MgException* ex)                                              \
                        {                                                                    \
                            STRING message;                                                  \
-                           message = ex->GetMessage();                                      \
+                           message = ex->GetExceptionMessage();                             \
                            ex->Release();                                                   \
                            throw FdoException::Create(message.c_str());                     \
                        }
@@ -281,7 +281,7 @@
     catch (MgException* ex)
     {
         STRING message;
-        message = ex->GetMessage();
+        message = ex->GetExceptionMessage();
 
         bool shouldThrow = (NULL == dynamic_cast<MgFdoException*>(ex));
         ex->Release();

Modified: sandbox/adsk/2.2gp/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Services/Rendering/ServerRenderingService.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Services/Rendering/ServerRenderingService.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -1346,7 +1346,7 @@
                 //is to select all features which appear on the screen and then
                 //do our own geometry math.
                 #ifdef _DEBUG
-                STRING error = e->GetMessage();
+                STRING error = e->GetExceptionMessage();
                 ACE_DEBUG((LM_ERROR, ACE_TEXT("RenderForSelection() - Error: %S\n"), error.c_str()));
                 #endif
 

Modified: sandbox/adsk/2.2gp/Server/src/Services/Tile/ServerTileService.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Services/Tile/ServerTileService.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/Services/Tile/ServerTileService.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -595,7 +595,7 @@
         resources = MgResources::GetInstance();
         if (NULL != resources)
         {
-            message = resources->GetMessage(MgResources::ErrorDescription, L"MgMapCacheCleared", NULL);
+            message = resources->GetResourceMessage(MgResources::ErrorDescription, L"MgMapCacheCleared", NULL);
             MG_LOG_ERROR_ENTRY(message.c_str());
         }
         MG_CATCH_AND_RELEASE()

Modified: sandbox/adsk/2.2gp/Server/src/UnitTesting/TestCoordinateSystem.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/UnitTesting/TestCoordinateSystem.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/UnitTesting/TestCoordinateSystem.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -148,7 +148,7 @@
                         if(NULL != pCoordinateSystem)
                         {
                             #ifdef _DEBUG
-                            string strMessage = MG_WCHAR_TO_CHAR(pCoordinateSystem->GetCode());
+                            string strMessage = MG_WCHAR_TO_CHAR(pCoordinateSystem->GetCsCode());
                             printf("%s - %lf, %lf, %lf, %lf\n", strMessage.c_str(), pCoordinateSystem->GetMinX(), pCoordinateSystem->GetMinY(), pCoordinateSystem->GetMaxX(), pCoordinateSystem->GetMaxY());
                             #endif
 
@@ -374,7 +374,7 @@
                             catch(MgException* e)
                             {
                                 #ifdef _DEBUG
-                                STRING message = e->GetMessage(TEST_LOCALE);
+                                STRING message = e->GetExceptionMessage(TEST_LOCALE);
 
                                 // Extract the reason out of the message
                                 size_t index = message.find(L"\n");
@@ -513,7 +513,7 @@
         Ptr<MgCoordinateSystem> pCoordinateSystemAlt = factory.Create(pCoordinateSystem->ToString());
         CPPUNIT_ASSERT(pCoordinateSystemAlt);
 
-        CPPUNIT_ASSERT(pCoordinateSystem->GetCode() == pCoordinateSystemAlt->GetCode());
+        CPPUNIT_ASSERT(pCoordinateSystem->GetCsCode() == pCoordinateSystemAlt->GetCsCode());
     }
     catch(MgException* e)
     {
@@ -1120,7 +1120,7 @@
     }
 }
 
-void TestCoordinateSystem::TestCase_Arbitrary_GetCode()
+void TestCoordinateSystem::TestCase_Arbitrary_GetCsCode()
 {
     try
     {
@@ -1129,28 +1129,28 @@
         Ptr<MgCoordinateSystem> pCoordinateSystem = factory.Create(ogcWkt);
         CPPUNIT_ASSERT(pCoordinateSystem);
 
-        STRING value = pCoordinateSystem->GetCode();
+        STRING value = pCoordinateSystem->GetCsCode();
         CPPUNIT_ASSERT(_wcsicmp(L"XY-MI", value.c_str()) == 0);
 
         ogcWkt = ArbitraryWkt_Alternate1;
         pCoordinateSystem = factory.Create(ogcWkt);
         CPPUNIT_ASSERT(pCoordinateSystem);
 
-        value = pCoordinateSystem->GetCode();
+        value = pCoordinateSystem->GetCsCode();
         CPPUNIT_ASSERT(_wcsicmp(L"XY-MI", value.c_str()) == 0);
 
         ogcWkt = ArbitraryWkt_Alternate2;
         pCoordinateSystem = factory.Create(ogcWkt);
         CPPUNIT_ASSERT(pCoordinateSystem);
 
-        value = pCoordinateSystem->GetCode();
+        value = pCoordinateSystem->GetCsCode();
         CPPUNIT_ASSERT(_wcsicmp(L"XY-MI", value.c_str()) == 0);
 
         ogcWkt = ArbitraryWkt_Meter;
         pCoordinateSystem = factory.Create(ogcWkt);
         CPPUNIT_ASSERT(pCoordinateSystem);
 
-        value = pCoordinateSystem->GetCode();
+        value = pCoordinateSystem->GetCsCode();
         CPPUNIT_ASSERT(_wcsicmp(L"XY-M", value.c_str()) == 0);
     }
     catch(MgException* e)
@@ -2437,7 +2437,7 @@
     }
 }
 
-void TestCoordinateSystem::TestCase_Geographic_GetCode()
+void TestCoordinateSystem::TestCase_Geographic_GetCsCode()
 {
     try
     {
@@ -2446,7 +2446,7 @@
         Ptr<MgCoordinateSystem> pCoordinateSystem = factory.Create(ogcWkt);
         CPPUNIT_ASSERT(pCoordinateSystem);
 
-        STRING value = pCoordinateSystem->GetCode();
+        STRING value = pCoordinateSystem->GetCsCode();
         CPPUNIT_ASSERT(_wcsicmp(L"LL84", value.c_str()) == 0);
     }
     catch(MgException* e)
@@ -2916,7 +2916,7 @@
     }
 }
 
-void TestCoordinateSystem::TestCase_Projected_GetCode()
+void TestCoordinateSystem::TestCase_Projected_GetCsCode()
 {
     try
     {
@@ -2925,7 +2925,7 @@
         Ptr<MgCoordinateSystem> pCoordinateSystem = factory.Create(ogcWkt);
         CPPUNIT_ASSERT(pCoordinateSystem);
 
-        STRING value = pCoordinateSystem->GetCode();
+        STRING value = pCoordinateSystem->GetCsCode();
         CPPUNIT_ASSERT(_wcsicmp(L"GA-W", value.c_str()) == 0);
     }
     catch(MgException* e)

Modified: sandbox/adsk/2.2gp/Server/src/UnitTesting/TestCoordinateSystem.h
===================================================================
--- sandbox/adsk/2.2gp/Server/src/UnitTesting/TestCoordinateSystem.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/UnitTesting/TestCoordinateSystem.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -51,7 +51,7 @@
     CPPUNIT_TEST(TestCase_Arbitrary_GetMinY);
     CPPUNIT_TEST(TestCase_Arbitrary_GetMaxX);
     CPPUNIT_TEST(TestCase_Arbitrary_GetMaxY);
-    CPPUNIT_TEST(TestCase_Arbitrary_GetCode);
+    CPPUNIT_TEST(TestCase_Arbitrary_GetCsCode);
     CPPUNIT_TEST(TestCase_Arbitrary_GetDescription);
     CPPUNIT_TEST(TestCase_Arbitrary_GetProjection);
     CPPUNIT_TEST(TestCase_Arbitrary_GetProjectionDescription);
@@ -79,7 +79,7 @@
     CPPUNIT_TEST(TestCase_Geographic_GetMinY);
     CPPUNIT_TEST(TestCase_Geographic_GetMaxX);
     CPPUNIT_TEST(TestCase_Geographic_GetMaxY);
-    CPPUNIT_TEST(TestCase_Geographic_GetCode);
+    CPPUNIT_TEST(TestCase_Geographic_GetCsCode);
     CPPUNIT_TEST(TestCase_Geographic_GetDescription);
     CPPUNIT_TEST(TestCase_Geographic_GetProjection);
     CPPUNIT_TEST(TestCase_Geographic_GetProjectionDescription);
@@ -107,7 +107,7 @@
     CPPUNIT_TEST(TestCase_Projected_GetMinY);
     CPPUNIT_TEST(TestCase_Projected_GetMaxX);
     CPPUNIT_TEST(TestCase_Projected_GetMaxY);
-    CPPUNIT_TEST(TestCase_Projected_GetCode);
+    CPPUNIT_TEST(TestCase_Projected_GetCsCode);
     CPPUNIT_TEST(TestCase_Projected_GetDescription);
     CPPUNIT_TEST(TestCase_Projected_GetProjection);
     CPPUNIT_TEST(TestCase_Projected_GetProjectionDescription);
@@ -261,7 +261,7 @@
     void TestCase_Arbitrary_GetMinY();
     void TestCase_Arbitrary_GetMaxX();
     void TestCase_Arbitrary_GetMaxY();
-    void TestCase_Arbitrary_GetCode();
+    void TestCase_Arbitrary_GetCsCode();
     void TestCase_Arbitrary_GetDescription();
     void TestCase_Arbitrary_GetProjection();
     void TestCase_Arbitrary_GetProjectionDescription();
@@ -289,7 +289,7 @@
     void TestCase_Geographic_GetMinY();
     void TestCase_Geographic_GetMaxX();
     void TestCase_Geographic_GetMaxY();
-    void TestCase_Geographic_GetCode();
+    void TestCase_Geographic_GetCsCode();
     void TestCase_Geographic_GetDescription();
     void TestCase_Geographic_GetProjection();
     void TestCase_Geographic_GetProjectionDescription();
@@ -317,7 +317,7 @@
     void TestCase_Projected_GetMinY();
     void TestCase_Projected_GetMaxX();
     void TestCase_Projected_GetMaxY();
-    void TestCase_Projected_GetCode();
+    void TestCase_Projected_GetCsCode();
     void TestCase_Projected_GetDescription();
     void TestCase_Projected_GetProjection();
     void TestCase_Projected_GetProjectionDescription();

Modified: sandbox/adsk/2.2gp/Server/src/UnitTesting/TestServerAdminService.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/UnitTesting/TestServerAdminService.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Server/src/UnitTesting/TestServerAdminService.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -578,7 +578,7 @@
     }
     catch(MgException* e)
     {
-        STRING message = e->GetMessage(TEST_LOCALE);
+        STRING message = e->GetExceptionMessage(TEST_LOCALE);
         message += e->GetStackTrace(TEST_LOCALE);
         SAFE_RELEASE(e);
         CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
@@ -640,7 +640,7 @@
     }
     catch(MgException* e)
     {
-        STRING message = e->GetMessage(TEST_LOCALE);
+        STRING message = e->GetExceptionMessage(TEST_LOCALE);
         message += e->GetStackTrace(TEST_LOCALE);
         SAFE_RELEASE(e);
         CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
@@ -715,7 +715,7 @@
     }
     catch(MgException* e)
     {
-        STRING message = e->GetMessage(TEST_LOCALE);
+        STRING message = e->GetExceptionMessage(TEST_LOCALE);
         message += e->GetStackTrace(TEST_LOCALE);
         SAFE_RELEASE(e);
         CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
@@ -768,7 +768,7 @@
     }
     catch(MgException* e)
     {
-        STRING message = e->GetMessage(TEST_LOCALE);
+        STRING message = e->GetExceptionMessage(TEST_LOCALE);
         message += e->GetStackTrace(TEST_LOCALE);
         SAFE_RELEASE(e);
         CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
@@ -822,7 +822,7 @@
     }
     catch(MgException* e)
     {
-        STRING message = e->GetMessage(TEST_LOCALE);
+        STRING message = e->GetExceptionMessage(TEST_LOCALE);
         message += e->GetStackTrace(TEST_LOCALE);
         SAFE_RELEASE(e);
         CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
@@ -877,7 +877,7 @@
     }
     catch(MgException* e)
     {
-        STRING message = e->GetMessage(TEST_LOCALE);
+        STRING message = e->GetExceptionMessage(TEST_LOCALE);
         message += e->GetStackTrace(TEST_LOCALE);
         SAFE_RELEASE(e);
         CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));

Modified: sandbox/adsk/2.2gp/Web/src/ApacheAgent/ApacheResponseHandler.cpp
===================================================================
--- sandbox/adsk/2.2gp/Web/src/ApacheAgent/ApacheResponseHandler.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Web/src/ApacheAgent/ApacheResponseHandler.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -172,7 +172,7 @@
 void ApacheResponseHandler::SendError(MgException *e)
 {
     MG_TRY()
-    STRING shortError = e->GetMessage();
+    STRING shortError = e->GetExceptionMessage();
     STRING longError = e->GetDetails();
     STRING statusMessage = e->GetClassName();
 

Modified: sandbox/adsk/2.2gp/Web/src/CgiAgent/CgiResponseHandler.cpp
===================================================================
--- sandbox/adsk/2.2gp/Web/src/CgiAgent/CgiResponseHandler.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Web/src/CgiAgent/CgiResponseHandler.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -170,7 +170,7 @@
 void CgiResponseHandler::SendError(MgException* e)
 {
     MG_TRY()
-    STRING shortError = e->GetMessage();
+    STRING shortError = e->GetExceptionMessage();
     STRING longError = e->GetDetails();
     STRING statusMessage = e->GetClassName();
 

Modified: sandbox/adsk/2.2gp/Web/src/DotNetApi/Foundation/ManagedException.cs
===================================================================
--- sandbox/adsk/2.2gp/Web/src/DotNetApi/Foundation/ManagedException.cs	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Web/src/DotNetApi/Foundation/ManagedException.cs	2010-03-26 20:47:31 UTC (rev 4710)
@@ -39,7 +39,7 @@
         {
             get
             {
-                return ((MgException)this).GetMessage();
+                return ((MgException)this).GetExceptionMessage();
             }
         }
 

Modified: sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpGetSiteInfo.cpp
===================================================================
--- sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpGetSiteInfo.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpGetSiteInfo.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -87,7 +87,7 @@
                         MG_HTTP_HANDLER_CATCH(L"MgHttpGetSiteInfo.Execute")
                         if (mgException != NULL)
                         {
-                            message = mgException->GetMessage();
+                            message = mgException->GetExceptionMessage();
                         }
                     }
 

Modified: sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpGetSiteStatus.cpp
===================================================================
--- sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpGetSiteStatus.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpGetSiteStatus.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -82,7 +82,7 @@
                     MG_HTTP_HANDLER_CATCH(L"MgHttpGetSiteStatus.Execute")
                     if (mgException != NULL)
                     {
-                        message = mgException->GetMessage();
+                        message = mgException->GetExceptionMessage();
                     }
                 }
 

Modified: sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpGetSiteVersion.cpp
===================================================================
--- sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpGetSiteVersion.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpGetSiteVersion.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -86,7 +86,7 @@
                         MG_HTTP_HANDLER_CATCH(L"MgHttpGetSiteInfo.Execute")
                         if (mgException != NULL)
                         {
-                            message = mgException->GetMessage();
+                            message = mgException->GetExceptionMessage();
                         }
                     }
 

Modified: sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpResult.cpp
===================================================================
--- sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpResult.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpResult.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -18,10 +18,6 @@
 #include "HttpHandler.h"
 #include "HttpResult.h"
 
-#ifdef _WIN32
-    #undef GetMessage
-#endif
-
 //////////////////////////////////////////////////////////////////
 /// <summary>
 /// Constructor. Create a new MgHttpResult object.
@@ -211,7 +207,7 @@
         // Map Mg exception to HTTP result.
 
         httpStatusMessage = mgException->GetClassName();
-        errorMessage = mgException->GetMessage();
+        errorMessage = mgException->GetExceptionMessage();
         detailedMessage = mgException->GetDetails();
 
 #ifdef _DEBUG

Modified: sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpWmsGetMap.cpp
===================================================================
--- sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpWmsGetMap.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Web/src/HttpHandler/HttpWmsGetMap.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -33,7 +33,7 @@
 //                                      |                 |                  |           //
 #define CATCH_MGEXCEPTION_HANDLE_AS_OGC(mg_exception_type,ogc_exception_code,ogc_server)  \
         catch (mg_exception_type* e) {                                                    \
-            STRING sReport = e->GetMessage();                                             \
+            STRING sReport = e->GetExceptionMessage();                                    \
             sReport += _("<details>");                                                    \
             sReport += e->GetDetails();                                                   \
             sReport += _("</details>");                                                   \

Modified: sandbox/adsk/2.2gp/Web/src/IsapiAgent/IsapiResponseHandler.cpp
===================================================================
--- sandbox/adsk/2.2gp/Web/src/IsapiAgent/IsapiResponseHandler.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Web/src/IsapiAgent/IsapiResponseHandler.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -184,7 +184,7 @@
 void IsapiResponseHandler::SendError(MgException* e)
 {
     MG_TRY()
-    STRING shortError = e->GetMessage();
+    STRING shortError = e->GetExceptionMessage();
     STRING longError = e->GetDetails();
     STRING statusMessage = e->GetClassName();
     DWORD status = 559;

Modified: sandbox/adsk/2.2gp/Web/src/JavaApi/org/osgeo/mapguide/AppThrowable.java
===================================================================
--- sandbox/adsk/2.2gp/Web/src/JavaApi/org/osgeo/mapguide/AppThrowable.java	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Web/src/JavaApi/org/osgeo/mapguide/AppThrowable.java	2010-03-26 20:47:31 UTC (rev 4710)
@@ -31,7 +31,7 @@
     {
         try
         {
-            return ((MgException)this).GetMessage();
+            return ((MgException)this).GetExceptionMessage();
         }
         catch (MgException e)
         {

Modified: sandbox/adsk/2.2gp/Web/src/WebApp/WebInvokeScriptCommand.cpp
===================================================================
--- sandbox/adsk/2.2gp/Web/src/WebApp/WebInvokeScriptCommand.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Web/src/WebApp/WebInvokeScriptCommand.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////
 // Returns the script code necessary to invoke the desired function
 //
-STRING MgWebInvokeScriptCommand::GetCode()
+STRING MgWebInvokeScriptCommand::GetScriptCode()
 {
     return m_code;
 }
@@ -36,7 +36,7 @@
 ///////////////////////////////////////////////////////////////////////////
 // Set the javascript code
 //
-void MgWebInvokeScriptCommand::SetCode(CREFSTRING code)
+void MgWebInvokeScriptCommand::SetScriptCode(CREFSTRING code)
 {
     m_code = code;
 }

Modified: sandbox/adsk/2.2gp/Web/src/WebApp/WebInvokeScriptCommand.h
===================================================================
--- sandbox/adsk/2.2gp/Web/src/WebApp/WebInvokeScriptCommand.h	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Web/src/WebApp/WebInvokeScriptCommand.h	2010-03-26 20:47:31 UTC (rev 4710)
@@ -31,7 +31,7 @@
     /// <returns>
     /// Javascript code
     /// </returns>
-    STRING GetCode();
+    STRING GetScriptCode();
 
 INTERNAL_API:
 
@@ -40,7 +40,7 @@
     ///////////////////////////////////////////////////////////////////////////
     // Set the javascript code
     //
-    void SetCode(CREFSTRING code);
+    void SetScriptCode(CREFSTRING code);
 
 CLASS_ID:
     static const INT32 m_cls_id = WebApp_InvokeScriptCommand;

Modified: sandbox/adsk/2.2gp/Web/src/WebApp/WebLayout.cpp
===================================================================
--- sandbox/adsk/2.2gp/Web/src/WebApp/WebLayout.cpp	2010-03-26 20:32:34 UTC (rev 4709)
+++ sandbox/adsk/2.2gp/Web/src/WebApp/WebLayout.cpp	2010-03-26 20:47:31 UTC (rev 4710)
@@ -858,7 +858,7 @@
             }
             else if (strName == L"Script") // NOXLATE
             {
-                cmd->SetCode(GetStringFromElement(elt));
+                cmd->SetScriptCode(GetStringFromElement(elt));
             }
             else
             {



More information about the mapguide-commits mailing list