[mapguide-commits] r6963 - in branches/2.4/MgDev: Desktop/DesktopUnmanagedApi/DotNet Desktop/MgDesktop/Exception Desktop/MgDesktop/MapLayer Desktop/MgDesktop/Services Desktop/MgDesktop/Services/Drawing Desktop/MgDesktop/Services/Feature Desktop/MgDesktop/Services/Feature/Commands Desktop/MgDesktop/Services/Rendering Desktop/MgDesktop/Services/Resource Desktop/MgDesktop/Services/Tile Desktop/MgDesktop/System Desktop/UnitTest Doc Doc/external_topics Doc/group_and_page_definitions

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Thu Aug 30 06:31:04 PDT 2012


Author: jng
Date: 2012-08-30 06:31:03 -0700 (Thu, 30 Aug 2012)
New Revision: 6963

Modified:
   branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopApiGen.xml
   branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopConstants.xml
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/AliasNotFoundException.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/AliasNotFoundException.h
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/ConnectionFailedException.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/ConnectionFailedException.h
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/DuplicateParameterException.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/DuplicateParameterException.h
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfException.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfException.h
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionNotFoundException.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionNotFoundException.h
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionResourceNotFoundException.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionResourceNotFoundException.h
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfPackageException.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfPackageException.h
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfSectionException.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfSectionException.h
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidFeatureSourceException.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidFeatureSourceException.h
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidLogEntryException.h
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutFontSizeUnitsException.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutFontSizeUnitsException.h
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutPositionUnitsException.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutPositionUnitsException.h
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutSizeUnitsException.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutSizeUnitsException.h
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/ParameterNotFoundException.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/ParameterNotFoundException.h
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/StylizeLayerFailedException.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Exception/StylizeLayerFailedException.h
   branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Layer.h
   branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Map.h
   branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Selection.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/DataReader.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingDefs.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingServiceUtil.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingServiceUtil.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/BooleanDataReaderCreator.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/ByteDataReaderCreator.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/CreateFeatureSource.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/CreateFeatureSource.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/DescribeSchema.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/EnumerateDataStores.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/ExtendedSelectCommand.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetConnectionPropertyValues.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetLongTransactions.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetSchemaMapping.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetSpatialContexts.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SelectAggregateCommand.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SelectCommand.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SelectFeatures.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SqlCommand.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/DataReaderCreator.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/DateTimeDataReaderCreator.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/DoubleDataReaderCreator.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionPool.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoFeatureReader.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoFilterCollection.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoForcedOneToOneFeatureReader.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoReaderCollection.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureClassCacheItem.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureDistribution.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/RdbmsFeatureSourceParams.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/RdbmsFeatureSourceParams.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/FeatureReader.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/FeatureService.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/ImageFormats.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/ImageFormats.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/DwfVersion.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/DwfVersion.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/FeatureInformation.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/Layout.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/Layout.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/LegendPlotUtil.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/LegendPlotUtil.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlot.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlot.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlotCollection.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlotCollection.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlotInstruction.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PlotSpecification.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PlotSpecification.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PrintLayout.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PrintLayout.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/RenderingOptions.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/RenderingOptions.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/UnitType.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/UnitType.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/ByteSourceDwfInputStreamImpl.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/OperationInfo.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/ResourceDefs.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataManager.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataType.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataType.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/ResourceService.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/ServiceFactory.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/SqlReader.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Tile/TileCache.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/Services/TileService.h
   branches/2.4/MgDev/Desktop/MgDesktop/Services/Transaction.h
   branches/2.4/MgDev/Desktop/MgDesktop/System/ClassId.h
   branches/2.4/MgDev/Desktop/MgDesktop/System/PlatformInit.cpp
   branches/2.4/MgDev/Desktop/MgDesktop/System/PlatformInit.h
   branches/2.4/MgDev/Desktop/UnitTest/TestMappingService.cpp
   branches/2.4/MgDev/Desktop/UnitTest/TestProfilingService.cpp
   branches/2.4/MgDev/Desktop/UnitTest/TestResourceService.cpp
   branches/2.4/MgDev/Doc/MgDesktop_Doxyfile
   branches/2.4/MgDev/Doc/external_topics/Desktop_Introduction.h
   branches/2.4/MgDev/Doc/group_and_page_definitions/define_groups.h
Log:
mg-desktop updates:
 - #2097: More mg-desktop API documentation and re-organization
 - Remove some classes from the SWIG recipe that shouldn't be public
 - Use the Mgd prefix for most public classes. This is obviously a breaking change and something we should've done from the beginning. But hindsight is always 20/20, so we might as well do it now while the mg-desktop APIs are still declared to be in flux.

Modified: branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopApiGen.xml
===================================================================
--- branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopApiGen.xml	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopApiGen.xml	2012-08-30 13:31:03 UTC (rev 6963)
@@ -119,8 +119,6 @@
 
     <Header path="../../MgDesktop/Services/Feature/RdbmsFeatureSourceParams.h" />
 
-    <Header path="../../MgDesktop/Services/Rendering/CustomLogoInfo.h" />
-    <Header path="../../MgDesktop/Services/Rendering/CustomTextInfo.h" />
     <Header path="../../MgDesktop/Services/Rendering/DwfVersion.h" />
     <Header path="../../MgDesktop/Services/Rendering/FeatureInformation.h" />
     <Header path="../../MgDesktop/Services/Rendering/Layout.h" />
@@ -128,7 +126,6 @@
     <Header path="../../MgDesktop/Services/Rendering/DwfVersion.h" />
     <Header path="../../MgDesktop/Services/Rendering/MapPlotCollection.h" />
     <Header path="../../MgDesktop/Services/Rendering/PlotSpecification.h" />
-    <Header path="../../MgDesktop/Services/Rendering/PrintLayout.h" />
     <Header path="../../MgDesktop/Services/Rendering/RenderingOptions.h" />
 
     <Header path="../../MgDesktop/System/PlatformInit.h" />

Modified: branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopConstants.xml
===================================================================
--- branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopConstants.xml	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopConstants.xml	2012-08-30 13:31:03 UTC (rev 6963)
@@ -73,10 +73,10 @@
 <Package>org.osgeo.mapguide</Package>
 
 <Classes>
-    <Class name="MgMapPlotInstruction" />
-    <Class name="MgUnitType" />
-    <Class name="MgPageUnitsType" />
-    <Class name="MgImageFormats" />
+    <Class name="MgdMapPlotInstruction" />
+    <Class name="MgdUnitType" />
+    <Class name="MgdPageUnitsType" />
+    <Class name="MgdImageFormats" />
 </Classes>
 
 <!--

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/AliasNotFoundException.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/AliasNotFoundException.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/AliasNotFoundException.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,12 +1,12 @@
 #include "MgDesktop.h"
 
-IMPLEMENT_EXCEPTION_DEFAULTS(MgAliasNotFoundException, MgApplicationException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgdAliasNotFoundException, MgApplicationException)
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Construct a MgConnectionFailedException object.
+/// Construct a MgdConnectionFailedException object.
 ///
-MgAliasNotFoundException::MgAliasNotFoundException(CREFSTRING methodName,
+MgdAliasNotFoundException::MgdAliasNotFoundException(CREFSTRING methodName,
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
     MgApplicationException(methodName, lineNumber, fileName,
@@ -18,6 +18,6 @@
 /// \brief
 /// Destruct the object.
 ///
-MgAliasNotFoundException::~MgAliasNotFoundException() throw()
+MgdAliasNotFoundException::~MgdAliasNotFoundException() throw()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/AliasNotFoundException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/AliasNotFoundException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/AliasNotFoundException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,21 +1,21 @@
 #ifndef DESKTOP_ALIAS_NOT_FOUND_EXCEPTION_H
 #define DESKTOP_ALIAS_NOT_FOUND_EXCEPTION_H
 
-/// \ingroup Exceptions_Module
+/// \ingroup Desktop_Exceptions_Module
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Thrown when a given alias cannot be resolved to a physical path
 ///
-class MG_DESKTOP_API MgAliasNotFoundException : public MgApplicationException
+class MG_DESKTOP_API MgdAliasNotFoundException : public MgApplicationException
 {
-    DECLARE_CLASSNAME(MgAliasNotFoundException)
+    DECLARE_CLASSNAME(MgdAliasNotFoundException)
 
 EXTERNAL_API:
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct a MgAliasNotFoundException object.
+    /// Construct a MgdAliasNotFoundException object.
     ///
     /// \param methodName
     /// Name of the method where the exception occurred.
@@ -30,23 +30,23 @@
     /// \param whyArguments
     /// Collection of arguments used to format the message that describes why the exception occurs.
     ///
-    MgAliasNotFoundException(CREFSTRING methodName, INT32 lineNumber,
+    MgdAliasNotFoundException(CREFSTRING methodName, INT32 lineNumber,
         CREFSTRING fileName, MgStringCollection* whatArguments,
         CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Destructor for a MgAliasNotFoundException object.
+    /// Destructor for a MgdAliasNotFoundException object.
     ///
-    virtual ~MgAliasNotFoundException() throw();
+    virtual ~MgdAliasNotFoundException() throw();
 
 INTERNAL_API:
 
-    DECLARE_EXCEPTION_DEFAULTS(MgAliasNotFoundException)
+    DECLARE_EXCEPTION_DEFAULTS(MgdAliasNotFoundException)
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgAliasNotFoundException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_AliasNotFoundException;
 };
 
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/ConnectionFailedException.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/ConnectionFailedException.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/ConnectionFailedException.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -17,13 +17,13 @@
 
 #include "MgDesktop.h"
 
-IMPLEMENT_EXCEPTION_DEFAULTS(MgConnectionFailedException, MgApplicationException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgdConnectionFailedException, MgApplicationException)
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Construct a MgConnectionFailedException object.
+/// Construct a MgdConnectionFailedException object.
 ///
-MgConnectionFailedException::MgConnectionFailedException(CREFSTRING methodName,
+MgdConnectionFailedException::MgdConnectionFailedException(CREFSTRING methodName,
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
     MgApplicationException(methodName, lineNumber, fileName,
@@ -35,6 +35,6 @@
 /// \brief
 /// Destruct the object.
 ///
-MgConnectionFailedException::~MgConnectionFailedException() throw()
+MgdConnectionFailedException::~MgdConnectionFailedException() throw()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/ConnectionFailedException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/ConnectionFailedException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/ConnectionFailedException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -18,21 +18,21 @@
 #ifndef DESKTOP_CONNECTION_FAILED_EXCEPTION_H
 #define DESKTOP_CONNECTION_FAILED_EXCEPTION_H
 
-/// \ingroup Exceptions_Module
+/// \ingroup Desktop_Exceptions_Module
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Thrown when a connection to a server cannot be established.
 ///
-class MG_DESKTOP_API MgConnectionFailedException : public MgApplicationException
+class MG_DESKTOP_API MgdConnectionFailedException : public MgApplicationException
 {
-    DECLARE_CLASSNAME(MgConnectionFailedException)
+    DECLARE_CLASSNAME(MgdConnectionFailedException)
 
 EXTERNAL_API:
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct a MgConnectionFailedException object.
+    /// Construct a MgdConnectionFailedException object.
     ///
     /// \param methodName
     /// Name of the method where the exception occurred.
@@ -47,23 +47,23 @@
     /// \param whyArguments
     /// Collection of arguments used to format the message that describes why the exception occurs.
     ///
-    MgConnectionFailedException(CREFSTRING methodName, INT32 lineNumber,
+    MgdConnectionFailedException(CREFSTRING methodName, INT32 lineNumber,
         CREFSTRING fileName, MgStringCollection* whatArguments,
         CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Destructor for a MgConnectionFailedException object.
+    /// Destructor for a MgdConnectionFailedException object.
     ///
-    virtual ~MgConnectionFailedException() throw();
+    virtual ~MgdConnectionFailedException() throw();
 
 INTERNAL_API:
 
-    DECLARE_EXCEPTION_DEFAULTS(MgConnectionFailedException)
+    DECLARE_EXCEPTION_DEFAULTS(MgdConnectionFailedException)
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgConnectionFailedException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_ConnectionFailedException;
 };
 
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/DuplicateParameterException.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/DuplicateParameterException.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/DuplicateParameterException.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,12 +1,12 @@
 #include "MgDesktop.h"
 
-IMPLEMENT_EXCEPTION_DEFAULTS(MgDuplicateParameterException, MgApplicationException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgdDuplicateParameterException, MgApplicationException)
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Construct a MgDuplicateParameterException object.
+/// Construct a MgdDuplicateParameterException object.
 ///
-MgDuplicateParameterException::MgDuplicateParameterException(CREFSTRING methodName,
+MgdDuplicateParameterException::MgdDuplicateParameterException(CREFSTRING methodName,
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
     MgApplicationException(methodName, lineNumber, fileName,
@@ -16,8 +16,8 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Destruct the MgDuplicateParameterException object.
+/// Destruct the MgdDuplicateParameterException object.
 ///
-MgDuplicateParameterException::~MgDuplicateParameterException() throw()
+MgdDuplicateParameterException::~MgdDuplicateParameterException() throw()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/DuplicateParameterException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/DuplicateParameterException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/DuplicateParameterException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,20 +1,21 @@
 #ifndef DESKTOP_DUPLICATE_PARAMETER_EXCEPTION_H
 #define DESKTOP_DUPLICATE_PARAMETER_EXCEPTION_H
 
+/// \ingroup Desktop_Exceptions_Module
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Thrown when a duplicate parameter is found.
 ///
-class MG_DESKTOP_API MgDuplicateParameterException : public MgApplicationException
+class MG_DESKTOP_API MgdDuplicateParameterException : public MgApplicationException
 {
-    DECLARE_CLASSNAME(MgDuplicateParameterException)
+    DECLARE_CLASSNAME(MgdDuplicateParameterException)
 
 EXTERNAL_API:
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct a MgDuplicateParameterException object.
+    /// Construct a MgdDuplicateParameterException object.
     ///
     /// \param methodName
     /// Name of the method where the exception occurred.
@@ -29,23 +30,23 @@
     /// \param whyArguments
     /// Collection of arguments used to format the message that describes why the exception occurs.
     ///
-    MgDuplicateParameterException(CREFSTRING methodName, INT32 lineNumber,
+    MgdDuplicateParameterException(CREFSTRING methodName, INT32 lineNumber,
         CREFSTRING fileName, MgStringCollection* whatArguments,
         CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Destruct the MgDuplicateParameterException object.
+    /// Destruct the MgdDuplicateParameterException object.
     ///
-    virtual ~MgDuplicateParameterException() throw();
+    virtual ~MgdDuplicateParameterException() throw();
 
 INTERNAL_API:
 
-    DECLARE_EXCEPTION_DEFAULTS(MgDuplicateParameterException)
+    DECLARE_EXCEPTION_DEFAULTS(MgdDuplicateParameterException)
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgDuplicateParameterException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_DuplicateParameterException;
 };
 
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfException.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfException.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfException.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,12 +1,12 @@
 #include "MgDesktop.h"
 
-IMPLEMENT_EXCEPTION_DEFAULTS(MgDwfException, MgThirdPartyException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgdDwfException, MgThirdPartyException)
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Construct a MgDwfException object.
+/// Construct a MgdDwfException object.
 ///
-MgDwfException::MgDwfException(CREFSTRING methodName,
+MgdDwfException::MgdDwfException(CREFSTRING methodName,
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
     MgThirdPartyException(methodName, lineNumber, fileName,
@@ -18,6 +18,6 @@
 /// \brief
 /// Destruct the object.
 ///
-MgDwfException::~MgDwfException() throw()
+MgdDwfException::~MgdDwfException() throw()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,21 +1,21 @@
 #ifndef DESKTOP_DWF_EXCEPTION_H
 #define DESKTOP_DWF_EXCEPTION_H
 
-/// \ingroup Exceptions_Module
+/// \ingroup Desktop_Exceptions_Module
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Wrapper for DWF toolkit exceptions.
 ///
-class MG_DESKTOP_API MgDwfException : public MgThirdPartyException
+class MG_DESKTOP_API MgdDwfException : public MgThirdPartyException
 {
-    DECLARE_CLASSNAME(MgDwfException)
+    DECLARE_CLASSNAME(MgdDwfException)
 
 EXTERNAL_API:
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct a MgDwfException object.
+    /// Construct a MgdDwfException object.
     ///
     /// \param methodName
     /// Name of the method where the exception occurred.
@@ -30,23 +30,23 @@
     /// \param whyArguments
     /// Collection of arguments used to format the message that describes why the exception occurs.
     ///
-    MgDwfException(CREFSTRING methodName, INT32 lineNumber,
+    MgdDwfException(CREFSTRING methodName, INT32 lineNumber,
         CREFSTRING fileName, MgStringCollection* whatArguments,
         CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Destructor for a MgDwfException object.
+    /// Destructor for a MgdDwfException object.
     ///
-    virtual ~MgDwfException() throw();
+    virtual ~MgdDwfException() throw();
 
 INTERNAL_API:
 
-    DECLARE_EXCEPTION_DEFAULTS(MgDwfException)
+    DECLARE_EXCEPTION_DEFAULTS(MgdDwfException)
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgDwfException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_DwfException;
 };
 
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionNotFoundException.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionNotFoundException.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionNotFoundException.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,12 +1,12 @@
 #include "MgDesktop.h"
 
-IMPLEMENT_EXCEPTION_DEFAULTS(MgDwfSectionNotFoundException, MgApplicationException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgdDwfSectionNotFoundException, MgApplicationException)
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Construct a MgDwfSectionNotFoundException object.
+/// Construct a MgdDwfSectionNotFoundException object.
 ///
-MgDwfSectionNotFoundException::MgDwfSectionNotFoundException(CREFSTRING methodName,
+MgdDwfSectionNotFoundException::MgdDwfSectionNotFoundException(CREFSTRING methodName,
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
     MgApplicationException(methodName, lineNumber, fileName,
@@ -18,6 +18,6 @@
 /// \brief
 /// Destruct the object.
 ///
-MgDwfSectionNotFoundException::~MgDwfSectionNotFoundException() throw()
+MgdDwfSectionNotFoundException::~MgdDwfSectionNotFoundException() throw()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionNotFoundException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionNotFoundException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionNotFoundException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,21 +1,21 @@
 #ifndef DESKTOP_DWF_SECTION_NOT_FOUND_EXCEPTION_H
 #define DESKTOP_DWF_SECTION_NOT_FOUND_EXCEPTION_H
 
-/// \ingroup Exceptions_Module
+/// \ingroup Desktop_Exceptions_Module
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Thrown when a DWF section is not found.
 ///
-class MG_DESKTOP_API MgDwfSectionNotFoundException : public MgApplicationException
+class MG_DESKTOP_API MgdDwfSectionNotFoundException : public MgApplicationException
 {
-    DECLARE_CLASSNAME(MgDwfSectionNotFoundException)
+    DECLARE_CLASSNAME(MgdDwfSectionNotFoundException)
 
 EXTERNAL_API:
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct a MgDwfSectionNotFoundException object.
+    /// Construct a MgdDwfSectionNotFoundException object.
     ///
     /// \param methodName
     /// Name of the method where the exception occurred.
@@ -30,23 +30,23 @@
     /// \param whyArguments
     /// Collection of arguments used to format the message that describes why the exception occurs.
     ///
-    MgDwfSectionNotFoundException(CREFSTRING methodName, INT32 lineNumber,
+    MgdDwfSectionNotFoundException(CREFSTRING methodName, INT32 lineNumber,
         CREFSTRING fileName, MgStringCollection* whatArguments,
         CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Destructor for a MgDwfSectionNotFoundException object.
+    /// Destructor for a MgdDwfSectionNotFoundException object.
     ///
-    virtual ~MgDwfSectionNotFoundException() throw();
+    virtual ~MgdDwfSectionNotFoundException() throw();
 
 INTERNAL_API:
 
-    DECLARE_EXCEPTION_DEFAULTS(MgDwfSectionNotFoundException)
+    DECLARE_EXCEPTION_DEFAULTS(MgdDwfSectionNotFoundException)
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgDwfSectionNotFoundException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_DwfSectionNotFoundException;
 };
 
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionResourceNotFoundException.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionResourceNotFoundException.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionResourceNotFoundException.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,12 +1,12 @@
 #include "MgDesktop.h"
 
-IMPLEMENT_EXCEPTION_DEFAULTS(MgDwfSectionResourceNotFoundException, MgApplicationException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgdDwfSectionResourceNotFoundException, MgApplicationException)
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Construct a MgDwfSectionResourceNotFoundException object.
+/// Construct a MgdDwfSectionResourceNotFoundException object.
 ///
-MgDwfSectionResourceNotFoundException::MgDwfSectionResourceNotFoundException(CREFSTRING methodName,
+MgdDwfSectionResourceNotFoundException::MgdDwfSectionResourceNotFoundException(CREFSTRING methodName,
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
     MgApplicationException(methodName, lineNumber, fileName,
@@ -18,6 +18,6 @@
 /// \brief
 /// Destruct the object.
 ///
-MgDwfSectionResourceNotFoundException::~MgDwfSectionResourceNotFoundException() throw()
+MgdDwfSectionResourceNotFoundException::~MgdDwfSectionResourceNotFoundException() throw()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionResourceNotFoundException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionResourceNotFoundException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/DwfSectionResourceNotFoundException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,21 +1,21 @@
 #ifndef DESKTOP_DWF_SECTION_RESOURCE_NOT_FOUND_EXCEPTION_H
 #define DESKTOP_DWF_SECTION_RESOURCE_NOT_FOUND_EXCEPTION_H
 
-/// \ingroup Exceptions_Module
+/// \ingroup Desktop_Exceptions_Module
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Thrown when a DWF section resource is not found.
 ///
-class MG_DESKTOP_API MgDwfSectionResourceNotFoundException : public MgApplicationException
+class MG_DESKTOP_API MgdDwfSectionResourceNotFoundException : public MgApplicationException
 {
-    DECLARE_CLASSNAME(MgDwfSectionResourceNotFoundException)
+    DECLARE_CLASSNAME(MgdDwfSectionResourceNotFoundException)
 
 EXTERNAL_API:
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct a MgDwfSectionResourceNotFoundException object.
+    /// Construct a MgdDwfSectionResourceNotFoundException object.
     ///
     /// \param methodName
     /// Name of the method where the exception occurred.
@@ -30,23 +30,23 @@
     /// \param whyArguments
     /// Collection of arguments used to format the message that describes why the exception occurs.
     ///
-    MgDwfSectionResourceNotFoundException(CREFSTRING methodName, INT32 lineNumber,
+    MgdDwfSectionResourceNotFoundException(CREFSTRING methodName, INT32 lineNumber,
         CREFSTRING fileName, MgStringCollection* whatArguments,
         CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Destructor for a MgDwfSectionResourceNotFoundException object.
+    /// Destructor for a MgdDwfSectionResourceNotFoundException object.
     ///
-    virtual ~MgDwfSectionResourceNotFoundException() throw();
+    virtual ~MgdDwfSectionResourceNotFoundException() throw();
 
 INTERNAL_API:
 
-    DECLARE_EXCEPTION_DEFAULTS(MgDwfSectionResourceNotFoundException)
+    DECLARE_EXCEPTION_DEFAULTS(MgdDwfSectionResourceNotFoundException)
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgDwfSectionResourceNotFoundException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_DwfSectionResourceNotFoundException;
 };
 
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfPackageException.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfPackageException.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfPackageException.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,12 +1,12 @@
 #include "MgDesktop.h"
 
-IMPLEMENT_EXCEPTION_DEFAULTS(MgInvalidDwfPackageException, MgApplicationException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgdInvalidDwfPackageException, MgApplicationException)
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Construct a MgInvalidDwfPackageException object.
+/// Construct a MgdInvalidDwfPackageException object.
 ///
-MgInvalidDwfPackageException::MgInvalidDwfPackageException(CREFSTRING methodName,
+MgdInvalidDwfPackageException::MgdInvalidDwfPackageException(CREFSTRING methodName,
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
     MgApplicationException(methodName, lineNumber, fileName,
@@ -18,6 +18,6 @@
 /// \brief
 /// Destruct the object.
 ///
-MgInvalidDwfPackageException::~MgInvalidDwfPackageException() throw()
+MgdInvalidDwfPackageException::~MgdInvalidDwfPackageException() throw()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfPackageException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfPackageException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfPackageException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,21 +1,21 @@
 #ifndef DESKTOP_INVALID_DWF_PACKAGE_EXCEPTION_H
 #define DESKTOP_INVALID_DWF_PACKAGE_EXCEPTION_H
 
-/// \ingroup Exceptions_Module
+/// \ingroup Desktop_Exceptions_Module
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Thrown when a DWF package is not valid.
 ///
-class MG_DESKTOP_API MgInvalidDwfPackageException : public MgApplicationException
+class MG_DESKTOP_API MgdInvalidDwfPackageException : public MgApplicationException
 {
-    DECLARE_CLASSNAME(MgInvalidDwfPackageException)
+    DECLARE_CLASSNAME(MgdInvalidDwfPackageException)
 
 EXTERNAL_API:
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct a MgInvalidDwfPackageException object.
+    /// Construct a MgdInvalidDwfPackageException object.
     ///
     /// \param methodName
     /// Name of the method where the exception occurred.
@@ -30,23 +30,23 @@
     /// \param whyArguments
     /// Collection of arguments used to format the message that describes why the exception occurs.
     ///
-    MgInvalidDwfPackageException(CREFSTRING methodName, INT32 lineNumber,
+    MgdInvalidDwfPackageException(CREFSTRING methodName, INT32 lineNumber,
         CREFSTRING fileName, MgStringCollection* whatArguments,
         CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Destructor for a MgInvalidDwfPackageException object.
+    /// Destructor for a MgdInvalidDwfPackageException object.
     ///
-    virtual ~MgInvalidDwfPackageException() throw();
+    virtual ~MgdInvalidDwfPackageException() throw();
 
 INTERNAL_API:
 
-    DECLARE_EXCEPTION_DEFAULTS(MgInvalidDwfPackageException)
+    DECLARE_EXCEPTION_DEFAULTS(MgdInvalidDwfPackageException)
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgInvalidDwfPackageException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_InvalidDwfPackageException;
 };
 
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfSectionException.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfSectionException.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfSectionException.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,12 +1,12 @@
 #include "MgDesktop.h"
 
-IMPLEMENT_EXCEPTION_DEFAULTS(MgInvalidDwfSectionException, MgApplicationException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgdInvalidDwfSectionException, MgApplicationException)
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Construct a MgInvalidDwfSectionException object.
+/// Construct a MgdInvalidDwfSectionException object.
 ///
-MgInvalidDwfSectionException::MgInvalidDwfSectionException(CREFSTRING methodName,
+MgdInvalidDwfSectionException::MgdInvalidDwfSectionException(CREFSTRING methodName,
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
     MgApplicationException(methodName, lineNumber, fileName,
@@ -18,6 +18,6 @@
 /// \brief
 /// Destruct the object.
 ///
-MgInvalidDwfSectionException::~MgInvalidDwfSectionException() throw()
+MgdInvalidDwfSectionException::~MgdInvalidDwfSectionException() throw()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfSectionException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfSectionException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidDwfSectionException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,21 +1,21 @@
 #ifndef DESKTOP_INVALID_DWF_SECTION_EXCEPTION_H
 #define DESKTOP_INVALID_DWF_SECTION_EXCEPTION_H
 
-/// \ingroup Exceptions_Module
+/// \ingroup Desktop_Exceptions_Module
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Thrown when an invalid section in a DWF is found.
 ///
-class MG_DESKTOP_API MgInvalidDwfSectionException : public MgApplicationException
+class MG_DESKTOP_API MgdInvalidDwfSectionException : public MgApplicationException
 {
-    DECLARE_CLASSNAME(MgInvalidDwfSectionException)
+    DECLARE_CLASSNAME(MgdInvalidDwfSectionException)
 
 EXTERNAL_API:
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct a MgInvalidDwfSectionException object.
+    /// Construct a MgdInvalidDwfSectionException object.
     ///
     /// \param methodName
     /// Name of the method where the exception occurred.
@@ -30,23 +30,23 @@
     /// \param whyArguments
     /// Collection of arguments used to format the message that describes why the exception occurs.
     ///
-    MgInvalidDwfSectionException(CREFSTRING methodName, INT32 lineNumber,
+    MgdInvalidDwfSectionException(CREFSTRING methodName, INT32 lineNumber,
         CREFSTRING fileName, MgStringCollection* whatArguments,
         CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Destructor for a MgInvalidDwfSectionException object.
+    /// Destructor for a MgdInvalidDwfSectionException object.
     ///
-    virtual ~MgInvalidDwfSectionException() throw();
+    virtual ~MgdInvalidDwfSectionException() throw();
 
 INTERNAL_API:
 
-    DECLARE_EXCEPTION_DEFAULTS(MgInvalidDwfSectionException)
+    DECLARE_EXCEPTION_DEFAULTS(MgdInvalidDwfSectionException)
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgInvalidDwfSectionException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_InvalidDwfSectionException;
 };
 
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidFeatureSourceException.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidFeatureSourceException.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidFeatureSourceException.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,12 +1,12 @@
 #include "MgDesktop.h"
 
-IMPLEMENT_EXCEPTION_DEFAULTS(MgInvalidFeatureSourceException, MgApplicationException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgdInvalidFeatureSourceException, MgApplicationException)
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Construct a MgInvalidFeatureSourceException object.
+/// Construct a MgdInvalidFeatureSourceException object.
 ///
-MgInvalidFeatureSourceException::MgInvalidFeatureSourceException(CREFSTRING methodName,
+MgdInvalidFeatureSourceException::MgdInvalidFeatureSourceException(CREFSTRING methodName,
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
     MgApplicationException(methodName, lineNumber, fileName,
@@ -18,6 +18,6 @@
 /// \brief
 /// Destruct the object.
 ///
-MgInvalidFeatureSourceException::~MgInvalidFeatureSourceException() throw()
+MgdInvalidFeatureSourceException::~MgdInvalidFeatureSourceException() throw()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidFeatureSourceException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidFeatureSourceException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidFeatureSourceException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,21 +1,21 @@
 #ifndef DESKTOP_INVALID_FEATURE_SOURCE_EXCEPTION_H
 #define DESKTOP_INVALID_FEATURE_SOURCE_EXCEPTION_H
 
-/// \ingroup Exceptions_Module
+/// \ingroup Desktop_Exceptions_Module
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Thrown when FeatureService encounters a problem.
 ///
-class MG_DESKTOP_API MgInvalidFeatureSourceException : public MgApplicationException
+class MG_DESKTOP_API MgdInvalidFeatureSourceException : public MgApplicationException
 {
-    DECLARE_CLASSNAME(MgInvalidFeatureSourceException)
+    DECLARE_CLASSNAME(MgdInvalidFeatureSourceException)
 
 EXTERNAL_API:
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct a MgInvalidFeatureSourceException object.
+    /// Construct a MgdInvalidFeatureSourceException object.
     ///
     /// \param methodName
     /// Name of the method where the exception occurred.
@@ -30,23 +30,23 @@
     /// \param whyArguments
     /// Collection of arguments used to format the message that describes why the exception occurs.
     ///
-    MgInvalidFeatureSourceException(CREFSTRING methodName, INT32 lineNumber,
+    MgdInvalidFeatureSourceException(CREFSTRING methodName, INT32 lineNumber,
         CREFSTRING fileName, MgStringCollection* whatArguments,
         CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Destructor for a MgInvalidFeatureSourceException object.
+    /// Destructor for a MgdInvalidFeatureSourceException object.
     ///
-    virtual ~MgInvalidFeatureSourceException() throw();
+    virtual ~MgdInvalidFeatureSourceException() throw();
 
 INTERNAL_API:
 
-    DECLARE_EXCEPTION_DEFAULTS(MgInvalidFeatureSourceException)
+    DECLARE_EXCEPTION_DEFAULTS(MgdInvalidFeatureSourceException)
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgInvalidFeatureSourceException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_InvalidFeatureSourceException;
 };
 
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidLogEntryException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidLogEntryException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidLogEntryException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/// \ingroup Exceptions_Module
+/// \ingroup Desktop_Exceptions_Module
 
 #ifndef MG_INVALID_LOG_ENTRY_EXCEPTION_H_
 #define MG_INVALID_LOG_ENTRY_EXCEPTION_H_
@@ -65,7 +65,7 @@
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgInvalidLogEntryException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_InvalidLogEntryException;
 };
 
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutFontSizeUnitsException.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutFontSizeUnitsException.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutFontSizeUnitsException.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -17,13 +17,13 @@
 
 #include "MgDesktop.h"
 
-IMPLEMENT_EXCEPTION_DEFAULTS(MgInvalidPrintLayoutFontSizeUnitsException, MgApplicationException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgdInvalidPrintLayoutFontSizeUnitsException, MgApplicationException)
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Construct a MgInvalidPrintLayoutFontSizeException object.
 ///
-MgInvalidPrintLayoutFontSizeUnitsException::MgInvalidPrintLayoutFontSizeUnitsException(CREFSTRING methodName,
+MgdInvalidPrintLayoutFontSizeUnitsException::MgdInvalidPrintLayoutFontSizeUnitsException(CREFSTRING methodName,
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
     MgApplicationException(methodName, lineNumber, fileName,
@@ -35,6 +35,6 @@
 /// \brief
 /// Destruct the object.
 ///
-MgInvalidPrintLayoutFontSizeUnitsException::~MgInvalidPrintLayoutFontSizeUnitsException() throw()
+MgdInvalidPrintLayoutFontSizeUnitsException::~MgdInvalidPrintLayoutFontSizeUnitsException() throw()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutFontSizeUnitsException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutFontSizeUnitsException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutFontSizeUnitsException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/// \ingroup Exceptions_Module
+/// \ingroup Desktop_Exceptions_Module
 
 #ifndef DESKTOP_INVALID_PRINT_LAYOUT_FONT_SIZE_UNITS_EXCEPTION_H_
 #define DESKTOP_INVALID_PRINT_LAYOUT_FONT_SIZE_UNITS_EXCEPTION_H_
@@ -25,9 +25,9 @@
 /// Thrown when the font size units in a
 /// PrintLayout resource document are not valid.
 ///
-class MG_DESKTOP_API MgInvalidPrintLayoutFontSizeUnitsException : public MgApplicationException
+class MG_DESKTOP_API MgdInvalidPrintLayoutFontSizeUnitsException : public MgApplicationException
 {
-    DECLARE_CLASSNAME(MgInvalidPrintLayoutFontSizeUnitsException)
+    DECLARE_CLASSNAME(MgdInvalidPrintLayoutFontSizeUnitsException)
 
 EXTERNAL_API:
 
@@ -48,7 +48,7 @@
     /// \param whyArguments
     /// Collection of arguments used to format the message that describes why the exception occurs.
     ///
-    MgInvalidPrintLayoutFontSizeUnitsException(CREFSTRING methodName, INT32 lineNumber,
+    MgdInvalidPrintLayoutFontSizeUnitsException(CREFSTRING methodName, INT32 lineNumber,
         CREFSTRING fileName, MgStringCollection* whatArguments,
         CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
 
@@ -56,15 +56,15 @@
     /// \brief
     /// Destructor for a InvalidPrintLayoutFontSizeUnitsException object.
     ///
-    virtual ~MgInvalidPrintLayoutFontSizeUnitsException() throw();
+    virtual ~MgdInvalidPrintLayoutFontSizeUnitsException() throw();
 
 INTERNAL_API:
 
-    DECLARE_EXCEPTION_DEFAULTS(MgInvalidPrintLayoutFontSizeUnitsException)
+    DECLARE_EXCEPTION_DEFAULTS(MgdInvalidPrintLayoutFontSizeUnitsException)
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgInvalidPrintLayoutFontSizeUnitsException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_InvalidPrintLayoutFontSizeUnitsException;
 };
 
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutPositionUnitsException.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutPositionUnitsException.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutPositionUnitsException.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -17,13 +17,13 @@
 
 #include "MgDesktop.h"
 
-IMPLEMENT_EXCEPTION_DEFAULTS(MgInvalidPrintLayoutPositionUnitsException, MgApplicationException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgdInvalidPrintLayoutPositionUnitsException, MgApplicationException)
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Construct a MgInvalidPrintLayoutPositionUnitsException object.
+/// Construct a MgdInvalidPrintLayoutPositionUnitsException object.
 ///
-MgInvalidPrintLayoutPositionUnitsException::MgInvalidPrintLayoutPositionUnitsException(CREFSTRING methodName,
+MgdInvalidPrintLayoutPositionUnitsException::MgdInvalidPrintLayoutPositionUnitsException(CREFSTRING methodName,
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
     MgApplicationException(methodName, lineNumber, fileName,
@@ -35,6 +35,6 @@
 /// \brief
 /// Destruct the object.
 ///
-MgInvalidPrintLayoutPositionUnitsException::~MgInvalidPrintLayoutPositionUnitsException() throw()
+MgdInvalidPrintLayoutPositionUnitsException::~MgdInvalidPrintLayoutPositionUnitsException() throw()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutPositionUnitsException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutPositionUnitsException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutPositionUnitsException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/// \ingroup Exceptions_Module
+/// \ingroup Desktop_Exceptions_Module
 
 #ifndef DESKTOP_INVALID_PRINT_LAYOUT_POSITION_UNITS_EXCEPTION_H_
 #define DESKTOP_INVALID_PRINT_LAYOUT_POSITION_UNITS_EXCEPTION_H_
@@ -25,15 +25,15 @@
 /// Thrown when the position units
 /// in a PrintLayout resource document are not valid.
 ///
-class MG_DESKTOP_API MgInvalidPrintLayoutPositionUnitsException : public MgApplicationException
+class MG_DESKTOP_API MgdInvalidPrintLayoutPositionUnitsException : public MgApplicationException
 {
-    DECLARE_CLASSNAME(MgInvalidPrintLayoutPositionUnitsException)
+    DECLARE_CLASSNAME(MgdInvalidPrintLayoutPositionUnitsException)
 
 EXTERNAL_API:
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct a MgInvalidPrintLayoutPositionUnitsException object.
+    /// Construct a MgdInvalidPrintLayoutPositionUnitsException object.
     ///
     /// \param methodName
     /// Name of the method where the exception occurred.
@@ -48,23 +48,23 @@
     /// \param whyArguments
     /// Collection of arguments used to format the message that describes why the exception occurs.
     ///
-    MgInvalidPrintLayoutPositionUnitsException(CREFSTRING methodName, INT32 lineNumber,
+    MgdInvalidPrintLayoutPositionUnitsException(CREFSTRING methodName, INT32 lineNumber,
         CREFSTRING fileName, MgStringCollection* whatArguments,
         CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Destructor for a MgInvalidPrintLayoutPositionUnitsException object.
+    /// Destructor for a MgdInvalidPrintLayoutPositionUnitsException object.
     ///
-    virtual ~MgInvalidPrintLayoutPositionUnitsException() throw();
+    virtual ~MgdInvalidPrintLayoutPositionUnitsException() throw();
 
 INTERNAL_API:
 
-    DECLARE_EXCEPTION_DEFAULTS(MgInvalidPrintLayoutPositionUnitsException)
+    DECLARE_EXCEPTION_DEFAULTS(MgdInvalidPrintLayoutPositionUnitsException)
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgInvalidPrintLayoutPositionUnitsException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_InvalidPrintLayoutPositionUnitsException;
 };
 
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutSizeUnitsException.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutSizeUnitsException.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutSizeUnitsException.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -17,13 +17,13 @@
 
 #include "MgDesktop.h"
 
-IMPLEMENT_EXCEPTION_DEFAULTS(MgInvalidPrintLayoutSizeUnitsException, MgApplicationException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgdInvalidPrintLayoutSizeUnitsException, MgApplicationException)
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Construct a MgPrintToScaleModeNotSelectedException object.
 ///
-MgInvalidPrintLayoutSizeUnitsException::MgInvalidPrintLayoutSizeUnitsException(CREFSTRING methodName,
+MgdInvalidPrintLayoutSizeUnitsException::MgdInvalidPrintLayoutSizeUnitsException(CREFSTRING methodName,
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
     MgApplicationException(methodName, lineNumber, fileName,
@@ -35,6 +35,6 @@
 /// \brief
 /// Destruct the object.
 ///
-MgInvalidPrintLayoutSizeUnitsException::~MgInvalidPrintLayoutSizeUnitsException() throw()
+MgdInvalidPrintLayoutSizeUnitsException::~MgdInvalidPrintLayoutSizeUnitsException() throw()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutSizeUnitsException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutSizeUnitsException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/InvalidPrintLayoutSizeUnitsException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/// \ingroup Exceptions_Module
+/// \ingroup Desktop_Exceptions_Module
 
 #ifndef DESKTOP_INVALID_PRINT_LAYOUT_SIZE_UNITS_EXCEPTION_H_
 #define DESKTOP_INVALID_PRINT_LAYOUT_SIZE_UNITS_EXCEPTION_H_
@@ -25,15 +25,15 @@
 /// Thrown when the size units in a PrintLayout
 /// resource document are not valid.
 ///
-class MG_DESKTOP_API MgInvalidPrintLayoutSizeUnitsException : public MgApplicationException
+class MG_DESKTOP_API MgdInvalidPrintLayoutSizeUnitsException : public MgApplicationException
 {
-    DECLARE_CLASSNAME(MgInvalidPrintLayoutSizeUnitsException)
+    DECLARE_CLASSNAME(MgdInvalidPrintLayoutSizeUnitsException)
 
 EXTERNAL_API:
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct a MgInvalidPrintLayoutSizeUnitsException object.
+    /// Construct a MgdInvalidPrintLayoutSizeUnitsException object.
     ///
     /// \param methodName
     /// Name of the method where the exception occurred.
@@ -48,23 +48,23 @@
     /// \param whyArguments
     /// Collection of arguments used to format the message that describes why the exception occurs.
     ///
-    MgInvalidPrintLayoutSizeUnitsException(CREFSTRING methodName, INT32 lineNumber,
+    MgdInvalidPrintLayoutSizeUnitsException(CREFSTRING methodName, INT32 lineNumber,
         CREFSTRING fileName, MgStringCollection* whatArguments,
         CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Destructor for a MgInvalidPrintLayoutSizeUnitsException object.
+    /// Destructor for a MgdInvalidPrintLayoutSizeUnitsException object.
     ///
-    virtual ~MgInvalidPrintLayoutSizeUnitsException() throw();
+    virtual ~MgdInvalidPrintLayoutSizeUnitsException() throw();
 
 INTERNAL_API:
 
-    DECLARE_EXCEPTION_DEFAULTS(MgInvalidPrintLayoutSizeUnitsException)
+    DECLARE_EXCEPTION_DEFAULTS(MgdInvalidPrintLayoutSizeUnitsException)
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgInvalidPrintLayoutSizeUnitsException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_InvalidPrintLayoutSizeUnitsException;
 };
 
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/ParameterNotFoundException.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/ParameterNotFoundException.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/ParameterNotFoundException.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,12 +1,12 @@
 #include "MgDesktop.h"
 
-IMPLEMENT_EXCEPTION_DEFAULTS(MgParameterNotFoundException, MgApplicationException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgdParameterNotFoundException, MgApplicationException)
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Construct a MgParameterNotFoundException object.
+/// Construct a MgdParameterNotFoundException object.
 ///
-MgParameterNotFoundException::MgParameterNotFoundException(CREFSTRING methodName,
+MgdParameterNotFoundException::MgdParameterNotFoundException(CREFSTRING methodName,
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
     MgApplicationException(methodName, lineNumber, fileName,
@@ -16,8 +16,8 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Destruct the MgParameterNotFoundException object.
+/// Destruct the MgdParameterNotFoundException object.
 ///
-MgParameterNotFoundException::~MgParameterNotFoundException() throw()
+MgdParameterNotFoundException::~MgdParameterNotFoundException() throw()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/ParameterNotFoundException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/ParameterNotFoundException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/ParameterNotFoundException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -7,15 +7,15 @@
 /// \brief
 /// Thrown when a parameter is not found.
 ///
-class MG_DESKTOP_API MgParameterNotFoundException : public MgApplicationException
+class MG_DESKTOP_API MgdParameterNotFoundException : public MgApplicationException
 {
-    DECLARE_CLASSNAME(MgParameterNotFoundException)
+    DECLARE_CLASSNAME(MgdParameterNotFoundException)
 
 EXTERNAL_API:
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct a MgParameterNotFoundException object.
+    /// Construct a MgdParameterNotFoundException object.
     ///
     /// \param methodName
     /// Name of the method where the exception occurred.
@@ -30,23 +30,23 @@
     /// \param whyArguments
     /// Collection of arguments used to format the message that describes why the exception occurs.
     ///
-    MgParameterNotFoundException(CREFSTRING methodName, INT32 lineNumber,
+    MgdParameterNotFoundException(CREFSTRING methodName, INT32 lineNumber,
         CREFSTRING fileName, MgStringCollection* whatArguments,
         CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Destruct the MgParameterNotFoundException object.
+    /// Destruct the MgdParameterNotFoundException object.
     ///
-    virtual ~MgParameterNotFoundException() throw();
+    virtual ~MgdParameterNotFoundException() throw();
 
 INTERNAL_API:
 
-    DECLARE_EXCEPTION_DEFAULTS(MgParameterNotFoundException)
+    DECLARE_EXCEPTION_DEFAULTS(MgdParameterNotFoundException)
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgParameterNotFoundException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_ParameterNotFoundException;
 };
 /// \endcond
 

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/StylizeLayerFailedException.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/StylizeLayerFailedException.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/StylizeLayerFailedException.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,12 +1,12 @@
 #include "MgDesktop.h"
 
-IMPLEMENT_EXCEPTION_DEFAULTS(MgStylizeLayerFailedException, MgApplicationException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgdStylizeLayerFailedException, MgApplicationException)
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Construct a MgStylizeLayerFailedException object.
+/// Construct a MgdStylizeLayerFailedException object.
 ///
-MgStylizeLayerFailedException::MgStylizeLayerFailedException(CREFSTRING methodName,
+MgdStylizeLayerFailedException::MgdStylizeLayerFailedException(CREFSTRING methodName,
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
     MgApplicationException(methodName, lineNumber, fileName,
@@ -18,6 +18,6 @@
 /// \brief
 /// Destruct the object.
 ///
-MgStylizeLayerFailedException::~MgStylizeLayerFailedException() throw()
+MgdStylizeLayerFailedException::~MgdStylizeLayerFailedException() throw()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Exception/StylizeLayerFailedException.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Exception/StylizeLayerFailedException.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Exception/StylizeLayerFailedException.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,19 +1,21 @@
 #ifndef DESKTOP_STYLIZE_LAYER_FAILED_EXCEPTION_H
 #define DESKTOP_STYLIZE_LAYER_FAILED_EXCEPTION_H
 
+/// \ingroup Desktop_Exceptions_Module
+
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Thrown when a stylize layer fails.
 ///
-class MG_DESKTOP_API MgStylizeLayerFailedException : public MgApplicationException
+class MG_DESKTOP_API MgdStylizeLayerFailedException : public MgApplicationException
 {
-    DECLARE_CLASSNAME(MgStylizeLayerFailedException)
+    DECLARE_CLASSNAME(MgdStylizeLayerFailedException)
 
 EXTERNAL_API:
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct a MgStylizeLayerFailedException object.
+    /// Construct a MgdStylizeLayerFailedException object.
     ///
     /// \param methodName
     /// Name of the method where the exception occurred.
@@ -28,23 +30,23 @@
     /// \param whyArguments
     /// Collection of arguments used to format the message that describes why the exception occurs.
     ///
-    MgStylizeLayerFailedException(CREFSTRING methodName, INT32 lineNumber,
+    MgdStylizeLayerFailedException(CREFSTRING methodName, INT32 lineNumber,
         CREFSTRING fileName, MgStringCollection* whatArguments,
         CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
 
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Destructor for a MgStylizeLayerFailedException object.
+    /// Destructor for a MgdStylizeLayerFailedException object.
     ///
-    virtual ~MgStylizeLayerFailedException() throw();
+    virtual ~MgdStylizeLayerFailedException() throw();
 
 INTERNAL_API:
 
-    DECLARE_EXCEPTION_DEFAULTS(MgStylizeLayerFailedException)
+    DECLARE_EXCEPTION_DEFAULTS(MgdStylizeLayerFailedException)
 
 CLASS_ID:
 
-    static const INT32 m_cls_id = MapGuide_Desktop_Exception_MgStylizeLayerFailedException;
+    static const INT32 m_cls_id = MapGuide_Desktop_Exception_StylizeLayerFailedException;
 };
 
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -331,7 +331,7 @@
         STRING errorMsg = parser.GetErrorMessage();
         MgStringCollection arguments;
         arguments.Add(errorMsg);
-        //TODO: MgInvalidFeatureSourceException
+        //TODO: MgdInvalidFeatureSourceException
 		throw new MgFeatureServiceException(L"MgdLayer::UpdateFeatures", __LINE__, __WFILE__, &arguments, L"", NULL);
     }
 

Modified: branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Layer.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Layer.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Layer.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -5,7 +5,7 @@
 
 class MgdScrollableFeatureReader;
 
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Map_and_Layers_Module
 /// \{
 class MG_DESKTOP_API MgdLayer : public MgLayerBase
 {

Modified: branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Map.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Map.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Map.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -11,7 +11,7 @@
 
 class MgServiceFactory;
 
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Map_and_Layers_Module
 /// \{
 class MG_DESKTOP_API MgdMap : public MgMapBase
 {

Modified: branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Selection.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Selection.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/MapLayer/Selection.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -4,7 +4,7 @@
 #include "MgDesktop.h"
 #include "Map.h"
 
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Map_and_Layers_Module
 /// \{
 class MG_DESKTOP_API MgdSelection : public MgSelectionBase
 {

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/DataReader.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/DataReader.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/DataReader.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -6,7 +6,7 @@
 class FdoIDataReader;
 class MgFeatureConnection;
 
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
 class MG_DESKTOP_API MgdDataReader : public MgDataReader
 {

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingDefs.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingDefs.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingDefs.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -15,7 +15,7 @@
     {                                                                         \
         MgStringCollection arguments;                                         \
         arguments.Add(STRING(e.message()));                                   \
-        mgException = new MgDwfException(methodName, __LINE__, __WFILE__, NULL, L"MgFormatInnerExceptionMessage", &arguments); \
+        mgException = new MgdDwfException(methodName, __LINE__, __WFILE__, NULL, L"MgFormatInnerExceptionMessage", &arguments); \
                                                                               \
     MG_CATCH(methodName)                                                      \
 

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingServiceUtil.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingServiceUtil.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingServiceUtil.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -329,7 +329,7 @@
     {
         MgStringCollection arguments;
         arguments.Add(dwfFileName);
-        throw new MgInvalidDwfPackageException(L"MgDrawingServiceUtil.OpenDrawingResource", __LINE__, __WFILE__, &arguments, L"", NULL);
+        throw new MgdInvalidDwfPackageException(L"MgDrawingServiceUtil.OpenDrawingResource", __LINE__, __WFILE__, &arguments, L"", NULL);
     }
 
     MG_SERVER_DRAWING_SERVICE_CATCH_AND_THROW(L"MgDrawingServiceUtil.OpenDrawingResource")

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingServiceUtil.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingServiceUtil.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingServiceUtil.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -29,7 +29,7 @@
     WT_File* pFile;
 };
 
-
+/// \cond INTERNAL
 class MG_DESKTOP_API MgDrawingServiceUtil
 {
     /// Constructors/Destructor
@@ -77,5 +77,5 @@
             MgByteReader* byteReader, REFSTRING dwfPathName, REFSTRING dwfCoordinateSpace);
 
 };
-
+/// \endcond
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -89,8 +89,8 @@
 /// - MgInvalidCastException if there are problems reading the DWF into memory.
 /// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
 /// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
-/// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
-/// - MgDwfException if the DWF component encounters errors.
+/// - MgdInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
+/// - MgdDwfException if the DWF component encounters errors.
 /// - See MgResourceService for additional exceptions.
 MgByteReader* MgdDrawingService::DescribeDrawing(MgResourceIdentifier* resource)
 {
@@ -192,14 +192,14 @@
 /// </returns>
 /// EXCEPTIONS:
 /// - MgInvalidArgumentException if the section name is blank
-/// - MgDwfSectionNotFoundException if the requested section does not exist in the DWF package.
-/// - MgInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
+/// - MgdDwfSectionNotFoundException if the requested section does not exist in the DWF package.
+/// - MgdInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
 /// - MgNullReferenceException no data could be read from the DWF resource.
 /// - MgOutOfMemoryException if there is insufficient memory to complete the operation.
 /// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
 /// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
-/// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
-/// - MgDwfException if the DWF component encounters errors.
+/// - MgdInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
+/// - MgdDwfException if the DWF component encounters errors.
 /// - MgTemporaryFileNotAvailableException if a temporary file need to complete the operation cannot be generated or accessed.
 /// - See MgResourceService for additional exceptions.
 MgByteReader* MgdDrawingService::GetSection(MgResourceIdentifier* resource, CREFSTRING sectionName)
@@ -243,7 +243,7 @@
         {
             MgStringCollection arguments;
             arguments.Add(sectionName);
-            throw new MgDwfSectionNotFoundException(L"MgdDrawingService.GetSection", __LINE__, __WFILE__, &arguments, L"", NULL);
+            throw new MgdDwfSectionNotFoundException(L"MgdDrawingService.GetSection", __LINE__, __WFILE__, &arguments, L"", NULL);
         }
 
         // Create a DWFPackageWriter for writing the section to a temporary DWF file
@@ -321,13 +321,13 @@
 /// EXCEPTIONS:
 /// - MgInvalidArgumentException if the requested resourceName does not specify a section name.
 /// - MgInvalidArgumentException if the section name is blank
-/// - MgDwfSectionNotFoundException if the requested section does not exist in the DWF package.
-/// - MgDwfSectionResourceNotFoundException if the requested section resource does not exist in the DWF package.
+/// - MgdDwfSectionNotFoundException if the requested section does not exist in the DWF package.
+/// - MgdDwfSectionResourceNotFoundException if the requested section resource does not exist in the DWF package.
 /// - MgInvalidCastException if there are problems reading the DWF into memory.
 /// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
 /// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
-/// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
-/// - MgDwfException if the DWF component encounters errors.
+/// - MgdInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
+/// - MgdDwfException if the DWF component encounters errors.
 /// - MgTemporaryFileNotAvailableException if a temporary file need to complete the operation cannot be generated or accessed.
 /// - See MgResourceService for additional exceptions.
 MgByteReader* MgdDrawingService::GetSectionResource(MgResourceIdentifier* resource, CREFSTRING resourceName)
@@ -395,7 +395,7 @@
         {
             MgStringCollection arguments;
             arguments.Add(sectionName);
-            throw new MgDwfSectionNotFoundException(L"MgdDrawingService.GetSectionResource", __LINE__, __WFILE__, &arguments, L"", NULL);
+            throw new MgdDwfSectionNotFoundException(L"MgdDrawingService.GetSectionResource", __LINE__, __WFILE__, &arguments, L"", NULL);
         }
         // ...check if the resource exists in the section
         DWFResource* pResource = pSection->findResourceByHREF(resourceName.c_str());
@@ -403,7 +403,7 @@
         {
             MgStringCollection arguments;
             arguments.Add(resourceName);
-            throw new MgDwfSectionResourceNotFoundException(L"MgdDrawingService.GetSectionResource", __LINE__, __WFILE__, &arguments, L"", NULL);
+            throw new MgdDwfSectionResourceNotFoundException(L"MgdDrawingService.GetSectionResource", __LINE__, __WFILE__, &arguments, L"", NULL);
         }
         // ...get the mime type for the resource
         STRING wsMimeType = (STRING)pResource->mime();
@@ -476,13 +476,13 @@
 /// </returns>
 /// EXCEPTIONS:
 /// - MgInvalidArgumentException if the section name is blank
-/// - MgDwfSectionNotFoundException if the requested section does not exist in the DWF package.
-/// - MgInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
+/// - MgdDwfSectionNotFoundException if the requested section does not exist in the DWF package.
+/// - MgdInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
 /// - MgNullReferenceException no data could be read from the DWF resource.
 /// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
 /// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
-/// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
-/// - MgDwfException if the DWF component encounters errors.
+/// - MgdInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
+/// - MgdDwfException if the DWF component encounters errors.
 /// - MgTemporaryFileNotAvailableException if a temporary file need to complete the operation cannot be generated or accessed.
 /// - See MgResourceService for additional exceptions.
 MgStringCollection* MgdDrawingService::EnumerateLayers(MgResourceIdentifier* resource, CREFSTRING sectionName)
@@ -526,7 +526,7 @@
         {
             MgStringCollection arguments;
             arguments.Add(sectionName);
-            throw new MgDwfSectionNotFoundException(L"MgdDrawingService.EnumerateLayers", __LINE__, __WFILE__, &arguments, L"", NULL);
+            throw new MgdDwfSectionNotFoundException(L"MgdDrawingService.EnumerateLayers", __LINE__, __WFILE__, &arguments, L"", NULL);
         }
 
         // Get the resources for the section
@@ -546,7 +546,7 @@
                 {
                     MgStringCollection arguments;
                     arguments.Add(sectionName);
-                    throw new MgInvalidDwfSectionException(L"MgdDrawingService.GetSection", __LINE__, __WFILE__, &arguments, L"", NULL);
+                    throw new MgdInvalidDwfSectionException(L"MgdDrawingService.GetSection", __LINE__, __WFILE__, &arguments, L"", NULL);
                 }
 
                 pResource = piResources->get();
@@ -662,15 +662,15 @@
 /// </returns>
 /// EXCEPTIONS:
 /// - MgInvalidArgumentException if the section name is blank
-/// - MgDwfSectionNotFoundException if the requested section does not exist in the DWF package.
-/// - MgInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
+/// - MgdDwfSectionNotFoundException if the requested section does not exist in the DWF package.
+/// - MgdInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
 /// - MgNullReferenceException if data could not be read from the DWF resource.
 /// - MgOutOfMemoryException if there is insufficient memory to complete the operation.
 /// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
 /// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
-/// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
+/// - MgdInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
 /// - MgLayerNotFoundException if the requested layer does not exist in the requested section of the DWF package.
-/// - MgDwfException if the DWF component encounters errors.
+/// - MgdDwfException if the DWF component encounters errors.
 /// - See MgResourceService for additional exceptions.
 MgByteReader* MgdDrawingService::GetLayer( MgResourceIdentifier* resource, CREFSTRING sectionName, CREFSTRING layerName )
 {
@@ -716,7 +716,7 @@
         {
             MgStringCollection arguments;
             arguments.Add(sectionName);
-            throw new MgDwfSectionNotFoundException(L"MgdDrawingService.GetLayer", __LINE__, __WFILE__, &arguments, L"", NULL);
+            throw new MgdDwfSectionNotFoundException(L"MgdDrawingService.GetLayer", __LINE__, __WFILE__, &arguments, L"", NULL);
         }
         pSection->readDescriptor();
 
@@ -737,7 +737,7 @@
                 {
                     MgStringCollection arguments;
                     arguments.Add(sectionName);
-                    throw new MgInvalidDwfSectionException(L"MgdDrawingService.GetSection", __LINE__, __WFILE__, &arguments, L"", NULL);
+                    throw new MgdInvalidDwfSectionException(L"MgdDrawingService.GetSection", __LINE__, __WFILE__, &arguments, L"", NULL);
                 }
 
                 pResource = piResources->get();
@@ -987,8 +987,8 @@
 /// - MgNullReferenceException no data could be read from the DWF resource.
 /// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
 /// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
-/// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
-/// - MgDwfException if the DWF component encounters errors.
+/// - MgdInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
+/// - MgdDwfException if the DWF component encounters errors.
 /// - See MgResourceService for additional exceptions.
 MgByteReader* MgdDrawingService::EnumerateSections(MgResourceIdentifier* resource)
 {
@@ -1127,13 +1127,13 @@
 /// </returns>
 /// EXCEPTIONS:
 /// - MgInvalidArgumentException if the section name is blank
-/// - MgDwfSectionNotFoundException if the requested section does not exist in the DWF package.
-/// - MgInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
+/// - MgdDwfSectionNotFoundException if the requested section does not exist in the DWF package.
+/// - MgdInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
 /// - MgNullReferenceException no data could be read from the DWF resource.
 /// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
 /// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
-/// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
-/// - MgDwfException if the DWF component encounters errors.
+/// - MgdInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
+/// - MgdDwfException if the DWF component encounters errors.
 /// - See MgResourceService for additional exceptions.
 MgByteReader* MgdDrawingService::EnumerateSectionResources(MgResourceIdentifier* resource, CREFSTRING sectionName)
 {
@@ -1176,7 +1176,7 @@
         {
             MgStringCollection arguments;
             arguments.Add(sectionName);
-            throw new MgDwfSectionNotFoundException(L"MgdDrawingService.EnumerateSectionResources", __LINE__, __WFILE__, &arguments, L"", NULL);
+            throw new MgdDwfSectionNotFoundException(L"MgdDrawingService.EnumerateSectionResources", __LINE__, __WFILE__, &arguments, L"", NULL);
         }
 
         // Get all the resources in the section
@@ -1186,7 +1186,7 @@
         {
             MgStringCollection arguments;
             arguments.Add(sectionName);
-            throw new MgInvalidDwfSectionException(L"MgdDrawingService.EnumerateSectionResources", __LINE__, __WFILE__, &arguments, L"", NULL);
+            throw new MgdInvalidDwfSectionException(L"MgdDrawingService.EnumerateSectionResources", __LINE__, __WFILE__, &arguments, L"", NULL);
         }
 
         // Iterate through the resources and write to xml document

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -3,7 +3,7 @@
 
 #include "MgDesktop.h"
 
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Service_Module
 /// \{
 class MG_DESKTOP_API MgdDrawingService : public MgService
 {
@@ -54,8 +54,8 @@
     /// - MgInvalidCastException if there are problems reading the DWF into memory.
     /// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
     /// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
-    /// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
-    /// - MgDwfException if the DWF component encounters errors.
+    /// - MgdInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
+    /// - MgdDwfException if the DWF component encounters errors.
     /// - See MgResourceService for additional exceptions.
     MgByteReader* DescribeDrawing(MgResourceIdentifier* resource);
 
@@ -74,14 +74,14 @@
     /// Returns DWF stream containing the specified section.
     /// </returns>
     /// EXCEPTIONS:
-    /// - MgDwfSectionNotFoundException if the requested section does not exist in the DWF package.
-    /// - MgInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
+    /// - MgdDwfSectionNotFoundException if the requested section does not exist in the DWF package.
+    /// - MgdInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
     /// - MgNullReferenceException no data could be read from the DWF resource.
     /// - MgOutOfMemoryException if there is insufficient memory to complete the operation.
     /// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
     /// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
-    /// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
-    /// - MgDwfException if the DWF component encounters errors.
+    /// - MgdInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
+    /// - MgdDwfException if the DWF component encounters errors.
     /// - MgTemporaryFileNotAvailableException if a temporary file need to complete the operation cannot be generated or accessed.
     /// - See MgResourceService for additional exceptions.
     MgByteReader* GetSection(MgResourceIdentifier* resource, CREFSTRING sectionName);
@@ -111,13 +111,13 @@
     /// </returns>
     /// EXCEPTIONS:
     /// - MgInvalidArgumentException if the requested resourceName does not specify a section name.
-    /// - MgDwfSectionNotFoundException if the requested section does not exist in the DWF package.
-    /// - MgDwfSectionResourceNotFoundException if the requested section resource does not exist in the DWF package.
+    /// - MgdDwfSectionNotFoundException if the requested section does not exist in the DWF package.
+    /// - MgdDwfSectionResourceNotFoundException if the requested section resource does not exist in the DWF package.
     /// - MgInvalidCastException if there are problems reading the DWF into memory.
     /// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
     /// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
-    /// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
-    /// - MgDwfException if the DWF component encounters errors.
+    /// - MgdInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
+    /// - MgdDwfException if the DWF component encounters errors.
     /// - MgTemporaryFileNotAvailableException if a temporary file need to complete the operation cannot be generated or accessed.
     /// - See MgResourceService for additional exceptions.
     MgByteReader* GetSectionResource(MgResourceIdentifier* resource, CREFSTRING resourceName);
@@ -140,13 +140,13 @@
     /// Returns the pointer to a StringCollection of layer names.
     /// </returns>
     /// EXCEPTIONS:
-    /// - MgDwfSectionNotFoundException if the requested section does not exist in the DWF package.
-    /// - MgInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
+    /// - MgdDwfSectionNotFoundException if the requested section does not exist in the DWF package.
+    /// - MgdInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
     /// - MgNullReferenceException no data could be read from the DWF resource.
     /// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
     /// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
-    /// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
-    /// - MgDwfException if the DWF component encounters errors.
+    /// - MgdInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
+    /// - MgdDwfException if the DWF component encounters errors.
     /// - MgTemporaryFileNotAvailableException if a temporary file need to complete the operation cannot be generated or accessed.
     /// - See MgResourceService for additional exceptions.
     MgStringCollection* EnumerateLayers(MgResourceIdentifier* resource, CREFSTRING sectionName);
@@ -168,15 +168,15 @@
     /// Returns DWF stream containing the specified layer (in a section)
     /// </returns>
     /// EXCEPTIONS:
-    /// - MgDwfSectionNotFoundException if the requested section does not exist in the DWF package.
-    /// - MgInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
+    /// - MgdDwfSectionNotFoundException if the requested section does not exist in the DWF package.
+    /// - MgdInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
     /// - MgNullReferenceException if data could not be read from the DWF resource.
     /// - MgOutOfMemoryException if there is insufficient memory to complete the operation.
     /// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
     /// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
-    /// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
+    /// - MgdInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
     /// - MgLayerNotFoundException if the requested layer does not exist in the requested section of the DWF package.
-    /// - MgDwfException if the DWF component encounters errors.
+    /// - MgdDwfException if the DWF component encounters errors.
     /// - See MgResourceService for additional exceptions.
     MgByteReader* GetLayer( MgResourceIdentifier* resource,
                             CREFSTRING sectionName,
@@ -198,8 +198,8 @@
     /// - MgNullReferenceException no data could be read from the DWF resource.
     /// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
     /// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
-    /// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
-    /// - MgDwfException if the DWF component encounters errors.
+    /// - MgdInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
+    /// - MgdDwfException if the DWF component encounters errors.
     /// - See MgResourceService for additional exceptions.
     MgByteReader* EnumerateSections(MgResourceIdentifier* resource);
 
@@ -220,13 +220,13 @@
     ///
     /// </returns>
     /// EXCEPTIONS:
-    /// - MgDwfSectionNotFoundException if the requested section does not exist in the DWF package.
-    /// - MgInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
+    /// - MgdDwfSectionNotFoundException if the requested section does not exist in the DWF package.
+    /// - MgdInvalidDwfSectionException if the 2d graphics resource for the DWF section cannot be found.
     /// - MgNullReferenceException no data could be read from the DWF resource.
     /// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
     /// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
-    /// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
-    /// - MgDwfException if the DWF component encounters errors.
+    /// - MgdInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
+    /// - MgdDwfException if the DWF component encounters errors.
     /// - See MgResourceService for additional exceptions.
     MgByteReader* EnumerateSectionResources(MgResourceIdentifier* resource, CREFSTRING sectionName);
 

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/BooleanDataReaderCreator.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/BooleanDataReaderCreator.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/BooleanDataReaderCreator.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -22,6 +22,7 @@
 
 #include <vector>
 
+/// \cond INTERNAL
 class MgBooleanDataReaderCreator : public MgDataReaderCreator<INT16>
 {
     DECLARE_CLASSNAME(MgBooleanDataReaderCreator)
@@ -52,5 +53,6 @@
         delete this;
     }
 };
+/// \endcond
 
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/ByteDataReaderCreator.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/ByteDataReaderCreator.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/ByteDataReaderCreator.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -22,6 +22,7 @@
 
 #include <vector>
 
+/// \cond INTERNAL
 class MgByteDataReaderCreator : public MgDataReaderCreator<INT8>
 {
     DECLARE_CLASSNAME(MgByteDataReaderCreator)
@@ -52,5 +53,6 @@
         delete this;
     }
 };
+/// \endcond
 
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/CreateFeatureSource.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/CreateFeatureSource.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/CreateFeatureSource.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -16,7 +16,7 @@
     MG_FEATURE_SERVICE_TRY()
 
     MgFileFeatureSourceParams* params = dynamic_cast<MgFileFeatureSourceParams*>(sourceParams);
-    MgRdbmsFeatureSourceParams* rdbParams = dynamic_cast<MgRdbmsFeatureSourceParams*>(sourceParams);
+    MgdRdbmsFeatureSourceParams* rdbParams = dynamic_cast<MgdRdbmsFeatureSourceParams*>(sourceParams);
     if (NULL != params)
     {
         STRING providerName = params->GetProviderName();
@@ -119,13 +119,13 @@
     {
         if(NULL == connWrap.p)
         {
-            throw new MgConnectionFailedException(L"MgCreateFileFeatureSource.CreateFeatureSource", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgdConnectionFailedException(L"MgCreateFileFeatureSource.CreateFeatureSource", __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
         FdoPtr<FdoIConnection> conn = connWrap->GetConnection();
         if (conn == NULL)
         {
-            throw new MgConnectionFailedException(L"MgCreateFileFeatureSource.CreateFeatureSource", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgdConnectionFailedException(L"MgCreateFileFeatureSource.CreateFeatureSource", __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
         CreateDataStore(conn);
@@ -401,7 +401,7 @@
     return featureSource;
 }
 
-MgCreateRdbmsFeatureSource::MgCreateRdbmsFeatureSource(MgResourceIdentifier* resource, MgRdbmsFeatureSourceParams* params)
+MgCreateRdbmsFeatureSource::MgCreateRdbmsFeatureSource(MgResourceIdentifier* resource, MgdRdbmsFeatureSourceParams* params)
 {
     m_resource = resource;
     SAFE_ADDREF(resource);
@@ -452,7 +452,7 @@
         //Amend connection string to incorporate the created data store
         conn = new MgFeatureConnection(provider, connStr);
         if (!conn->IsConnectionOpen())
-            throw new MgConnectionFailedException(L"MgCreateRdbmsFeatureSource::CreateFeatureSource", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgdConnectionFailedException(L"MgCreateRdbmsFeatureSource::CreateFeatureSource", __LINE__, __WFILE__, NULL, L"", NULL);
 
         fdoConn = conn->GetConnection();
 

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/CreateFeatureSource.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/CreateFeatureSource.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/CreateFeatureSource.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -21,7 +21,7 @@
 class MgCreateRdbmsFeatureSource : public MgGuardDisposable
 {
 public:
-    MgCreateRdbmsFeatureSource(MgResourceIdentifier* resource, MgRdbmsFeatureSourceParams* params);
+    MgCreateRdbmsFeatureSource(MgResourceIdentifier* resource, MgdRdbmsFeatureSourceParams* params);
     virtual ~MgCreateRdbmsFeatureSource();
 
     void CreateFeatureSource();
@@ -31,7 +31,7 @@
     void WriteFeatureSourceContent();
 
     MgResourceIdentifier* m_resource;
-    MgRdbmsFeatureSourceParams* m_params;
+    MgdRdbmsFeatureSourceParams* m_params;
 };
 
 class MgCreateFileFeatureSource : public MgGuardDisposable

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/DescribeSchema.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/DescribeSchema.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/DescribeSchema.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -195,7 +195,7 @@
                     }
                     else
                     {
-                        throw new MgConnectionFailedException(L"MgDescribeSchema.DescribeFdoSchema", __LINE__, __WFILE__, NULL, L"", NULL);
+                        throw new MgdConnectionFailedException(L"MgDescribeSchema.DescribeFdoSchema", __LINE__, __WFILE__, NULL, L"", NULL);
                     }
                 }
 
@@ -205,7 +205,7 @@
     }
     else
     {
-        throw new MgConnectionFailedException(L"MgDescribeSchema.DescribeFdoSchema", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgdConnectionFailedException(L"MgDescribeSchema.DescribeFdoSchema", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     MG_FEATURE_SERVICE_CHECK_CONNECTION_CATCH_AND_THROW(resource, L"MgDescribeSchema.DescribeFdoSchema")
@@ -541,7 +541,7 @@
                         }
                         else
                         {
-                            throw new MgConnectionFailedException(L"MgDescribeSchema.DescribeSchema", __LINE__, __WFILE__, NULL, L"", NULL);
+                            throw new MgdConnectionFailedException(L"MgDescribeSchema.DescribeSchema", __LINE__, __WFILE__, NULL, L"", NULL);
                         }
 
                     }  // end if (NULL != secFeatureSource)
@@ -897,7 +897,7 @@
         }
         else
         {
-            throw new MgConnectionFailedException(L"MgDescribeSchema.GetSchemas",
+            throw new MgdConnectionFailedException(L"MgDescribeSchema.GetSchemas",
                 __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
@@ -1000,7 +1000,7 @@
         }
         else
         {
-            throw new MgConnectionFailedException(L"MgDescribeSchema.GetClasses",
+            throw new MgdConnectionFailedException(L"MgDescribeSchema.GetClasses",
                 __LINE__, __WFILE__, NULL, L"", NULL);
         }
 

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/EnumerateDataStores.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/EnumerateDataStores.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/EnumerateDataStores.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -86,7 +86,7 @@
     }
     else
     {
-        throw new MgConnectionFailedException(L"MgEnumerateDataStores::EnumerateDataStores()", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgdConnectionFailedException(L"MgEnumerateDataStores::EnumerateDataStores()", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgEnumerateDataStores.EnumerateDataStores")

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/ExtendedSelectCommand.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/ExtendedSelectCommand.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/ExtendedSelectCommand.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -42,7 +42,7 @@
     }
     else
     {
-        throw new MgConnectionFailedException(L"MgExtendedSelectCommand.MgExtendedSelectCommand", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgdConnectionFailedException(L"MgExtendedSelectCommand.MgExtendedSelectCommand", __LINE__, __WFILE__, NULL, L"", NULL);
     }
     // Create FdoIExtendedSelect command
     FdoPtr<FdoIConnection> fdoConn = m_connection->GetConnection();

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetConnectionPropertyValues.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetConnectionPropertyValues.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetConnectionPropertyValues.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -90,7 +90,7 @@
     {
         if(NULL == msfc.p)
         {
-            throw new MgConnectionFailedException(L"MgGetConnectionPropertyValues.GetConnectionPropertyValues", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgdConnectionFailedException(L"MgGetConnectionPropertyValues.GetConnectionPropertyValues", __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
         // The reference to the FDO connection from the MgFeatureConnection object must be cleaned up before the parent object

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetLongTransactions.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetLongTransactions.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetLongTransactions.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -96,7 +96,7 @@
     }
     else
     {
-        throw new MgConnectionFailedException(L"MgGetLongTransactions::GetLongTransactions()", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgdConnectionFailedException(L"MgGetLongTransactions::GetLongTransactions()", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     MG_FEATURE_SERVICE_CHECK_CONNECTION_CATCH_AND_THROW(resId, L"MgGetLongTransactions.GetLongTransactions")

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetSchemaMapping.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetSchemaMapping.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetSchemaMapping.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -110,7 +110,7 @@
     }
     else
     {
-        throw new MgConnectionFailedException(L"MgGetSchemaMapping::GetSchemaMapping()", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgdConnectionFailedException(L"MgGetSchemaMapping::GetSchemaMapping()", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgGetSchemaMapping.GetSchemaMapping")

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetSpatialContexts.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetSpatialContexts.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/GetSpatialContexts.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -89,7 +89,7 @@
         }
         else
         {
-            throw new MgConnectionFailedException(L"MgGetSpatialContexts.GetSpatialContexts()", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgdConnectionFailedException(L"MgGetSpatialContexts.GetSpatialContexts()", __LINE__, __WFILE__, NULL, L"", NULL);
         }
     }
     else

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SelectAggregateCommand.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SelectAggregateCommand.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SelectAggregateCommand.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -41,7 +41,7 @@
     }
     else
     {
-        throw new MgConnectionFailedException(L"MgSelectAggregateCommand.MgSelectAggregateCommand", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgdConnectionFailedException(L"MgSelectAggregateCommand.MgSelectAggregateCommand", __LINE__, __WFILE__, NULL, L"", NULL);
     }
     // Create FdoISelectAggregates command
     FdoPtr<FdoIConnection> fdoConn = m_connection->GetConnection();

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SelectCommand.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SelectCommand.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SelectCommand.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -42,7 +42,7 @@
     }
     else
     {
-        throw new MgConnectionFailedException(L"MgSelectCommand.MgSelectCommand", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgdConnectionFailedException(L"MgSelectCommand.MgSelectCommand", __LINE__, __WFILE__, NULL, L"", NULL);
     }
     // Create FdoISelect command
     FdoPtr<FdoIConnection> fdoConn = m_connection->GetConnection();

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SelectFeatures.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SelectFeatures.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SelectFeatures.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1219,7 +1219,7 @@
             }
             else
             {
-                throw new MgConnectionFailedException(L"MgServerSelectFeatures.JoinFeatures",
+                throw new MgdConnectionFailedException(L"MgServerSelectFeatures.JoinFeatures",
                     __LINE__, __WFILE__, NULL, L"", NULL);
             }
 
@@ -1366,7 +1366,7 @@
                     }
                     else
                     {
-                        throw new MgConnectionFailedException(L"MgServerSelectFeatures.JoinFeatures",
+                        throw new MgdConnectionFailedException(L"MgServerSelectFeatures.JoinFeatures",
                             __LINE__, __WFILE__, NULL, L"", NULL);
                     }
                 }
@@ -1605,7 +1605,7 @@
     {
         if (!conn->IsConnectionOpen())
         {
-            throw new MgConnectionFailedException(L"MgServerSelectFeatures.SupportsFdoJoin", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgdConnectionFailedException(L"MgServerSelectFeatures.SupportsFdoJoin", __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
         FdoPtr<FdoIConnection> fdoConn = conn->GetConnection();
@@ -1831,7 +1831,7 @@
     {
         if (!conn->IsConnectionOpen())
         {
-            throw new MgConnectionFailedException(L"MgServerSelectFeatures.SupportsFdoJoin", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgdConnectionFailedException(L"MgServerSelectFeatures.SupportsFdoJoin", __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
         FdoPtr<FdoIConnection> fdoConn = conn->GetConnection();
@@ -1950,7 +1950,7 @@
     {
         if (!conn->IsConnectionOpen())
         {
-            throw new MgConnectionFailedException(L"MgServerSelectFeatures.SelectFdoJoin", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgdConnectionFailedException(L"MgServerSelectFeatures.SelectFdoJoin", __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
         CHECKNULL(m_command, L"MgServerSelectFeatures.SelectFdoJoin");

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SqlCommand.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SqlCommand.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/SqlCommand.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -183,6 +183,6 @@
     }
     else
     {
-        throw new MgConnectionFailedException(L"MgSqlCommand::Validate", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgdConnectionFailedException(L"MgSqlCommand::Validate", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -48,7 +48,7 @@
     if ((NULL != m_SrvrFeatConn.p) && ( !m_SrvrFeatConn->IsConnectionOpen() ))
     {
 
-        throw new MgConnectionFailedException(L"MgUpdateFeaturesCommand::MgUpdateFeaturesCommand()",
+        throw new MgdConnectionFailedException(L"MgUpdateFeaturesCommand::MgUpdateFeaturesCommand()",
             __LINE__, __WFILE__, NULL, L"", NULL);
     }
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/DataReaderCreator.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/DataReaderCreator.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/DataReaderCreator.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -24,6 +24,7 @@
 #include "MgDesktop.h"
 #include "ProxyDataReader.h"
 
+/// \cond INTERNAL
 template <typename T>
 class MgDataReaderCreator : public MgDisposable
 {
@@ -166,5 +167,5 @@
     STRING m_propertyAlias;
     int m_propType;
 };
-
+/// \endcond
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/DateTimeDataReaderCreator.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/DateTimeDataReaderCreator.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/DateTimeDataReaderCreator.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -22,6 +22,7 @@
 
 #include <vector>
 
+/// \cond INTERNAL
 class MgDateTimeDataReaderCreator : public MgDataReaderCreator<double>
 {
     DECLARE_CLASSNAME(MgDateTimeDataReaderCreator)
@@ -54,5 +55,5 @@
     }
 
 };
-
+/// \endcond
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/DoubleDataReaderCreator.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/DoubleDataReaderCreator.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/DoubleDataReaderCreator.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -21,7 +21,7 @@
 using namespace std;
 
 #include <vector>
-
+/// \cond INTERNAL
 class MgDoubleDataReaderCreator : public MgDataReaderCreator<double>
 {
     DECLARE_CLASSNAME(MgDoubleDataReaderCreator)
@@ -52,5 +52,5 @@
         delete this;
     }
 };
-
+/// \endcond
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionPool.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionPool.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionPool.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -3,6 +3,8 @@
 
 #include "Fdo.h"
 
+/// \cond INTERNAL
+
 class MgFeatureConnection;
 class MgResourceIdentifier;
 class MgConfiguration;
@@ -38,5 +40,6 @@
 private:
     static bool StringStartsWith(CREFSTRING haystack, CREFSTRING needle);
 };
+/// \endcond
 
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -143,7 +143,7 @@
                 strCol = new MgStringCollection();
                 strCol->Add(message);
             }
-            throw new MgInvalidFeatureSourceException(L"MgFdoConnectionUtil::CreateConnection",
+            throw new MgdInvalidFeatureSourceException(L"MgFdoConnectionUtil::CreateConnection",
                 __LINE__, __WFILE__, (MgStringCollection*)strCol, L"", NULL);
         }
 
@@ -246,7 +246,7 @@
             STRING errorMsg = parser.GetErrorMessage();
             MgStringCollection arguments;
             arguments.Add(errorMsg);
-            throw new MgInvalidFeatureSourceException(
+            throw new MgdInvalidFeatureSourceException(
                 L"MgFdoConnectionUtil::GetFeatureSource",
                 __LINE__, __WFILE__, &arguments, L"", NULL);
         }
@@ -265,7 +265,7 @@
         MgStringCollection arguments;
         arguments.Add(message);
 
-        throw new MgInvalidFeatureSourceException(
+        throw new MgdInvalidFeatureSourceException(
             L"MgFdoConnectionUtil::GetFeatureSource",
             __LINE__, __WFILE__, &arguments, L"", NULL);
     }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -11,6 +11,7 @@
     class FeatureSource;
 }
 
+/// \cond INTERNAL
 class MgFdoConnectionUtil
 {
     friend class MgFeatureConnection;
@@ -38,5 +39,6 @@
     static INT64 sm_nConnectionsCreated;
     static INT64 sm_nConnectionsClosed;
 };
+/// \endcond
 
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoFeatureReader.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoFeatureReader.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoFeatureReader.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -22,6 +22,7 @@
 
 class FdoIFeatureReader;
 
+/// \cond INTERNAL
 class MgFdoFeatureReader: public FdoIFeatureReader
 {
 public:
@@ -96,5 +97,6 @@
     void Initialize();
 
 };
+/// \endcond
 
 #endif // _MGFDOFEATUREREADER_H

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoFilterCollection.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoFilterCollection.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoFilterCollection.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -22,6 +22,7 @@
 
 class FdoFilter;
 
+/// \cond INTERNAL
 /// \brief
 /// The MgFdoFilterCollection class represents a collection of FdoFilter objects.
 class MgFdoFilterCollection : public FdoCollection<FdoFilter, FdoException>
@@ -51,4 +52,5 @@
     ///
     /*FDO_API*/ static MgFdoFilterCollection* Create();
 };
+/// \endcond
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoForcedOneToOneFeatureReader.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoForcedOneToOneFeatureReader.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoForcedOneToOneFeatureReader.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -21,7 +21,7 @@
 #include <set>
 
 class FdoIFeatureReader;
-
+/// \cond INTERNAL
 class MgFdoForcedOneToOneFeatureReader: public FdoIFeatureReader
 {
 public:
@@ -90,5 +90,5 @@
 
     FdoClassDefinition* m_cachedClsDef;
 };
-
+/// \endcond
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoReaderCollection.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoReaderCollection.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoReaderCollection.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -21,7 +21,7 @@
 #include <FdoStd.h>
 
 class FdoIFeatureReader;
-
+/// \cond INTERNAL
 /// \brief
 /// The MgFdoReaderCollection class represents a collection of FdoIFeatureReader objects.
 class MgFdoReaderCollection : public FdoCollection<FdoIFeatureReader, FdoException>
@@ -51,4 +51,5 @@
     ///
     /*FDO_API*/ static MgFdoReaderCollection* Create();
 };
+/// \endcond
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureClassCacheItem.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureClassCacheItem.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureClassCacheItem.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,6 +1,6 @@
 #ifndef DESKTOP_FEATURE_CLASS_CACHE_ITEM_H
 #define DESKTOP_FEATURE_CLASS_CACHE_ITEM_H
-
+/// \cond INTERNAL
 class MgFeatureClassCacheItem : public MgGuardDisposable
 {
 /// Constructors/Destructor
@@ -47,7 +47,7 @@
     Ptr<MgClassDefinition> m_classDef;
     Ptr<MgPropertyDefinitionCollection> m_idProperties;
 };
-
+/// \endcond
 /// Inline Methods
 
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -6,7 +6,7 @@
 class MgFdoConnectionPool;
 
 template class Ptr<MgResourceIdentifier>;
-
+/// \cond INTERNAL
 class MgFeatureConnection : public MgGuardDisposable
 {
     friend class MgFdoConnectionPool;
@@ -49,5 +49,5 @@
     MgResourceIdentifier* m_resourceId;
     bool m_bCloseConnection;
 };
-
+///\endcond
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureDistribution.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureDistribution.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureDistribution.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -21,7 +21,7 @@
 class MgDisposable;
 class FdoFunction;
 class MgReader;
-
+/// \cond INTERNAL
 class MgFeatureDistribution : public MgDisposable
 {
 public:
@@ -38,5 +38,5 @@
         delete this;
     }
 };
-
+/// \endcond
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -24,7 +24,7 @@
 class MgFeatureDistribution;
 class MgGeometry;
 class MgGeometryCollection;
-
+/// \cond INTERNAL
 class MgFeatureGeometricFunctions : public MgFeatureDistribution
 {
     DECLARE_CLASSNAME(MgFeatureGeometricFunctions)
@@ -87,5 +87,5 @@
     double m_maxZ;
     double m_maxM;
 };
-
+/// \endcond
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -384,7 +384,7 @@
                 STRING errorMsg = parser.GetErrorMessage();
                 MgStringCollection arguments;
                 arguments.Add(errorMsg);
-                throw new MgInvalidFeatureSourceException(
+                throw new MgdInvalidFeatureSourceException(
                     L"MgCacheManager::GetFeatureSourceCacheItem",
                     __LINE__, __WFILE__, &arguments, L"", NULL);
             }
@@ -404,7 +404,7 @@
             MgStringCollection arguments;
             arguments.Add(message);
 
-            throw new MgInvalidFeatureSourceException(
+            throw new MgdInvalidFeatureSourceException(
                 L"MgCacheManager.GetFeatureSourceCacheItem",
                 __LINE__, __WFILE__, &arguments, L"", NULL);
         }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -40,7 +40,7 @@
     // features
     bool                m_bHasData;
 };
-///\endcond
+
 typedef std::multimap<STRING, GwsRightSideIterator> GwsFeatureIteratorMap;
 typedef std::pair<STRING, GwsRightSideIterator> GwsFeatureIteratorPair;
 
@@ -546,7 +546,6 @@
 
 CLASS_ID:
     static const INT32 m_cls_id = PlatformBase_FeatureService_GwsFeatureReader;
-
 };
-
+///\endcond
 #endif

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/RdbmsFeatureSourceParams.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/RdbmsFeatureSourceParams.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/RdbmsFeatureSourceParams.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,79 +1,79 @@
 #include "RdbmsFeatureSourceParams.h"
 
-MgRdbmsFeatureSourceParams::MgRdbmsFeatureSourceParams()
+MgdRdbmsFeatureSourceParams::MgdRdbmsFeatureSourceParams()
 {
 
 }
 
-MgRdbmsFeatureSourceParams::~MgRdbmsFeatureSourceParams()
+MgdRdbmsFeatureSourceParams::~MgdRdbmsFeatureSourceParams()
 {
 
 }
 
-void MgRdbmsFeatureSourceParams::Serialize(MgStream* stream)
+void MgdRdbmsFeatureSourceParams::Serialize(MgStream* stream)
 {
-    NOT_IMPLEMENTED(L"MgRdbmsFeatureSourceParams::Serialize");
+    NOT_IMPLEMENTED(L"MgdRdbmsFeatureSourceParams::Serialize");
 }
 
-void MgRdbmsFeatureSourceParams::Deserialize(MgStream* stream)
+void MgdRdbmsFeatureSourceParams::Deserialize(MgStream* stream)
 {
-    NOT_IMPLEMENTED(L"MgRdbmsFeatureSourceParams::Serialize");
+    NOT_IMPLEMENTED(L"MgdRdbmsFeatureSourceParams::Serialize");
 }
 
-void MgRdbmsFeatureSourceParams::Dispose() { delete this; }
+void MgdRdbmsFeatureSourceParams::Dispose() { delete this; }
 
-STRING MgRdbmsFeatureSourceParams::GetProviderName() { return m_provider; }
+STRING MgdRdbmsFeatureSourceParams::GetProviderName() { return m_provider; }
 
-void MgRdbmsFeatureSourceParams::SetProviderName(CREFSTRING providerName) { m_provider = providerName; }
+void MgdRdbmsFeatureSourceParams::SetProviderName(CREFSTRING providerName) { m_provider = providerName; }
 
-STRING MgRdbmsFeatureSourceParams::GetService() { return m_service; }
+STRING MgdRdbmsFeatureSourceParams::GetService() { return m_service; }
 
-void MgRdbmsFeatureSourceParams::SetService(CREFSTRING service) { m_service = service; }
+void MgdRdbmsFeatureSourceParams::SetService(CREFSTRING service) { m_service = service; }
 
-STRING MgRdbmsFeatureSourceParams::GetPassword() { return m_password; }
+STRING MgdRdbmsFeatureSourceParams::GetPassword() { return m_password; }
 
-void MgRdbmsFeatureSourceParams::SetPassword(CREFSTRING pwd) { m_password = pwd; }
+void MgdRdbmsFeatureSourceParams::SetPassword(CREFSTRING pwd) { m_password = pwd; }
 
-STRING MgRdbmsFeatureSourceParams::GetUsername() { return m_username; }
+STRING MgdRdbmsFeatureSourceParams::GetUsername() { return m_username; }
 
-void MgRdbmsFeatureSourceParams::SetUsername(CREFSTRING username) { m_username = username; }
+void MgdRdbmsFeatureSourceParams::SetUsername(CREFSTRING username) { m_username = username; }
 
-STRING MgRdbmsFeatureSourceParams::GetDataStore() { return m_datastore; }
+STRING MgdRdbmsFeatureSourceParams::GetDataStore() { return m_datastore; }
 
-void MgRdbmsFeatureSourceParams::SetDataStore(CREFSTRING dataStore) { m_datastore = dataStore; }
+void MgdRdbmsFeatureSourceParams::SetDataStore(CREFSTRING dataStore) { m_datastore = dataStore; }
 
-STRING MgRdbmsFeatureSourceParams::GetSpatialContextName() { return m_scName; }
+STRING MgdRdbmsFeatureSourceParams::GetSpatialContextName() { return m_scName; }
 
-void MgRdbmsFeatureSourceParams::SetSpatialContextName(CREFSTRING name) { m_scName = name; }
+void MgdRdbmsFeatureSourceParams::SetSpatialContextName(CREFSTRING name) { m_scName = name; }
 
-STRING MgRdbmsFeatureSourceParams::GetSpatialContextDescription() { return m_scDescription; }
+STRING MgdRdbmsFeatureSourceParams::GetSpatialContextDescription() { return m_scDescription; }
 
-void MgRdbmsFeatureSourceParams::SetSpatialContextDescription(CREFSTRING description) { m_scDescription = description; }
+void MgdRdbmsFeatureSourceParams::SetSpatialContextDescription(CREFSTRING description) { m_scDescription = description; }
 
-STRING MgRdbmsFeatureSourceParams::GetCoordinateSystemWkt() { return m_scCsWkt; }
+STRING MgdRdbmsFeatureSourceParams::GetCoordinateSystemWkt() { return m_scCsWkt; }
 
-void MgRdbmsFeatureSourceParams::SetCoordinateSystemWkt(CREFSTRING srsWkt) { m_scCsWkt = srsWkt; }
+void MgdRdbmsFeatureSourceParams::SetCoordinateSystemWkt(CREFSTRING srsWkt) { m_scCsWkt = srsWkt; }
 
-STRING MgRdbmsFeatureSourceParams::GetCoordinateSystemName() { return m_scCsName; }
+STRING MgdRdbmsFeatureSourceParams::GetCoordinateSystemName() { return m_scCsName; }
 
-void MgRdbmsFeatureSourceParams::SetCoordinateSystemName(CREFSTRING csName) { m_scCsName = csName; }
+void MgdRdbmsFeatureSourceParams::SetCoordinateSystemName(CREFSTRING csName) { m_scCsName = csName; }
 
-double MgRdbmsFeatureSourceParams::GetXYTolerance() { return m_xyTolerance; }
+double MgdRdbmsFeatureSourceParams::GetXYTolerance() { return m_xyTolerance; }
 
-void MgRdbmsFeatureSourceParams::SetXYTolerance(double tolerance) { m_xyTolerance = tolerance; }
+void MgdRdbmsFeatureSourceParams::SetXYTolerance(double tolerance) { m_xyTolerance = tolerance; }
 
-double MgRdbmsFeatureSourceParams::GetZTolerance() { return m_zTolerance; }
+double MgdRdbmsFeatureSourceParams::GetZTolerance() { return m_zTolerance; }
 
-void MgRdbmsFeatureSourceParams::SetZTolerance(double tolerance) { m_zTolerance = tolerance; }
+void MgdRdbmsFeatureSourceParams::SetZTolerance(double tolerance) { m_zTolerance = tolerance; }
 
-MgFeatureSchema* MgRdbmsFeatureSourceParams::GetFeatureSchema() { return SAFE_ADDREF((MgFeatureSchema*)m_schema); }
+MgFeatureSchema* MgdRdbmsFeatureSourceParams::GetFeatureSchema() { return SAFE_ADDREF((MgFeatureSchema*)m_schema); }
 
-void MgRdbmsFeatureSourceParams::SetFeatureSchema(MgFeatureSchema* featureSchema) { m_schema = SAFE_ADDREF(featureSchema); }
+void MgdRdbmsFeatureSourceParams::SetFeatureSchema(MgFeatureSchema* featureSchema) { m_schema = SAFE_ADDREF(featureSchema); }
 
-MgEnvelope* MgRdbmsFeatureSourceParams::GetSpatialContextExtents() { return SAFE_ADDREF((MgEnvelope*)m_extents); }
+MgEnvelope* MgdRdbmsFeatureSourceParams::GetSpatialContextExtents() { return SAFE_ADDREF((MgEnvelope*)m_extents); }
 
-void MgRdbmsFeatureSourceParams::SetSpatialContextExtents(MgEnvelope* extents) { m_extents = SAFE_ADDREF(extents); }
+void MgdRdbmsFeatureSourceParams::SetSpatialContextExtents(MgEnvelope* extents) { m_extents = SAFE_ADDREF(extents); }
 
-bool MgRdbmsFeatureSourceParams::GetIsFdoEnabled() { return m_useFdoMetadata; }
+bool MgdRdbmsFeatureSourceParams::GetIsFdoEnabled() { return m_useFdoMetadata; }
 
-void MgRdbmsFeatureSourceParams::SetIsFdoEnabled(bool useFdoMetadata) { m_useFdoMetadata = useFdoMetadata; }
\ No newline at end of file
+void MgdRdbmsFeatureSourceParams::SetIsFdoEnabled(bool useFdoMetadata) { m_useFdoMetadata = useFdoMetadata; }
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/RdbmsFeatureSourceParams.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/RdbmsFeatureSourceParams.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/RdbmsFeatureSourceParams.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -6,59 +6,659 @@
 // Parameter class for creating RDBMS data stores
 //
 //
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
-class MG_DESKTOP_API MgRdbmsFeatureSourceParams : public MgFeatureSourceParams
+
+///\brief
+/// Contains the parameters used to create a relational feature source. This is the relational
+/// analogue to the MgFileFeatureSourceParams class
+///
+/// \remarks
+/// You may use MgFeatureService::DescribeSchema and
+/// MgFeatureService::GetSpatialContexts to get the values needed, or create the
+/// MgFeatureSchema from scratch to construct and configure the MgdRdbmsFeatureSourceParams 
+/// object.\n\n
+/// Only relational FDO providers that support the FdoICreateDataStore command
+/// can be used with this class to create Feature Sources. As of this writing, the
+/// known supported file-based FDO providers are:
+///  \li OSGeo.SQLServerSpatial
+///  \li OSGeo.MySQL
+///  \li OSGeo.PostgreSQL
+///
+/// You cannot create file Feature Sources using this class. Use the MgFileFeatureSourceParams
+/// class if you need to create file-based Feature Sources.
+class MG_DESKTOP_API MgdRdbmsFeatureSourceParams : public MgFeatureSourceParams
 {
 PUBLISHED_API:
-    MgRdbmsFeatureSourceParams();
+    //////////////////////////////////////////////////
+    /// \brief
+    /// Constructs an empty MgdRdbmsFeatureSourceParams object.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  MgdRdbmsFeatureSourceParams();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  MgdRdbmsFeatureSourceParams();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  MgdRdbmsFeatureSourceParams();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    MgdRdbmsFeatureSourceParams();
 
+    ///////////////////////////////////////////////
+    /// \brief
+    /// Gets the FDO provider name of the feature source.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  string GetProviderName();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  String GetProviderName();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  string GetProviderName();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// Returns the FDO provider name of the feature source.
+    ///
     STRING GetProviderName();   /// __get, __set
+
+    ///////////////////////////////////////////////
+    /// \brief
+    /// Sets the FDO provider name of the feature source.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  void SetProviderName();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  void SetProviderName();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  void SetProviderName();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \param providerName (String/string)
+    /// The FDO provider name of the feature source
+    /// without version number. For example, OSGeo.SDF.
+    ///
+    /// \return
+    /// Returns nothing.
+    ///
     void SetProviderName(CREFSTRING providerName);
 
+    ///////////////////////////////////////////////
+    /// \brief
+    /// Gets the service name to create the relational data store in
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  string GetService();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  String GetService();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  string GetService();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// Returns the service name
+    ///
     STRING GetService();   /// __get, __set
+
+    ////////////////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Sets the name of the service to create the relational data store in
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  void SetService(String name);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  void SetService(String name);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  void SetService(string name);
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \param name (String/string)
+    /// The service name
+    ///
+    /// \return
+    /// Returns nothing.
+    ///
     void SetService(CREFSTRING name);
 
+    ///////////////////////////////////////////////
+    /// \brief
+    /// Gets the password connection parameter
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  string GetPassword();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  String GetPassword();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  string GetPassword();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// Returns the password connection parameter
+    ///
     STRING GetPassword();   /// __get, __set
+
+    ////////////////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Sets the password connection parameter
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  void SetPassword(String pwd);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  void SetPassword(String pwd);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  void SetPassword(string pwd);
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \param pwd (String/string)
+    /// The password connection parameter
+    ///
+    /// \return
+    /// Returns nothing.
+    ///
     void SetPassword(CREFSTRING pwd);
 
+    ///////////////////////////////////////////////
+    /// \brief
+    /// Gets the username connection parameter
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  string GetUsername();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  String GetUsername();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  string GetUsername();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// Returns the username connection parameter
+    ///
     STRING GetUsername();   /// __get, __set
+
+    ////////////////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Sets the username connection parameter
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  void SetUsername(String username);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  void SetUsername(String username);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  void SetUsername(string username);
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \param username (String/string)
+    /// The username connection parameter
+    ///
+    /// \return
+    /// Returns nothing.
+    ///
     void SetUsername(CREFSTRING username);
 
+    ///////////////////////////////////////////////
+    /// \brief
+    /// Gets the name of the data store
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  string GetDataStore();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  String GetDataStore();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  string GetDataStore();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// Returns the name of the data store
+    ///
     STRING GetDataStore();  /// __get, __set
+
+    ////////////////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Sets the name of the data store to create
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  void SetDataStore(String dataStore);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  void SetDataStore(String dataStore);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  void SetDataStore(string dataStore);
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \param dataStore (String/string)
+    /// The name of the data store to create
+    ///
+    /// \return
+    /// Returns nothing.
+    ///
     void SetDataStore(CREFSTRING dataStore);
 
+    ///////////////////////////////////////////////
+    /// \brief
+    /// Gets the user-defined spatial context name.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  string GetSpatialContextName();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  String GetSpatialContextName();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  string GetSpatialContextName();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// Returns the name of the spatial context.
+    ///
     STRING GetSpatialContextName();  /// __get, __set
+
+    ////////////////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Sets the user-defined spatial context name.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  void SetSpatialContextName(string name);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  void SetSpatialContextName(String name);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  void SetSpatialContextName(string name);
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \param name (String/string)
+    /// The name of the spatial context
+    ///
+    /// \return
+    /// Returns nothing.
+    ///
     void SetSpatialContextName(CREFSTRING name);
 
+    /////////////////////////////////////////////
+    /// \brief
+    /// Gets the spatial context description.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  string GetSpatialContextDescription();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  String GetSpatialContextDescription();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  string GetSpatialContextDescription();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// Returns the spatial context description.
+    ///
     STRING GetSpatialContextDescription();  /// __get, __set
+
+    //////////////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Sets the spatial context description.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  void SetSpatialContextDescription(string description);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  void SetSpatialContextDescription(String description);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  void SetSpatialContextDescription(string description);
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \param description (String/string)
+    /// The description of the spatial
+    /// context.
+    ///
+    /// \return
+    /// Returns nothing.
+    ///
     void SetSpatialContextDescription(CREFSTRING description);
 
+    ///////////////////////////////////////////////////////////////
+    /// \brief
+    /// Gets the well-known text description of the coordinate system.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  string GetCoordinateSystemWkt();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  String GetCoordinateSystemWkt();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  string GetCoordinateSystemWkt();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// Returns the OGC WKT description of the coordinate system.
+    ///
     STRING GetCoordinateSystemWkt();  /// __get, __set
+
+    //////////////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Sets the well-know text string representing the coordinate system.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  void SetCoordinateSystemWkt(string srsWkt);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  void SetCoordinateSystemWkt(String srsWkt);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  void SetCoordinateSystemWkt(string srsWkt);
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \param srsWkt (String/string)
+    /// The OGC WKT string representing the coordinate system.
+    ///
+    /// \return
+    /// Returns nothing.
+    ///
     void SetCoordinateSystemWkt(CREFSTRING srsWkt);
 
+    //////////////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Gets the name of the coordinate system
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  String GetCoordinateSystemName();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  String GetCoordinateSystemName();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  String GetCoordinateSystemName();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// Returns the name of the coordinate system
+    ///
     STRING GetCoordinateSystemName();  /// __get, __set
+
+    //////////////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Sets the name of the coordinate system
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  void SetCoordinateSystemName(String csName);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  void SetCoordinateSystemName(String csName);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  void SetCoordinateSystemName(string csName);
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// Returns nothing
+    ///
     void SetCoordinateSystemName(CREFSTRING csName);
 
+    //////////////////////////////////////////////////////////
+    /// \brief
+    /// Gets the \link tolerance tolerance \endlink used for the X and Y
+    /// ordinates.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  double GetXYTolerance();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  double GetXYTolerance();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  double GetXYTolerance();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// Returns the tolerance used for the X and Y ordinates.
+    ///
     double GetXYTolerance();  /// __get, __set
+
+    ////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Sets the \link tolerance tolerance \endlink for the X and Y ordinates.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  void SetXYTolerance(double tolerance);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  void SetXYTolerance(double tolerance);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  void SetXYTolerance(double tolerance);
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \param tolerance (double)
+    /// The tolerance for the X and Y
+    /// ordinates.
+    ///
+    /// \return
+    /// Returns nothing.
+    ///
     void SetXYTolerance(double tolerance);
 
+    ////////////////////////////////////////////////////////
+    /// \brief
+    /// Gets the \link tolerance tolerance \endlink for the Z ordinate.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  double GetZTolerance();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  double GetZTolerance();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  double GetZTolerance();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// Returns the tolerance for the Z ordinate.
+    ///
     double GetZTolerance();  /// __get, __set
+
+    ////////////////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Sets the tolerance for the Z ordinate.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  void SetZTolerance(double tolerance);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  void SetZTolerance(double tolerance);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  void SetZTolerance(double tolerance);
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \param tolerance (double)
+    /// The tolerance for the Z ordinate.
+    ///
+    /// \return
+    /// Returns nothing.
+    ///
     void SetZTolerance(double tolerance);
 
+    ////////////////////////////////////////////////
+    /// \brief
+    /// Gets the feature schema definition.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  MgFeatureSchema GetFeatureSchema();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  MgFeatureSchema GetFeatureSchema();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  MgFeatureSchema GetFeatureSchema();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// Returns a feature schema definition object.
+    ///
     MgFeatureSchema* GetFeatureSchema();  /// __get, __set
+
+    ///////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Sets the feature schema definition.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  void SetFeatureSchema(MgFeatureSchema featureSchema);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  void SetFeatureSchema(MgFeatureSchema featureSchema);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  void SetFeatureSchema(MgFeatureSchema featureSchema);
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \param featureSchema (MgFeatureSchema)
+    /// The feature schema
+    /// definition.
+    ///
+    /// \return
+    /// Returns nothing.
+    ///
     void SetFeatureSchema(MgFeatureSchema* featureSchema);
 
+    ////////////////////////////////////////////////////////
+    /// \brief
+    /// Gets the envelope that all features in this data store will encompass
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  MgEnvelope GetSpatialContextExtents();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  MgEnvelope GetSpatialContextExtents();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  MgEnvelope GetSpatialContextExtents();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// The data store extents
+    ///
     MgEnvelope* GetSpatialContextExtents();  /// __get, __set
+
+    ///////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Sets the envelope that all features in this data store will encompass
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  void SetSpatialContextExtents(MgEnvelope extents);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  void SetSpatialContextExtents(MgEnvelope extents);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  void SetSpatialContextExtents(MgEnvelope extents);
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \param extents (MgEnvelope)
+    /// The data store extents
+    ///
+    /// \return
+    /// Returns nothing.
+    ///
     void SetSpatialContextExtents(MgEnvelope* extents);
 
+    ////////////////////////////////////////////////////////
+    /// \brief
+    /// Gets whether this data store will be created with FDO metaschema
+    /// tables. These tables have a f_ prefix when the data store is 
+    /// inspected by non-FDO tools.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  bool GetIsFdoEnabled();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  bool GetIsFdoEnabled();
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  bool GetIsFdoEnabled();
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \return
+    /// The data store extents
+    ///
     bool GetIsFdoEnabled();  /// __get, __set
+
+    ///////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Sets whether the data store will be created with FDO metaschema
+    /// tables. These tables have a f_ prefix when the data store is 
+    /// inspected by non-FDO tools.
+    ///
+    /// <!-- Syntax in .Net, Java, and PHP -->
+    /// \htmlinclude DotNetSyntaxTop.html
+    ///  void SetIsFdoEnabled(bool useFdoMetadata);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude JavaSyntaxTop.html
+    ///  void SetIsFdoEnabled(boolean useFdoMetadata);
+    /// \htmlinclude SyntaxBottom.html
+    /// \htmlinclude PHPSyntaxTop.html
+    ///  void SetIsFdoEnabled(bool useFdoMetadata);
+    /// \htmlinclude SyntaxBottom.html
+    ///
+    /// \param useFdoMetadata (bool)
+    /// true to create FDO metaschema tables. false otherwise
+    ///
+    /// \return
+    /// Returns nothing.
+    ///
     void SetIsFdoEnabled(bool useFdoMetadata);
 
 protected:
     virtual void Dispose();
 
-    virtual ~MgRdbmsFeatureSourceParams();
+    virtual ~MgdRdbmsFeatureSourceParams();
 
 private:
     STRING m_provider;

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/FeatureReader.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/FeatureReader.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/FeatureReader.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -8,7 +8,7 @@
 class MgAgfReaderWriter;
 class MgFeatureConnection;
 
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
 class MG_DESKTOP_API MgdFeatureReader : public MgFeatureReader
 {

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/FeatureService.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/FeatureService.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/FeatureService.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -28,7 +28,7 @@
 {
     class Extension;
 }
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Service_Module
 /// \{
 class MG_DESKTOP_API MgdFeatureService : public MgFeatureService
 {

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/ImageFormats.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/ImageFormats.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/ImageFormats.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -6,9 +6,9 @@
 /// The exact list of supported formats is not defined yet.
 /// At least PNG will be supported.
 ///
-const STRING MgImageFormats::Gif    = L"GIF";
-const STRING MgImageFormats::Jpeg   = L"JPG";
-const STRING MgImageFormats::Png    = L"PNG";
-const STRING MgImageFormats::Png8   = L"PNG8";
-const STRING MgImageFormats::Tiff   = L"TIF";
-const STRING MgImageFormats::Raw    = L"RAW";
+const STRING MgdImageFormats::Gif    = L"GIF";
+const STRING MgdImageFormats::Jpeg   = L"JPG";
+const STRING MgdImageFormats::Png    = L"PNG";
+const STRING MgdImageFormats::Png8   = L"PNG8";
+const STRING MgdImageFormats::Tiff   = L"TIF";
+const STRING MgdImageFormats::Raw    = L"RAW";

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/ImageFormats.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/ImageFormats.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/ImageFormats.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -2,9 +2,9 @@
 #define DESKTOP_IMAGE_FORMATS_H
 
 #include "MgDesktop.h"
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
-class MG_DESKTOP_API MgImageFormats
+class MG_DESKTOP_API MgdImageFormats
 {
 PUBLISHED_API:
     /// \internal

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -295,9 +295,9 @@
 }
 
 MgByteReader* MgdMappingService::GeneratePlot(MgdMap* map,
-                                               MgPlotSpecification* plotSpec,
-                                               MgLayout* layout,
-                                               MgDwfVersion* dwfVersion)
+                                               MgdPlotSpecification* plotSpec,
+                                               MgdLayout* layout,
+                                               MgdDwfVersion* dwfVersion)
 {
     Ptr<MgByteReader> byteReader;
 
@@ -315,11 +315,11 @@
     MG_LOG_OPERATION_MESSAGE_PARAMETERS_START();
     MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == mapId) ? L"MgResourceIdentifier" : mapId->ToString().c_str());
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
-    MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgPlotSpecification");
+    MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgdPlotSpecification");
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
     MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == layoutId) ? L"MgResourceIdentifier" : layoutId->ToString().c_str());
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
-    MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == dwfVersion) ? L"MgDwfVersion" : dwfVersion->GetLogString());
+    MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == dwfVersion) ? L"MgdDwfVersion" : dwfVersion->GetLogString());
     MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
 
     MG_LOG_TRACE_ENTRY(L"MgdMappingService::GeneratePlot()");
@@ -330,11 +330,11 @@
             L"MgdMappingService::GeneratePlot", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
-    // Create a MgMapPlot which will be passed to GenerateMultiPlot
-    Ptr<MgMapPlot> mapPlot = new MgMapPlot(map, plotSpec, layout);
+    // Create a MgdMapPlot which will be passed to GenerateMultiPlot
+    Ptr<MgdMapPlot> mapPlot = new MgdMapPlot(map, plotSpec, layout);
 
-    // Add it to a MgMapPlotCollecion
-    Ptr<MgMapPlotCollection> mapPlots = new MgMapPlotCollection();
+    // Add it to a MgdMapPlotCollecion
+    Ptr<MgdMapPlotCollection> mapPlots = new MgdMapPlotCollection();
     mapPlots->Add(mapPlot);
 
     // Create the plot
@@ -363,9 +363,9 @@
 MgByteReader* MgdMappingService::GeneratePlot(MgdMap* map,
                                                MgCoordinate* center,
                                                double scale,
-                                               MgPlotSpecification* plotSpec,
-                                               MgLayout* layout,
-                                               MgDwfVersion* dwfVersion)
+                                               MgdPlotSpecification* plotSpec,
+                                               MgdLayout* layout,
+                                               MgdDwfVersion* dwfVersion)
 {
     Ptr<MgByteReader> byteReader;
 
@@ -387,11 +387,11 @@
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
     MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(scale)
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
-    MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgPlotSpecification");
+    MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgdPlotSpecification");
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
     MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == layoutId) ? L"MgResourceIdentifier" : layoutId->ToString().c_str());
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
-    MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == dwfVersion) ? L"MgDwfVersion" : dwfVersion->GetLogString());
+    MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == dwfVersion) ? L"MgdDwfVersion" : dwfVersion->GetLogString());
     MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
 
     MG_LOG_TRACE_ENTRY(L"MgdMappingService::GeneratePlot()");
@@ -402,11 +402,11 @@
             L"MgdMappingService::GeneratePlot", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
-    // Create a MgMapPlot which will be passed to GenerateMultiPlot
-    Ptr<MgMapPlot> mapPlot = new MgMapPlot(map, center, scale, plotSpec, layout);
+    // Create a MgdMapPlot which will be passed to GenerateMultiPlot
+    Ptr<MgdMapPlot> mapPlot = new MgdMapPlot(map, center, scale, plotSpec, layout);
 
-    // Add it to a MgMapPlotCollecion
-    Ptr<MgMapPlotCollection> mapPlots = new MgMapPlotCollection();
+    // Add it to a MgdMapPlotCollecion
+    Ptr<MgdMapPlotCollection> mapPlots = new MgdMapPlotCollection();
     mapPlots->Add(mapPlot);
 
     // Create the plot
@@ -435,9 +435,9 @@
 MgByteReader* MgdMappingService::GeneratePlot(MgdMap* map,
                                                MgEnvelope* extents,
                                                bool expandToFit,
-                                               MgPlotSpecification* plotSpec,
-                                               MgLayout* layout,
-                                               MgDwfVersion* dwfVersion)
+                                               MgdPlotSpecification* plotSpec,
+                                               MgdLayout* layout,
+                                               MgdDwfVersion* dwfVersion)
 {
     Ptr<MgByteReader> byteReader;
 
@@ -459,11 +459,11 @@
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
     MG_LOG_OPERATION_MESSAGE_ADD_BOOL(expandToFit)
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
-    MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgPlotSpecification");
+    MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgdPlotSpecification");
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
     MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == layoutId) ? L"MgResourceIdentifier" : layoutId->ToString().c_str());
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
-    MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == dwfVersion) ? L"MgDwfVersion" : dwfVersion->GetLogString());
+    MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == dwfVersion) ? L"MgdDwfVersion" : dwfVersion->GetLogString());
     MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
 
     MG_LOG_TRACE_ENTRY(L"MgdMappingService::GeneratePlot()");
@@ -485,11 +485,11 @@
     }
     Ptr<MgEnvelope> env = new MgEnvelope(ll, ur);
 
-    // Create a MgMapPlot which will be passed to GenerateMultiPlot
-    Ptr<MgMapPlot> mapPlot = new MgMapPlot(map, env, expandToFit, plotSpec, layout);
+    // Create a MgdMapPlot which will be passed to GenerateMultiPlot
+    Ptr<MgdMapPlot> mapPlot = new MgdMapPlot(map, env, expandToFit, plotSpec, layout);
 
-    // Add it to a MgMapPlotCollecion
-    Ptr<MgMapPlotCollection> mapPlots = new MgMapPlotCollection();
+    // Add it to a MgdMapPlotCollecion
+    Ptr<MgdMapPlotCollection> mapPlots = new MgdMapPlotCollection();
     if (mapPlot == NULL || mapPlots == NULL)
     {
         throw new MgNullArgumentException(L"MgdMappingService::GeneratePlot", __LINE__, __WFILE__, NULL, L"", NULL);
@@ -519,7 +519,7 @@
     return byteReader.Detach();
 }
 
-MgByteReader* MgdMappingService::GenerateMultiPlot(MgMapPlotCollection* mapPlots, MgDwfVersion* dwfVersion)
+MgByteReader* MgdMappingService::GenerateMultiPlot(MgdMapPlotCollection* mapPlots, MgdDwfVersion* dwfVersion)
 {
     Ptr<MgByteReader> ret;
     MG_LOG_OPERATION_MESSAGE(L"GenerateMultiPlot");
@@ -528,9 +528,9 @@
 
     MG_LOG_OPERATION_MESSAGE_INIT(MG_API_VERSION(1, 0, 0), 2);
     MG_LOG_OPERATION_MESSAGE_PARAMETERS_START();
-    MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgMapPlotCollection");
+    MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgdMapPlotCollection");
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
-    MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == dwfVersion) ? L"MgDwfVersion" : dwfVersion->GetLogString().c_str());
+    MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == dwfVersion) ? L"MgdDwfVersion" : dwfVersion->GetLogString().c_str());
     MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
 
     MG_LOG_TRACE_ENTRY(L"MgdMappingService::GenerateMultiPlot()");
@@ -556,7 +556,7 @@
     return ret.Detach();
 }
 
-MgByteReader* MgdMappingService::GenerateMultiPlotInternal(MgMapPlotCollection* mapPlots, MgDwfVersion* dwfVersion)
+MgByteReader* MgdMappingService::GenerateMultiPlotInternal(MgdMapPlotCollection* mapPlots, MgdDwfVersion* dwfVersion)
 {
     Ptr<MgByteReader> byteReader;
 
@@ -588,7 +588,7 @@
     // process the MapPlot collection
     for (int nMapPlotIndex = 0; nMapPlotIndex < mapPlots->GetCount(); nMapPlotIndex++)
     {
-        Ptr<MgMapPlot> mapPlot = mapPlots->GetItem(nMapPlotIndex);
+        Ptr<MgdMapPlot> mapPlot = mapPlots->GetItem(nMapPlotIndex);
         if (NULL == mapPlot)
         {
             throw new MgNullReferenceException(L"MgdMappingService::GenerateMultiPlot", __LINE__, __WFILE__, NULL, L"", NULL);
@@ -600,13 +600,13 @@
             throw new MgNullReferenceException(L"MgdMappingService::GenerateMultiPlot", __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
-        Ptr<MgPlotSpecification> plotSpec = mapPlot->GetPlotSpecification();
+        Ptr<MgdPlotSpecification> plotSpec = mapPlot->GetPlotSpecification();
         if (NULL == plotSpec)
         {
             throw new MgNullReferenceException(L"MgdMappingService::GenerateMultiPlot", __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
-        Ptr<MgLayout> layout = mapPlot->GetLayout();
+        Ptr<MgdLayout> layout = mapPlot->GetLayout();
 
         double width = plotSpec->GetPaperWidth();
         double height = plotSpec->GetPaperHeight();
@@ -675,7 +675,7 @@
             printLayout->SetScaleBarUnits(layout->GetUnitType());
             printLayout->SetPlotTitle(layout->GetTitle());
 
-            Ptr<MgPlotSpecification> spec = printLayout->GetPlotSize();
+            Ptr<MgdPlotSpecification> spec = printLayout->GetPlotSize();
 
             width = spec->GetPaperWidth();
             height = spec->GetPaperHeight();
@@ -722,7 +722,7 @@
 
         switch (mapPlot->GetMapPlotInstruction())
         {
-        case MgMapPlotInstruction::UseMapCenterAndScale:
+        case MgdMapPlotInstruction::UseMapCenterAndScale:
             {
                 dMapScale = map->GetViewScale();
                 if (dMapScale <= 0)
@@ -750,13 +750,13 @@
                 center = pt->GetCoordinate();
                 break;
             }
-        case MgMapPlotInstruction::UseOverriddenCenterAndScale:
+        case MgdMapPlotInstruction::UseOverriddenCenterAndScale:
             {
                 dMapScale = mapPlot->GetScale();
                 center = mapPlot->GetCenter();
                 break;
             }
-        case MgMapPlotInstruction::UseOverriddenExtent:
+        case MgdMapPlotInstruction::UseOverriddenExtent:
             {
                 // Compute the plotCenter and plotScale from the extents
                 extents = mapPlot->GetExtent();
@@ -806,7 +806,7 @@
             {
                 MgStringCollection arguments;
                 arguments.Add(L"1");
-                arguments.Add(L"MgMapPlotCollection");
+                arguments.Add(L"MgdMapPlotCollection");
 
                 throw new MgInvalidArgumentException(L"MgdMappingService::GenerateMultiPlot",
                     __LINE__, __WFILE__, &arguments, L"MgInvalidMapPlotCollectionMapPlotInstruction", NULL);
@@ -841,7 +841,7 @@
 
         Ptr<MgCoordinate> newll;
         Ptr<MgCoordinate> newur;
-        if (mapPlot->GetMapPlotInstruction() != MgMapPlotInstruction::UseOverriddenExtent || mapPlot->GetExpandToFit())
+        if (mapPlot->GetMapPlotInstruction() != MgdMapPlotInstruction::UseOverriddenExtent || mapPlot->GetExpandToFit())
         {
             double mapWidth = dr.mapWidth();
             double mapHeight = dr.mapHeight();
@@ -856,7 +856,7 @@
             newll = env->GetLowerLeftCoordinate();
             newur = env->GetUpperRightCoordinate();
         }
-        else if (mapPlot->GetMapPlotInstruction() == MgMapPlotInstruction::UseOverriddenExtent && !mapPlot->GetExpandToFit())
+        else if (mapPlot->GetMapPlotInstruction() == MgdMapPlotInstruction::UseOverriddenExtent && !mapPlot->GetExpandToFit())
         {
             newll = extents->GetLowerLeftCoordinate();
             newur = extents->GetUpperRightCoordinate();

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -3,10 +3,10 @@
 
 #include "MgDesktop.h"
 
-class MgLayout;
-class MgMapPlotCollection;
-class MgPlotSpecification;
-class MgDwfVersion;
+class MgdLayout;
+class MgdMapPlotCollection;
+class MgdPlotSpecification;
+class MgdDwfVersion;
 class MgdMap;
 
 namespace MdfModel
@@ -14,7 +14,7 @@
     class FeatureTypeStyle;
 }
 
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Service_Module
 /// \{
 class MG_DESKTOP_API MgdMappingService : public MgService
 {
@@ -43,28 +43,28 @@
                                                INT32 themeCategory);
 
     virtual MgByteReader* GeneratePlot(MgdMap* map,
-                                       MgPlotSpecification* plotSpec,
-                                       MgLayout* layout,
-                                       MgDwfVersion* dwfVersion);
+                                       MgdPlotSpecification* plotSpec,
+                                       MgdLayout* layout,
+                                       MgdDwfVersion* dwfVersion);
 
     virtual MgByteReader* GeneratePlot(MgdMap* map,
                                        MgCoordinate* center,
                                        double scale,
-                                       MgPlotSpecification* plotSpec,
-                                       MgLayout* layout,
-                                       MgDwfVersion* dwfVersion);
+                                       MgdPlotSpecification* plotSpec,
+                                       MgdLayout* layout,
+                                       MgdDwfVersion* dwfVersion);
 
     virtual MgByteReader* GeneratePlot(MgdMap* map,
                                        MgEnvelope* extents,
                                        bool expandToFit,
-                                       MgPlotSpecification* plotSpec,
-                                       MgLayout* layout,
-                                       MgDwfVersion* dwfVersion);
+                                       MgdPlotSpecification* plotSpec,
+                                       MgdLayout* layout,
+                                       MgdDwfVersion* dwfVersion);
 
-    virtual MgByteReader* GenerateMultiPlot(MgMapPlotCollection* mapPlots, MgDwfVersion* dwfVersion);
+    virtual MgByteReader* GenerateMultiPlot(MgdMapPlotCollection* mapPlots, MgdDwfVersion* dwfVersion);
 
 private:
-    virtual MgByteReader* GenerateMultiPlotInternal(MgMapPlotCollection* mapPlots, MgDwfVersion* dwfVersion);
+    virtual MgByteReader* GenerateMultiPlotInternal(MgdMapPlotCollection* mapPlots, MgdDwfVersion* dwfVersion);
 	bool FeatureTypeStyleSupportsGeomType(MdfModel::FeatureTypeStyle* fts, INT32 geomType);
 
     // member data

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -17,7 +17,7 @@
 MgByteReader* MgdProfilingService::ProfileRenderDynamicOverlay(
         MgdMap* map,
         MgdSelection* selection,
-        MgRenderingOptions* options)
+        MgdRenderingOptions* options)
 {
 	Ptr<MgByteReader> ret;
     

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -3,14 +3,14 @@
 
 #include "MgDesktop.h"
 
-class MgRenderingOptions;
+class MgdRenderingOptions;
 class MgdRenderingService;
 
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Service_Module
 /// \{
 
 /// \brief
-/// This class provides services to profile exsiting MapGuide APIs 
+/// This class provides services to profile existing MapGuide APIs 
 class MG_DESKTOP_API MgdProfilingService : public MgService
 {
 PUBLISHED_API:
@@ -36,7 +36,7 @@
     virtual MgByteReader* ProfileRenderDynamicOverlay(
         MgdMap* map,
         MgdSelection* selection,
-        MgRenderingOptions* options);
+        MgdRenderingOptions* options);
 
     /////////////////////////////////////////////////////////////////
     /// \brief

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/DwfVersion.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/DwfVersion.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/DwfVersion.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -17,11 +17,11 @@
 
 #include "MgDesktop.h"
 
-MG_IMPL_DYNCREATE(MgDwfVersion)
+MG_IMPL_DYNCREATE(MgdDwfVersion)
 
 // Create a DWF specification.  The DWF is specified by both schema and file version
 //
-MgDwfVersion::MgDwfVersion(CREFSTRING fileVersion, CREFSTRING schemaVersion)
+MgdDwfVersion::MgdDwfVersion(CREFSTRING fileVersion, CREFSTRING schemaVersion)
 {
     m_fileVersion = fileVersion;
     m_schemaVersion = schemaVersion;
@@ -29,35 +29,35 @@
 
 // Returns the specified DWF file version string
 //
-STRING MgDwfVersion::GetFileVersion()
+STRING MgdDwfVersion::GetFileVersion()
 {
     return m_fileVersion;
 }
 
 // Sets the supported/required client-side file version for DWF.
 //
-void MgDwfVersion::SetFileVersion(CREFSTRING fileVersion)
+void MgdDwfVersion::SetFileVersion(CREFSTRING fileVersion)
 {
     m_fileVersion = fileVersion;
 }
 
 // Returns the specified DWF schema version
 //
-STRING MgDwfVersion::GetSchemaVersion()
+STRING MgdDwfVersion::GetSchemaVersion()
 {
     return m_schemaVersion;
 }
 
 // Sets the supported/required client-side schema version for DWF.
 //
-void MgDwfVersion::SetSchemaVersion(CREFSTRING schemaVersion)
+void MgdDwfVersion::SetSchemaVersion(CREFSTRING schemaVersion)
 {
     m_schemaVersion = schemaVersion;
 }
 
 // Serialize data to a stream
 //
-void MgDwfVersion::Serialize(MgStream* stream)
+void MgdDwfVersion::Serialize(MgStream* stream)
 {
     stream->WriteString(m_fileVersion);
     stream->WriteString(m_schemaVersion);
@@ -65,7 +65,7 @@
 
 // Deserialize data from a stream
 //
-void MgDwfVersion::Deserialize(MgStream* stream)
+void MgdDwfVersion::Deserialize(MgStream* stream)
 {
     MgStreamReader* streamReader = (MgStreamReader*)stream;
 
@@ -75,6 +75,6 @@
 
 // Default ctor
 //
-MgDwfVersion::MgDwfVersion()
+MgdDwfVersion::MgdDwfVersion()
 {
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/DwfVersion.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/DwfVersion.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/DwfVersion.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_DWF_VERSION_H
 #define DEKSTOP_DWF_VERSION_H
 
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
 
 /////////////////////////////////////////////////////////////////
@@ -30,10 +30,10 @@
 /// These parameters should be set by the client so the MapGuide
 /// server generates client-side compatible DWFs.
 ///
-class MG_DESKTOP_API MgDwfVersion : public MgSerializable
+class MG_DESKTOP_API MgdDwfVersion : public MgSerializable
 {
     MG_DECL_DYNCREATE()
-    DECLARE_CLASSNAME(MgDwfVersion)
+    DECLARE_CLASSNAME(MgdDwfVersion)
 
 PUBLISHED_API:
     /////////////////////////////////////////////////////////////////
@@ -42,13 +42,13 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// MgDwfVersion(string fileVersion, string schemaVersion);
+    /// MgdDwfVersion(string fileVersion, string schemaVersion);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// MgDwfVersion(String fileVersion, String schemaVersion);
+    /// MgdDwfVersion(String fileVersion, String schemaVersion);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// MgDwfVersion(string fileVersion, string schemaVersion);
+    /// MgdDwfVersion(string fileVersion, string schemaVersion);
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \param fileVersion (String/string)
@@ -64,11 +64,11 @@
     /// <!-- Example (PHP) -->
     /// \htmlinclude PHPExampleTop.html
     /// \code
-    /// $dwfVersion = new MgDwfVersion('6.01','1.2');
+    /// $dwfVersion = new MgdDwfVersion('6.01','1.2');
     /// \endcode
     /// \htmlinclude ExampleBottom.html
     ///
-    MgDwfVersion(CREFSTRING fileVersion, CREFSTRING schemaVersion);
+    MgdDwfVersion(CREFSTRING fileVersion, CREFSTRING schemaVersion);
 
     //////////////////////////////////////////////
     /// \brief
@@ -187,7 +187,7 @@
     /// \brief
     /// Default constructor to shut Ptr<> up.
     ///
-    MgDwfVersion();
+    MgdDwfVersion();
 
     //////////////////////////////////////////////////////////////////
     /// \brief

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/FeatureInformation.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/FeatureInformation.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/FeatureInformation.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -22,7 +22,7 @@
 template class MG_DESKTOP_API Ptr<MgdFeatureInformation>;
 
 class MgSelection;
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
 ///////////////////////////////////////////////////////////
 /// \brief

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/Layout.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/Layout.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/Layout.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -17,24 +17,24 @@
 
 #include "MgDesktop.h"
 
-MG_IMPL_DYNCREATE(MgLayout)
+MG_IMPL_DYNCREATE(MgdLayout)
 
-// Default Constructor for a MgLayout object
+// Default Constructor for a MgdLayout object
 //
-MgLayout::MgLayout()
+MgdLayout::MgdLayout()
 {
 }
 
-// Construct a MgLayout object
+// Construct a MgdLayout object
 //
-MgLayout::MgLayout(MgResourceIdentifier* layoutDefinition, CREFSTRING title, CREFSTRING unitType) :
+MgdLayout::MgdLayout(MgResourceIdentifier* layoutDefinition, CREFSTRING title, CREFSTRING unitType) :
     m_title(title), m_unitType(unitType)
 {
     m_layout = SAFE_ADDREF(layoutDefinition);
 }
 
-// Destructor for MgLayout
-MgLayout::~MgLayout()
+// Destructor for MgdLayout
+MgdLayout::~MgdLayout()
 {
     if (m_layout)
     {
@@ -44,25 +44,25 @@
 
 // Get the layout to use when generating the EPlot DWF.  If not specified, then the plotted map
 // will fill the space within the page margins.
-MgResourceIdentifier* MgLayout::GetLayout()
+MgResourceIdentifier* MgdLayout::GetLayout()
 {
     return SAFE_ADDREF(m_layout);
 }
 
 // Set the layout to use when generating the EPlot DWF.
-void MgLayout::SetLayout(MgResourceIdentifier* plotLayout)
+void MgdLayout::SetLayout(MgResourceIdentifier* plotLayout)
 {
     m_layout = plotLayout;
 }
 
 // Get the title
-STRING MgLayout::GetTitle()
+STRING MgdLayout::GetTitle()
 {
     return m_title;
 }
 
 // Set the title
-void MgLayout::SetTitle(CREFSTRING title)
+void MgdLayout::SetTitle(CREFSTRING title)
 {
     m_title = title;
 }
@@ -70,20 +70,20 @@
 // Get the layout scale units.  This value determines the units used
 // in the scale bar definition.  This value is ignored if a layout is not
 // specified.
-STRING MgLayout::GetUnitType()
+STRING MgdLayout::GetUnitType()
 {
     return m_unitType;
 }
 
 // Set the layout scale units.
-void MgLayout::SetUnitType(CREFSTRING unitType)
+void MgdLayout::SetUnitType(CREFSTRING unitType)
 {
     m_unitType = unitType;
 }
 
 // Serialize data to a stream
 //
-void MgLayout::Serialize(MgStream* stream)
+void MgdLayout::Serialize(MgStream* stream)
 {
     stream->WriteObject(m_layout);
     stream->WriteString(m_title);
@@ -92,7 +92,7 @@
 
 // Deserialize data from a stream
 //
-void MgLayout::Deserialize(MgStream* stream)
+void MgdLayout::Deserialize(MgStream* stream)
 {
     MgStreamReader* streamReader = (MgStreamReader*)stream;
 

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/Layout.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/Layout.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/Layout.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -20,7 +20,7 @@
 
 #include "UnitType.h"
 
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
 class MgResourceIdentifier;
 
@@ -28,25 +28,25 @@
 /// \brief
 /// Specifies the ResourceId of the PrintLayout to use for a particular
 /// map, the title and the type of units to use in the layout.
-class MG_DESKTOP_API MgLayout : public MgSerializable
+class MG_DESKTOP_API MgdLayout : public MgSerializable
 {
     MG_DECL_DYNCREATE()
-    DECLARE_CLASSNAME(MgLayout)
+    DECLARE_CLASSNAME(MgdLayout)
 
 PUBLISHED_API:
     ///////////////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Initializes a new MgLayout object given a layout definition, title and unit type.
+    /// Initializes a new MgdLayout object given a layout definition, title and unit type.
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// MgLayout(MgResourceIdentifier layoutDefinition, string title, string unitType);
+    /// MgdLayout(MgResourceIdentifier layoutDefinition, string title, string unitType);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// MgLayout(MgResourceIdentifier layoutDefinition, String title, String unitType);
+    /// MgdLayout(MgResourceIdentifier layoutDefinition, String title, String unitType);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// MgLayout(MgResourceIdentifier layoutDefinition, string title, string unitType);
+    /// MgdLayout(MgResourceIdentifier layoutDefinition, string title, string unitType);
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \param layoutDefinition (MgResourceIdentifier)
@@ -61,7 +61,7 @@
     /// \return
     /// Nothing
     ///
-    MgLayout(MgResourceIdentifier* layoutDefinition, CREFSTRING title, CREFSTRING unitType);
+    MgdLayout(MgResourceIdentifier* layoutDefinition, CREFSTRING title, CREFSTRING unitType);
 
     ///////////////////////////////////////////////////////////////////////////////////
     /// \brief
@@ -230,18 +230,18 @@
 
     ///////////////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct an MgLayout object.
+    /// Construct an MgdLayout object.
     ///
     /// \return
     /// Nothing
     ///
-    MgLayout();
+    MgdLayout();
 
     //////////////////////////////////////////////////////////////////
     /// \brief
-    /// Destroy a MgLayout object
+    /// Destroy a MgdLayout object
     ///
-    ~MgLayout();
+    ~MgdLayout();
 
     //////////////////////////////////////////////////////////////////
     /// \brief

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/LegendPlotUtil.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/LegendPlotUtil.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/LegendPlotUtil.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -48,7 +48,7 @@
 }
 
 
-void MgLegendPlotUtil::AddLegendElement(double dMapScale, Renderer& dr, MgdMap* map, MgPlotSpecification* legendSpec, double legendOffsetX, double legendOffsetY)
+void MgLegendPlotUtil::AddLegendElement(double dMapScale, Renderer& dr, MgdMap* map, MgdPlotSpecification* legendSpec, double legendOffsetX, double legendOffsetY)
 {
     if (NULL == map || NULL == legendSpec)
     {
@@ -85,7 +85,7 @@
 }
 
 
-void MgLegendPlotUtil::BuildLegendContent(MgdMap* map, double scale, MgPlotSpecification* legendSpec, double legendOffsetX, double legendOffsetY, Renderer& dr, double convertUnits)
+void MgLegendPlotUtil::BuildLegendContent(MgdMap* map, double scale, MgdPlotSpecification* legendSpec, double legendOffsetX, double legendOffsetY, Renderer& dr, double convertUnits)
 {
     RS_TextDef textDef;
     RS_FontDef fontDef(m_legendFontName, legendFontHeightMeters, RS_FontStyle_Regular, RS_Units_Device);
@@ -157,7 +157,7 @@
 }
 
 
-void MgLegendPlotUtil::ProcessLayersForLegend(MgdMap* map, double mapScale, MgLayerGroup* mggroup, double startX, double& startY, RS_TextDef textDef, Renderer& dr, MgPlotSpecification* legendSpec, double legendOffsetY, double convertUnits)
+void MgLegendPlotUtil::ProcessLayersForLegend(MgdMap* map, double mapScale, MgLayerGroup* mggroup, double startX, double& startY, RS_TextDef textDef, Renderer& dr, MgdPlotSpecification* legendSpec, double legendOffsetY, double convertUnits)
 {
     double x;
     double &y = startY;
@@ -493,7 +493,7 @@
 
     // Determine the distance units
     STRING unitsText = L"";
-    if (layout->GetScaleBarUnits() == MgUnitType::USEnglish)
+    if (layout->GetScaleBarUnits() == MgdUnitType::USEnglish)
     {
         if (distancePerDivision >= MI_TO_IN)
         {
@@ -558,7 +558,7 @@
     // Align scale bar horizontally with the map
     double scalebarStartX = dr.mapOffsetX() - MgPrintLayout::LegendPadding*convertUnits;  // legend padding
 
-    Ptr<MgPlotSpecification> spec = layout->GetPlotSize();
+    Ptr<MgdPlotSpecification> spec = layout->GetPlotSize();
 
     if (scalebarStartX < spec->GetMarginLeft())
         scalebarStartX = spec->GetMarginLeft();
@@ -784,7 +784,7 @@
     double startX = dr.mapOffsetX() + dr.mapWidth();
     if (startX > layout->PageWidth())
     {
-        Ptr<MgPlotSpecification> spec = layout->GetPlotSize();
+        Ptr<MgdPlotSpecification> spec = layout->GetPlotSize();
         startX = layout->PageWidth() - spec->GetMarginLeft();
     }
 
@@ -858,7 +858,7 @@
     textDef.halign() = RS_HAlignment_Left;
     textDef.valign() = RS_VAlignment_Base;
 
-    Ptr<MgPlotSpecification> spec = layout->GetPlotSize();
+    Ptr<MgdPlotSpecification> spec = layout->GetPlotSize();
     double x = spec->GetMarginLeft();
     double y = spec->GetMarginBottom();
 
@@ -886,7 +886,7 @@
     textDef.halign() = RS_HAlignment_Right;
     textDef.valign() = RS_VAlignment_Base;
 
-    Ptr<MgPlotSpecification> spec = layout->GetPlotSize();
+    Ptr<MgdPlotSpecification> spec = layout->GetPlotSize();
     double x = layout->PageWidth() - spec->GetMarginRight();
     double y = spec->GetMarginBottom();
 
@@ -897,7 +897,7 @@
 
 void MgLegendPlotUtil::AddCustomLogoElement(MgPrintLayout* layout, EPlotRenderer& dr)
 {
-    Ptr<MgPlotSpecification> plotSpec = layout->GetPlotSize();
+    Ptr<MgdPlotSpecification> plotSpec = layout->GetPlotSize();
     STRING pageUnits = plotSpec->GetPageSizeUnits();
     if (!pageUnits.empty())
     {
@@ -957,7 +957,7 @@
         else
         {
             // invalid positionUnits specified
-            throw new MgInvalidPrintLayoutPositionUnitsException(L"MgLegendPlotUtil.AddCustomLogoElement",
+            throw new MgdInvalidPrintLayoutPositionUnitsException(L"MgLegendPlotUtil.AddCustomLogoElement",
                 __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
@@ -996,7 +996,7 @@
         else
         {
             // invalid positionUnits specified - should never get here
-            throw new MgInvalidPrintLayoutPositionUnitsException(L"MgLegendPlotUtil.AddCustomLogoElement",
+            throw new MgdInvalidPrintLayoutPositionUnitsException(L"MgLegendPlotUtil.AddCustomLogoElement",
                 __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
@@ -1020,7 +1020,7 @@
         else
         {
             // invalid positionUnits specified
-            throw new MgInvalidPrintLayoutPositionUnitsException(L"MgLegendPlotUtil.AddCustomLogoElement",
+            throw new MgdInvalidPrintLayoutPositionUnitsException(L"MgLegendPlotUtil.AddCustomLogoElement",
                 __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
@@ -1037,7 +1037,7 @@
         else
         {
             // invalid units specified - should never get here
-            throw new MgInvalidPrintLayoutSizeUnitsException(L"MgLegendPlotUtil.AddCustomLogoElement",
+            throw new MgdInvalidPrintLayoutSizeUnitsException(L"MgLegendPlotUtil.AddCustomLogoElement",
                 __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
@@ -1057,7 +1057,7 @@
 
 void MgLegendPlotUtil::AddCustomTextElement(MgPrintLayout* layout, EPlotRenderer& dr)
 {
-    Ptr<MgPlotSpecification> plotSpec = layout->GetPlotSize();
+    Ptr<MgdPlotSpecification> plotSpec = layout->GetPlotSize();
     STRING pageUnits = plotSpec->GetPageSizeUnits();
     if (!pageUnits.empty())
     {
@@ -1122,7 +1122,7 @@
         else
         {
             // invalid positionUnits specified
-            throw new MgInvalidPrintLayoutPositionUnitsException(L"MgLegendPlotUtil.AddCustomLogoElement", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgdInvalidPrintLayoutPositionUnitsException(L"MgLegendPlotUtil.AddCustomLogoElement", __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
         if (positionUnits == L"percent")  // NOXLATE
@@ -1160,7 +1160,7 @@
         else
         {
             // invalid positionUnits specified - should never get here
-            throw new MgInvalidPrintLayoutPositionUnitsException(L"MgLegendPlotUtil.AddCustomLogoElement", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgdInvalidPrintLayoutPositionUnitsException(L"MgLegendPlotUtil.AddCustomLogoElement", __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
         double textSize = 0.0;
@@ -1184,7 +1184,7 @@
         else
         {
             // invalid positionUnits specified
-            throw new MgInvalidPrintLayoutFontSizeUnitsException(L"MgLegendPlotUtil.AddCustomTextElement", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgdInvalidPrintLayoutFontSizeUnitsException(L"MgLegendPlotUtil.AddCustomTextElement", __LINE__, __WFILE__, NULL, L"", NULL);
         }
 
         if (sizeUnits == L"inches")  // NOXLATE
@@ -1202,7 +1202,7 @@
         else
         {
             // invalid units specified
-            throw new MgInvalidPrintLayoutFontSizeUnitsException(L"MgLegendPlotUtil.AddCustomTextElement", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgdInvalidPrintLayoutFontSizeUnitsException(L"MgLegendPlotUtil.AddCustomTextElement", __LINE__, __WFILE__, NULL, L"", NULL);
         }
         fontName = textInfo.GetFontName();
         fontHeight = textSize;
@@ -1246,7 +1246,7 @@
         ComputeLegendOffsetAndSize(layout, dMapScale, dr, map, legendOffsetX, legendOffsetY, legendWidth, legendHeight);
 
         float legendMargin = (float)(defaultLegendMargin*convertUnits);
-        MgPlotSpecification legendSpec((float)legendWidth, float(legendHeight), pageUnits, legendMargin, legendMargin, legendMargin, legendMargin);
+        MgdPlotSpecification legendSpec((float)legendWidth, float(legendHeight), pageUnits, legendMargin, legendMargin, legendMargin, legendMargin);
 
         // add the legend directly to the ePlot
         AddLegendElement(dMapScale, dr, map, &legendSpec, legendOffsetX, legendOffsetY);
@@ -1299,7 +1299,7 @@
     //legend x offset = map offset - legend width - legend padding
     double startX = dr.mapOffsetX() - (MgPrintLayout::LegendWidth + MgPrintLayout::LegendPadding)*convertUnits;
 
-    Ptr<MgPlotSpecification> spec = layout->GetPlotSize();
+    Ptr<MgdPlotSpecification> spec = layout->GetPlotSize();
     if (startX < spec->GetMarginLeft())
     {
         startX = spec->GetMarginLeft();

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/LegendPlotUtil.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/LegendPlotUtil.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/LegendPlotUtil.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -24,9 +24,9 @@
     //These have been cleaned up to work with a generic renderer, rather than just EPlot.
     //Eventually the scale bar and north arrow ones need to be cleaned up also in order
     //to use them in the AJAX viewer
-    void AddLegendElement(double dMapScale, Renderer& dr, MgdMap* map, MgPlotSpecification* plotSpec, double legendOffsetX, double legendOffsetY);
-    void ProcessLayersForLegend(MgdMap* map, double mapScale, MgLayerGroup* mggroup, double startX, double& startY, RS_TextDef textDef, Renderer& dr, MgPlotSpecification* plotSpec, double legendOffsetY, double convertUnits);
-    void BuildLegendContent(MgdMap* map, double scale, MgPlotSpecification* legendSpec, double legendOffsetX, double legendOffsetY, Renderer& dr, double convertUnits);
+    void AddLegendElement(double dMapScale, Renderer& dr, MgdMap* map, MgdPlotSpecification* plotSpec, double legendOffsetX, double legendOffsetY);
+    void ProcessLayersForLegend(MgdMap* map, double mapScale, MgLayerGroup* mggroup, double startX, double& startY, RS_TextDef textDef, Renderer& dr, MgdPlotSpecification* plotSpec, double legendOffsetY, double convertUnits);
+    void BuildLegendContent(MgdMap* map, double scale, MgdPlotSpecification* legendSpec, double legendOffsetX, double legendOffsetY, Renderer& dr, double convertUnits);
 
     void ExtentFromMapCenter(MgdMap* map, double metersPerUnit, RS_Bounds& b);
 

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlot.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlot.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlot.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -21,18 +21,18 @@
 
 //////////////////////////////////////////////////////////////
 // Default constructor
-MgMapPlot::MgMapPlot()
+MgdMapPlot::MgdMapPlot()
 {
 }
 
 
 //////////////////////////////////////////////////////////////
-// Create and initialize an MgMapPlot instance.
-MgMapPlot::MgMapPlot(MgdMap* map, MgPlotSpecification* plotSpec, MgLayout* layout)
+// Create and initialize an MgdMapPlot instance.
+MgdMapPlot::MgdMapPlot(MgdMap* map, MgdPlotSpecification* plotSpec, MgdLayout* layout)
 {
     if (NULL == map || NULL == plotSpec)
     {
-        throw new MgNullArgumentException(L"MgMapPlot.MgMapPlot", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgNullArgumentException(L"MgdMapPlot.MgdMapPlot", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     Initialize();
@@ -41,17 +41,17 @@
     m_plotSpec = SAFE_ADDREF(plotSpec);
     m_layout = SAFE_ADDREF(layout);
 
-    m_plotInstruction = MgMapPlotInstruction::UseMapCenterAndScale;
+    m_plotInstruction = MgdMapPlotInstruction::UseMapCenterAndScale;
 }
 
 
 //////////////////////////////////////////////////////////////
-MgMapPlot::MgMapPlot(MgdMap* map, MgCoordinate* center, double scale,
-                     MgPlotSpecification* plotSpec, MgLayout* layout)
+MgdMapPlot::MgdMapPlot(MgdMap* map, MgCoordinate* center, double scale,
+                     MgdPlotSpecification* plotSpec, MgdLayout* layout)
 {
     if (NULL == map || NULL == center || NULL == plotSpec)
     {
-        throw new MgNullArgumentException(L"MgMapPlot.MgMapPlot", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgNullArgumentException(L"MgdMapPlot.MgdMapPlot", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     Initialize();
@@ -63,17 +63,17 @@
     m_plotSpec = SAFE_ADDREF(plotSpec);
     m_layout = SAFE_ADDREF(layout);
 
-    m_plotInstruction = MgMapPlotInstruction::UseOverriddenCenterAndScale;
+    m_plotInstruction = MgdMapPlotInstruction::UseOverriddenCenterAndScale;
 }
 
 
 //////////////////////////////////////////////////////////////
-MgMapPlot::MgMapPlot(MgdMap* map, MgEnvelope* extent, bool expandToFit,
-                     MgPlotSpecification* plotSpec, MgLayout* layout)
+MgdMapPlot::MgdMapPlot(MgdMap* map, MgEnvelope* extent, bool expandToFit,
+                     MgdPlotSpecification* plotSpec, MgdLayout* layout)
 {
     if (map == NULL || extent == NULL || plotSpec == NULL)
     {
-        throw new MgNullArgumentException(L"MgMapPlot.MgMapPlot", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgNullArgumentException(L"MgdMapPlot.MgdMapPlot", __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     Initialize();
@@ -85,13 +85,13 @@
     m_plotSpec = SAFE_ADDREF(plotSpec);
     m_layout = SAFE_ADDREF(layout);
 
-    m_plotInstruction = MgMapPlotInstruction::UseOverriddenExtent;
+    m_plotInstruction = MgdMapPlotInstruction::UseOverriddenExtent;
 }
 
 
 //////////////////////////////////////////////////////////////
 // Initialize class members which may not be set by the constructors
-void MgMapPlot::Initialize()
+void MgdMapPlot::Initialize()
 {
     Ptr<MgCoordinate> initCoord = new MgCoordinateXY(0, 0);
     m_center = initCoord;
@@ -105,7 +105,7 @@
 
 //////////////////////////////////////////////////////////////
 // Get and Set the MgMap to plot.
-MgdMap* MgMapPlot::GetMap()
+MgdMap* MgdMapPlot::GetMap()
 {
     return SAFE_ADDREF(m_map);
 }
@@ -113,7 +113,7 @@
 
 //////////////////////////////////////////////////////////////
 // Set the MgMap to plot.
-void MgMapPlot::SetMap(MgdMap* map)
+void MgdMapPlot::SetMap(MgdMap* map)
 {
     SAFE_RELEASE(m_map);
     m_map = SAFE_ADDREF(map);
@@ -123,7 +123,7 @@
 //////////////////////////////////////////////////////////////
 // Get the MapPlotInstruction, which defines how the view of the map
 // to be plotted is defined.
-INT32 MgMapPlot::GetMapPlotInstruction()
+INT32 MgdMapPlot::GetMapPlotInstruction()
 {
     return m_plotInstruction;
 }
@@ -131,7 +131,7 @@
 
 //////////////////////////////////////////////////////////////
 // Set the MapPlotInstruction.
-void MgMapPlot::SetMapPlotInstruction(INT32 plotInstruction)
+void MgdMapPlot::SetMapPlotInstruction(INT32 plotInstruction)
 {
     m_plotInstruction = plotInstruction;
 }
@@ -139,7 +139,7 @@
 
 //////////////////////////////////////////////////////////////
 // Get and the view center.
-MgCoordinate* MgMapPlot::GetCenter()
+MgCoordinate* MgdMapPlot::GetCenter()
 {
     return SAFE_ADDREF(m_center);
 }
@@ -147,7 +147,7 @@
 
 //////////////////////////////////////////////////////////////
 // Get the view scale.
-double MgMapPlot::GetScale()
+double MgdMapPlot::GetScale()
 {
     return m_scale;
 }
@@ -155,18 +155,18 @@
 
 //////////////////////////////////////////////////////////////
 // Set the view center and scale.
-void MgMapPlot::SetCenterAndScale(MgCoordinate* center, double scale)
+void MgdMapPlot::SetCenterAndScale(MgCoordinate* center, double scale)
 {
     SAFE_RELEASE(m_center);
     m_center = SAFE_ADDREF(center);
     m_scale = scale;
-    m_plotInstruction = MgMapPlotInstruction::UseOverriddenCenterAndScale;
+    m_plotInstruction = MgdMapPlotInstruction::UseOverriddenCenterAndScale;
 }
 
 
 //////////////////////////////////////////////////////////////
 // Get the extent.
-MgEnvelope* MgMapPlot::GetExtent()
+MgEnvelope* MgdMapPlot::GetExtent()
 {
     return SAFE_ADDREF(m_extent);
 }
@@ -174,7 +174,7 @@
 
 //////////////////////////////////////////////////////////////
 // Get the expand to fit flag.
-bool MgMapPlot::GetExpandToFit()
+bool MgdMapPlot::GetExpandToFit()
 {
     return m_bExpandToFit;
 }
@@ -182,18 +182,18 @@
 
 //////////////////////////////////////////////////////////////
 // Set the extent and expand to fit flag.
-void MgMapPlot::SetExtent(MgEnvelope* extent, bool expandToFit)
+void MgdMapPlot::SetExtent(MgEnvelope* extent, bool expandToFit)
 {
     SAFE_RELEASE(m_extent);
     m_extent = SAFE_ADDREF(extent);
     m_bExpandToFit = expandToFit;
-    m_plotInstruction = MgMapPlotInstruction::UseOverriddenExtent;
+    m_plotInstruction = MgdMapPlotInstruction::UseOverriddenExtent;
 }
 
 
 //////////////////////////////////////////////////////////////
 // Get the plot specification
-MgPlotSpecification* MgMapPlot::GetPlotSpecification()
+MgdPlotSpecification* MgdMapPlot::GetPlotSpecification()
 {
     return SAFE_ADDREF(m_plotSpec);
 }
@@ -201,7 +201,7 @@
 
 //////////////////////////////////////////////////////////////
 // Set the plot specification.
-void MgMapPlot::SetPlotSpecification(MgPlotSpecification* plotSpec)
+void MgdMapPlot::SetPlotSpecification(MgdPlotSpecification* plotSpec)
 {
     SAFE_RELEASE(m_plotSpec);
     m_plotSpec = SAFE_ADDREF(plotSpec);
@@ -211,7 +211,7 @@
 //////////////////////////////////////////////////////////////
 // Get the layout.  This value is optional; if null the map will fill
 // the entire page area within the margins.
-MgLayout* MgMapPlot::GetLayout()
+MgdLayout* MgdMapPlot::GetLayout()
 {
     return SAFE_ADDREF(m_layout);
 }
@@ -219,7 +219,7 @@
 
 //////////////////////////////////////////////////////////////
 // Set the layout.
-void MgMapPlot::SetLayout(MgLayout* layout)
+void MgdMapPlot::SetLayout(MgdLayout* layout)
 {
     SAFE_RELEASE(m_layout);
     m_layout = SAFE_ADDREF(layout);
@@ -228,7 +228,7 @@
 
 //////////////////////////////////////////////////////////////
 // Destructor
-MgMapPlot::~MgMapPlot()
+MgdMapPlot::~MgdMapPlot()
 {
     SAFE_RELEASE(m_map);
     SAFE_RELEASE(m_plotSpec);
@@ -240,23 +240,23 @@
 
 //////////////////////////////////////////////////////////////
 // Serialize data to TCP/IP stream
-void MgMapPlot::Serialize(MgStream* stream)
+void MgdMapPlot::Serialize(MgStream* stream)
 {
-    throw new MgNotImplementedException(L"MgMapPlot.Serialize", __LINE__, __WFILE__, NULL, L"", NULL);
+    throw new MgNotImplementedException(L"MgdMapPlot.Serialize", __LINE__, __WFILE__, NULL, L"", NULL);
 }
 
 
 //////////////////////////////////////////////////////////////
 // Deserialize data from TCP/IP stream
-void MgMapPlot::Deserialize(MgStream* stream)
+void MgdMapPlot::Deserialize(MgStream* stream)
 {
-    throw new MgNotImplementedException(L"MgMapPlot.Deserialize", __LINE__, __WFILE__, NULL, L"", NULL);
+    throw new MgNotImplementedException(L"MgdMapPlot.Deserialize", __LINE__, __WFILE__, NULL, L"", NULL);
 }
 
 
 //////////////////////////////////////////////////////////////
 // Get the name of object
-STRING MgMapPlot::GetName()
+STRING MgdMapPlot::GetName()
 {
     return m_map->GetName();
 }
@@ -264,7 +264,7 @@
 
 //////////////////////////////////////////////////////////////
 // Does it allow to set the name
-bool MgMapPlot::CanSetName()
+bool MgdMapPlot::CanSetName()
 {
     // indirectly via SetMap
     return true;

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlot.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlot.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlot.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -20,18 +20,18 @@
 
 class MgdMap;
 class MgdLayer;
-class MgPlotSpecification;
-class MgLayout;
-/// \ingroup Desktop_Module
+class MgdPlotSpecification;
+class MgdLayout;
+/// \ingroup Desktop_Misc_Module
 /// \{
 /////////////////////////////////////////////////////////////////
 /// \brief
 /// The MgdMapPlot class allows the developer to specify the map,
 /// the view of the map, the plot specification, and the layout
 /// for one sheet within a call to GenerateMultiPlot.
-class MG_DESKTOP_API MgMapPlot : public MgNamedSerializable
+class MG_DESKTOP_API MgdMapPlot : public MgNamedSerializable
 {
-    DECLARE_CLASSNAME(MgMapPlot)
+    DECLARE_CLASSNAME(MgdMapPlot)
 
 PUBLISHED_API:
     ///////////////////////////////////////////////
@@ -42,22 +42,22 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// MgdMapPlot(MgdMap map, MgPlotSpecification plotSpec, MgLayout layout);
+    /// MgdMapPlot(MgdMap map, MgdPlotSpecification plotSpec, MgdLayout layout);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// MgdMapPlot(MgdMap map, MgPlotSpecification plotSpec, MgLayout layout);
+    /// MgdMapPlot(MgdMap map, MgdPlotSpecification plotSpec, MgdLayout layout);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// MgdMapPlot(MgdMap map, MgPlotSpecification plotSpec, MgLayout layout);
+    /// MgdMapPlot(MgdMap map, MgdPlotSpecification plotSpec, MgdLayout layout);
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \return
     /// Nothing.
     ///
-    MgMapPlot(
+    MgdMapPlot(
         MgdMap* map,
-        MgPlotSpecification* plotSpec,
-        MgLayout* layout);
+        MgdPlotSpecification* plotSpec,
+        MgdLayout* layout);
 
     ///////////////////////////////////////////////
     /// \brief
@@ -67,24 +67,24 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// MgdMapPlot(MgdMap map, MgCoordinate center, double scale, MgPlotSpecification plotSpec, MgLayout layout);
+    /// MgdMapPlot(MgdMap map, MgCoordinate center, double scale, MgdPlotSpecification plotSpec, MgdLayout layout);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// MgdMapPlot(MgdMap map, MgCoordinate center, double scale, MgPlotSpecification plotSpec, MgLayout layout);
+    /// MgdMapPlot(MgdMap map, MgCoordinate center, double scale, MgdPlotSpecification plotSpec, MgdLayout layout);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// MgdMapPlot(MgdMap map, MgCoordinate center, double scale, MgPlotSpecification plotSpec, MgLayout layout);
+    /// MgdMapPlot(MgdMap map, MgCoordinate center, double scale, MgdPlotSpecification plotSpec, MgdLayout layout);
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \return
     /// Nothing.
     ///
-    MgMapPlot(
+    MgdMapPlot(
         MgdMap* map,
         MgCoordinate* center,
         double scale,
-        MgPlotSpecification* plotSpec,
-        MgLayout* layout);
+        MgdPlotSpecification* plotSpec,
+        MgdLayout* layout);
 
     ///////////////////////////////////////////////
     /// \brief
@@ -94,24 +94,24 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// MgdMapPlot(MgdMap map, MgEnvelope extent, bool expandToFit, MgPlotSpecification plotSpec, MgLayout layout);
+    /// MgdMapPlot(MgdMap map, MgEnvelope extent, bool expandToFit, MgdPlotSpecification plotSpec, MgdLayout layout);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// MgdMapPlot(MgdMap map, MgEnvelope extent, boolean expandToFit, MgPlotSpecification plotSpec, MgLayout layout);
+    /// MgdMapPlot(MgdMap map, MgEnvelope extent, boolean expandToFit, MgdPlotSpecification plotSpec, MgdLayout layout);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// MgdMapPlot(MgdMap map, MgEnvelope extent, bool expandToFit, MgPlotSpecification plotSpec, MgLayout layout);
+    /// MgdMapPlot(MgdMap map, MgEnvelope extent, bool expandToFit, MgdPlotSpecification plotSpec, MgdLayout layout);
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \return
     /// Nothing.
     ///
-    MgMapPlot(
+    MgdMapPlot(
         MgdMap* map,
         MgEnvelope* extent,
         bool expandToFit,
-        MgPlotSpecification* plotSpec,
-        MgLayout* layout);
+        MgdPlotSpecification* plotSpec,
+        MgdLayout* layout);
 
     ///////////////////////////////////////////////
     /// \brief
@@ -340,19 +340,19 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// MgPlotSpecification GetPlotSpecification();
+    /// MgdPlotSpecification GetPlotSpecification();
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// MgPlotSpecification GetPlotSpecification();
+    /// MgdPlotSpecification GetPlotSpecification();
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// MgPlotSpecification GetPlotSpecification();
+    /// MgdPlotSpecification GetPlotSpecification();
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \return
-    /// The MgPlotSpecification.
+    /// The MgdPlotSpecification.
     ///
-    MgPlotSpecification* GetPlotSpecification();
+    MgdPlotSpecification* GetPlotSpecification();
 
     ///////////////////////////////////////////////
     /// \brief
@@ -360,22 +360,22 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// void SetPlotSpecification(MgPlotSpecification plotSpec);
+    /// void SetPlotSpecification(MgdPlotSpecification plotSpec);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// void SetPlotSpecification(MgPlotSpecification plotSpec);
+    /// void SetPlotSpecification(MgdPlotSpecification plotSpec);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// void SetPlotSpecification(MgPlotSpecification plotSpec);
+    /// void SetPlotSpecification(MgdPlotSpecification plotSpec);
     /// \htmlinclude SyntaxBottom.html
     ///
-    /// \param plotSpec (MgPlotSpecification)
+    /// \param plotSpec (MgdPlotSpecification)
     /// The plot specification.
     ///
     /// \return
     /// Nothing
     ///
-    void SetPlotSpecification(MgPlotSpecification* plotSpec);
+    void SetPlotSpecification(MgdPlotSpecification* plotSpec);
 
     ///////////////////////////////////////////////
     /// \brief
@@ -384,19 +384,19 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// MgLayout GetLayout();
+    /// MgdLayout GetLayout();
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// MgLayout GetLayout();
+    /// MgdLayout GetLayout();
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// MgLayout GetLayout();
+    /// MgdLayout GetLayout();
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \return
-    /// The MgLayout.
+    /// The MgdLayout.
     ///
-    MgLayout* GetLayout();
+    MgdLayout* GetLayout();
 
     ///////////////////////////////////////////////
     /// \brief
@@ -404,22 +404,22 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// void SetLayout(MgLayout layout);
+    /// void SetLayout(MgdLayout layout);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// void SetLayout(MgLayout layout);
+    /// void SetLayout(MgdLayout layout);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// void SetLayout(MgLayout layout);
+    /// void SetLayout(MgdLayout layout);
     /// \htmlinclude SyntaxBottom.html
     ///
-    /// \param layout (MgLayout)
+    /// \param layout (MgdLayout)
     /// The object defining the layout for the plot.
     ///
     /// \return
     /// Nothing
     ///
-    void SetLayout(MgLayout* layout);
+    void SetLayout(MgdLayout* layout);
 
 INTERNAL_API:
     //////////////////////////////////////////////////////////
@@ -463,7 +463,7 @@
     /// \brief
     /// Construct and empty MgdMapPlot object
     ///
-    MgMapPlot();
+    MgdMapPlot();
 
     //////////////////////////////////////////////////////////
     /// \brief
@@ -472,7 +472,7 @@
     /// \return
     /// Nothing
     ///
-    virtual ~MgMapPlot();
+    virtual ~MgdMapPlot();
 
 protected:
 
@@ -508,8 +508,8 @@
     void Initialize();
 
     MgdMap* m_map;
-    MgPlotSpecification* m_plotSpec;
-    MgLayout* m_layout;
+    MgdPlotSpecification* m_plotSpec;
+    MgdLayout* m_layout;
 
     MgCoordinate* m_center;
     double m_scale;

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlotCollection.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlotCollection.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlotCollection.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -17,18 +17,18 @@
 
 #include "MgDesktop.h"
 
-MG_IMPL_DYNCREATE(MgMapPlotCollection)
+MG_IMPL_DYNCREATE(MgdMapPlotCollection)
 
-// Constructs an empty MgMapPlotCollection object.
+// Constructs an empty MgdMapPlotCollection object.
 //
-MgMapPlotCollection::MgMapPlotCollection()
+MgdMapPlotCollection::MgdMapPlotCollection()
 {
     m_mapPlots = new MgNamedCollection();
 }
 
 // Returns the number of items in the collection
 //
-INT32 MgMapPlotCollection::GetCount()
+INT32 MgdMapPlotCollection::GetCount()
 {
     return m_mapPlots->GetCount();
 }
@@ -36,25 +36,25 @@
 // Returns the item at the specified index
 // Throws an out of range exception if the index is invalid
 //
-MgMapPlot* MgMapPlotCollection::GetItem(INT32 index)
+MgdMapPlot* MgdMapPlotCollection::GetItem(INT32 index)
 {
     //returned value is addref'd by m_maps base class
-    return (MgMapPlot*)m_mapPlots->GetItem(index);
+    return (MgdMapPlot*)m_mapPlots->GetItem(index);
 }
 
 // Returns the item with the specified name
 // Throws an illegal argument exception if the name does not exist
 //
-MgMapPlot* MgMapPlotCollection::GetItem(CREFSTRING name)
+MgdMapPlot* MgdMapPlotCollection::GetItem(CREFSTRING name)
 {
     //returned value is addref'd by m_maps base class
-    return (MgMapPlot*)m_mapPlots->GetItem(name);
+    return (MgdMapPlot*)m_mapPlots->GetItem(name);
 }
 
 // Sets the item in the collection at the specified index to the specified value
 // Throws an out of range exception if the index is out of range.
 //
-void MgMapPlotCollection::SetItem(INT32 index, MgMapPlot* value)
+void MgdMapPlotCollection::SetItem(INT32 index, MgdMapPlot* value)
 {
     //value is addref'd by m_maps base class
     m_mapPlots->SetItem(index, value);
@@ -62,7 +62,7 @@
 
 // Adds the specified item to the end of the collection.
 //
-void MgMapPlotCollection::Add(MgMapPlot* value)
+void MgdMapPlotCollection::Add(MgdMapPlot* value)
 {
     //value is addref'd by m_mapPlots base class
     m_mapPlots->Add(value);
@@ -72,7 +72,7 @@
 // Items following the insertion point are moved down to accommodate the new item.
 // Throws an out of range argument exception if the specified index is out of range
 //
-void MgMapPlotCollection::Insert(INT32 index, MgMapPlot* value)
+void MgdMapPlotCollection::Insert(INT32 index, MgdMapPlot* value)
 {
     //value is addref'd by m_mapPlots base class
     m_mapPlots->Insert(index, value);
@@ -81,7 +81,7 @@
 /// <summary>
 /// Removes all items from the collection
 /// </summary>
-void MgMapPlotCollection::Clear()
+void MgdMapPlotCollection::Clear()
 {
     m_mapPlots->Clear();
 }
@@ -89,7 +89,7 @@
 // Removes an item from the collection
 // Throws an invalid argument exception if the item does not exist within the collection.
 //
-bool MgMapPlotCollection::Remove(MgMapPlot* value)
+bool MgdMapPlotCollection::Remove(MgdMapPlot* value)
 {
     bool removed = true;
     try
@@ -108,7 +108,7 @@
 // Removes an item from the collection at the specified index
 // Throws an out of range exception if the item does not exist within the collection.
 //
-void MgMapPlotCollection::RemoveAt(INT32 index)
+void MgdMapPlotCollection::RemoveAt(INT32 index)
 {
     //value at index is released by m_maps base class
     m_mapPlots->RemoveAt(index);
@@ -116,35 +116,35 @@
 
 // Returns true if the collection contains the specified item, false otherwise
 //
-bool MgMapPlotCollection::Contains(CREFSTRING name)
+bool MgdMapPlotCollection::Contains(CREFSTRING name)
 {
     return m_mapPlots->Contains(name);
 }
 
 // Returns true if the collection contains the specified item, false otherwise
 //
-bool MgMapPlotCollection::Contains(MgMapPlot* value)
+bool MgdMapPlotCollection::Contains(MgdMapPlot* value)
 {
     return m_mapPlots->Contains(value);
 }
 
 // Returns the index of the specified item in the collection or -1 if the item does not exist.
 //
-INT32 MgMapPlotCollection::IndexOf(CREFSTRING name)
+INT32 MgdMapPlotCollection::IndexOf(CREFSTRING name)
 {
     return m_mapPlots->IndexOf(name);
 }
 
 // Returns the index of the specified item in the collection or -1 if the item does not exist.
 //
-INT32 MgMapPlotCollection::IndexOf(MgMapPlot* value)
+INT32 MgdMapPlotCollection::IndexOf(MgdMapPlot* value)
 {
     return m_mapPlots->IndexOf(value);
 }
 
-// Destruct a MgMapPlotCollection object
+// Destruct a MgdMapPlotCollection object
 //
-MgMapPlotCollection::~MgMapPlotCollection()
+MgdMapPlotCollection::~MgdMapPlotCollection()
 {
     SAFE_RELEASE(m_mapPlots);
 }
@@ -152,16 +152,16 @@
 
 // Serialize data to a stream
 //
-void MgMapPlotCollection::Serialize(MgStream* stream)
+void MgdMapPlotCollection::Serialize(MgStream* stream)
 {
     INT32 count = this->GetCount();
     stream->WriteInt32(count);
     for (INT32 i = 0; i < count; i++)
     {
-        Ptr<MgMapPlot> mapPlot = this->GetItem(i);
+        Ptr<MgdMapPlot> mapPlot = this->GetItem(i);
         Ptr<MgdMap> map = mapPlot->GetMap();
-        Ptr<MgPlotSpecification> plotSpec = mapPlot->GetPlotSpecification();
-        Ptr<MgLayout> layout = mapPlot->GetLayout();
+        Ptr<MgdPlotSpecification> plotSpec = mapPlot->GetPlotSpecification();
+        Ptr<MgdLayout> layout = mapPlot->GetLayout();
         Ptr<MgCoordinate> center = mapPlot->GetCenter();
         Ptr<MgEnvelope> extent = mapPlot->GetExtent();
 
@@ -179,7 +179,7 @@
 
 // Deserialize data from a stream
 //
-void MgMapPlotCollection::Deserialize(MgStream* stream)
+void MgdMapPlotCollection::Deserialize(MgStream* stream)
 {
     MgStreamReader* streamReader = (MgStreamReader*)stream;
 
@@ -188,8 +188,8 @@
     for (INT32 i = 0; i < count; i++)
     {
         Ptr<MgdMap> map = (MgdMap*)streamReader->GetObject();
-        Ptr<MgPlotSpecification> plotSpec = (MgPlotSpecification*)streamReader->GetObject();
-        Ptr<MgLayout> layout = (MgLayout*)streamReader->GetObject();
+        Ptr<MgdPlotSpecification> plotSpec = (MgdPlotSpecification*)streamReader->GetObject();
+        Ptr<MgdLayout> layout = (MgdLayout*)streamReader->GetObject();
         double centerX = 0.0;
         streamReader->GetDouble(centerX);
         double centerY = 0.0;
@@ -203,17 +203,17 @@
         bool expandToFit = false;
         streamReader->GetBoolean(expandToFit);
 
-        Ptr<MgMapPlot> mapPlot;
+        Ptr<MgdMapPlot> mapPlot;
         switch (plotInstruction)
         {
-        case MgMapPlotInstruction::UseMapCenterAndScale:
-            mapPlot = new MgMapPlot(map, plotSpec, layout);
+        case MgdMapPlotInstruction::UseMapCenterAndScale:
+            mapPlot = new MgdMapPlot(map, plotSpec, layout);
             break;
-        case MgMapPlotInstruction::UseOverriddenCenterAndScale:
-            mapPlot = new MgMapPlot(map, center, scale, plotSpec, layout);
+        case MgdMapPlotInstruction::UseOverriddenCenterAndScale:
+            mapPlot = new MgdMapPlot(map, center, scale, plotSpec, layout);
             break;
-        case MgMapPlotInstruction::UseOverriddenExtent:
-            mapPlot = new MgMapPlot(map, extent, expandToFit, plotSpec, layout);
+        case MgdMapPlotInstruction::UseOverriddenExtent:
+            mapPlot = new MgdMapPlot(map, extent, expandToFit, plotSpec, layout);
             break;
         default:
             break;

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlotCollection.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlotCollection.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlotCollection.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -18,19 +18,19 @@
 #ifndef DESKTOP_MAP_PLOT_COLLECTION_H_
 #define DESKTOP_MAP_PLOT_COLLECTION_H_
 
-class MgMapPlotCollection;
-template class MG_DESKTOP_API Ptr<MgMapPlotCollection>;
+class MgdMapPlotCollection;
+template class MG_DESKTOP_API Ptr<MgdMapPlotCollection>;
 
-class MgMapPlot;
-/// \ingroup Desktop_Module
+class MgdMapPlot;
+/// \ingroup Desktop_Misc_Module
 /// \{
 /////////////////////////////////////////////////////////////////
 /// \brief
-/// Manipulates collections of MgMapPlot objects.
-class MG_DESKTOP_API MgMapPlotCollection : public MgSerializable
+/// Manipulates collections of MgdMapPlot objects.
+class MG_DESKTOP_API MgdMapPlotCollection : public MgSerializable
 {
     MG_DECL_DYNCREATE()
-    DECLARE_CLASSNAME(MgMapPlotCollection)
+    DECLARE_CLASSNAME(MgdMapPlotCollection)
 
 PUBLISHED_API:
     ///////////////////////////////////////////////
@@ -59,24 +59,24 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// MgMapPlot GetItem(int index);
+    /// MgdMapPlot GetItem(int index);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// MgMapPlot GetItem(int index);
+    /// MgdMapPlot GetItem(int index);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// MgMapPlot GetItem(int index);
+    /// MgdMapPlot GetItem(int index);
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \param index (int)
     /// Index of the map to get.
     ///
     /// \return
-    /// Returns the specified MgMapPlot object.
+    /// Returns the specified MgdMapPlot object.
     ///
     /// \exception MgOutOfRangeException if the index is invalid.
     ///
-    MgMapPlot* GetItem(INT32 index);
+    MgdMapPlot* GetItem(INT32 index);
 
     //////////////////////////////////////////////////////////////
     /// \brief
@@ -84,25 +84,25 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// MgMapPlot GetItem(string name);
+    /// MgdMapPlot GetItem(string name);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// MgMapPlot GetItem(String name);
+    /// MgdMapPlot GetItem(String name);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// MgMapPlot GetItem(string name);
+    /// MgdMapPlot GetItem(string name);
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \param name (String/string)
     /// Name of the MapPlot to get.
     ///
     /// \return
-    /// Returns the specified MgMapPlot object.
+    /// Returns the specified MgdMapPlot object.
     ///
     /// \exception MgInvalidArgumentException if the name does not exist in
     ///  the collection.
     ///
-    MgMapPlot* GetItem(CREFSTRING name);
+    MgdMapPlot* GetItem(CREFSTRING name);
 
     //////////////////////////////////////////////////////////////////
     /// \brief
@@ -111,27 +111,27 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// void SetItem(int index, MgMapPlot value);
+    /// void SetItem(int index, MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// void SetItem(int index, MgMapPlot value);
+    /// void SetItem(int index, MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// void SetItem(int index, MgMapPlot value);
+    /// void SetItem(int index, MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \param index (int)
     /// Position in the collection to set the
     /// MgMapPot.
-    /// \param value (MgMapPlot)
-    /// MgMapPlot to be set in the collection.
+    /// \param value (MgdMapPlot)
+    /// MgdMapPlot to be set in the collection.
     ///
     /// \return
     /// Returns nothing.
     ///
     /// \exception MgOutOfRangeException if the index is out of range.
     ///
-    void SetItem(INT32 index, MgMapPlot* value);
+    void SetItem(INT32 index, MgdMapPlot* value);
 
     ////////////////////////////////////////////////////////////////////
     /// \brief
@@ -139,22 +139,22 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// void Add(MgMapPlot value);
+    /// void Add(MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// void Add(MgMapPlot value);
+    /// void Add(MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// void Add(MgMapPlot value);
+    /// void Add(MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     ///
-    /// \param value (MgMapPlot)
-    /// MgMapPlot to be added to the collection.
+    /// \param value (MgdMapPlot)
+    /// MgdMapPlot to be added to the collection.
     ///
     /// \return
     /// Returns nothing.
     ///
-    void Add(MgMapPlot* value);
+    void Add(MgdMapPlot* value);
 
     ///////////////////////////////////////////////////////////////////////
     /// \brief
@@ -166,20 +166,20 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// void Insert(int index, MgMapPlot value);
+    /// void Insert(int index, MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// void Insert(int index, MgMapPlot value);
+    /// void Insert(int index, MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// void Insert(int index, MgMapPlot value);
+    /// void Insert(int index, MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \param index (int)
     /// Position in the collection to insert the
-    /// MgMapPlot.
-    /// \param value (MgMapPlot)
-    /// MgMapPlot to be inserted in the collection.
+    /// MgdMapPlot.
+    /// \param value (MgdMapPlot)
+    /// MgdMapPlot to be inserted in the collection.
     ///
     /// \return
     /// Returns nothing.
@@ -187,7 +187,7 @@
     /// \exception MgOutOfRangeException if the specified index is out of
     ///  range.
     ///
-    void Insert(INT32 index, MgMapPlot* value);
+    void Insert(INT32 index, MgdMapPlot* value);
 
     /////////////////////////////////////////
     /// \brief
@@ -215,23 +215,23 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// bool Remove(MgMapPlot value);
+    /// bool Remove(MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// bool Remove(MgMapPlot value);
+    /// bool Remove(MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// bool Remove(MgMapPlot value);
+    /// bool Remove(MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     ///
-    /// \param value (MgMapPlot)
-    /// MgMapPlot to be removed
+    /// \param value (MgdMapPlot)
+    /// MgdMapPlot to be removed
     ///
     /// \return
     /// Returns true if removal was successful.
     ///
     ///
-    bool Remove(MgMapPlot* value);
+    bool Remove(MgdMapPlot* value);
 
     ///////////////////////////////////////////////////////////////
     /// \brief
@@ -289,23 +289,23 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// bool Contains(MgMapPlot value);
+    /// bool Contains(MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// boolean Contains(MgMapPlot value);
+    /// boolean Contains(MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// bool Contains(MgMapPlot value);
+    /// bool Contains(MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     ///
-    /// \param value (MgMapPlot)
-    /// The MgMapPlot to look for.
+    /// \param value (MgdMapPlot)
+    /// The MgdMapPlot to look for.
     ///
     /// \return
     /// Returns true if the collection contains the specified MapPlot,
     /// or false otherwise.
     ///
-    bool Contains(MgMapPlot* value);
+    bool Contains(MgdMapPlot* value);
 
     ///////////////////////////////////////////////////////////////////
     /// \brief
@@ -337,39 +337,39 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// int IndexOf(MgMapPlot value);
+    /// int IndexOf(MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// int IndexOf(MgMapPlot value);
+    /// int IndexOf(MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// int IndexOf(MgMapPlot value);
+    /// int IndexOf(MgdMapPlot value);
     /// \htmlinclude SyntaxBottom.html
     ///
-    /// \param value (MgMapPlot)
+    /// \param value (MgdMapPlot)
     /// Value of the item to get the index of.
     ///
     /// \return
     /// Returns the MapPlot's index if the collection contains the
     /// specified MapPlot, or false (-1) otherwise.
     ///
-    INT32 IndexOf(MgMapPlot* value);
+    INT32 IndexOf(MgdMapPlot* value);
 
     /// \brief
-    /// Constructs an empty MgMapPlotCollection object.
+    /// Constructs an empty MgdMapPlotCollection object.
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// MgMapPlotCollection();
+    /// MgdMapPlotCollection();
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// MgMapPlotCollection();
+    /// MgdMapPlotCollection();
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// MgMapPlotCollection();
+    /// MgdMapPlotCollection();
     /// \htmlinclude SyntaxBottom.html
     ///
-    MgMapPlotCollection();
+    MgdMapPlotCollection();
 
 INTERNAL_API:
     //////////////////////////////////////////////////////////////////
@@ -392,12 +392,12 @@
 
 protected:
     /// \brief
-    /// Destruct a MgMapPlotCollection object
+    /// Destruct a MgdMapPlotCollection object
     ///
     /// \return
     /// Nothing
     ///
-    virtual ~MgMapPlotCollection();
+    virtual ~MgdMapPlotCollection();
 
     /// \brief
     /// Get the unique identifier for the class

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlotInstruction.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlotInstruction.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MapPlotInstruction.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -18,16 +18,16 @@
 #ifndef DESKTOP_MAPPLOT_INSTRUCTION_H
 #define DESKTOP_MAPPLOT_INSTRUCTION_H
 
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// MgMapPlotInstruction defines enumerated values used to indicate whether the plot
+/// MgdMapPlotInstruction defines enumerated values used to indicate whether the plot
 /// should be based on the center and scale of the map,
 /// an overridden center and scale, or an overridden extent.
-class MG_DESKTOP_API MgMapPlotInstruction
+class MG_DESKTOP_API MgdMapPlotInstruction
 {
-    DECLARE_CLASSNAME(MgMapPlotInstruction)
+    DECLARE_CLASSNAME(MgdMapPlotInstruction)
 
 PUBLISHED_API:
     ///////////////////////////////////////////////////////////////////////////

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -861,8 +861,8 @@
             MgStringCollection argumentsWhy;
             argumentsWhy.Add(mgException->GetExceptionMessage(locale));
 
-            Ptr<MgStylizeLayerFailedException> exception;
-            exception = new MgStylizeLayerFailedException(L"MgMappingUtil.StylizeLayers", __LINE__, __WFILE__, &arguments, L"MgFormatInnerExceptionMessage", &argumentsWhy);
+            Ptr<MgdStylizeLayerFailedException> exception;
+            exception = new MgdStylizeLayerFailedException(L"MgMappingUtil.StylizeLayers", __LINE__, __WFILE__, &arguments, L"MgFormatInnerExceptionMessage", &argumentsWhy);
 
             STRING message = exception->GetExceptionMessage(locale);
             STRING stackTrace = exception->GetStackTrace(locale);

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PlotSpecification.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PlotSpecification.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PlotSpecification.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,10 +1,10 @@
 #include "PlotSpecification.h"
 
-MG_IMPL_DYNCREATE(MgPlotSpecification)
+MG_IMPL_DYNCREATE(MgdPlotSpecification)
 
-// Construct a MgPlotSpecification object
+// Construct a MgdPlotSpecification object
 //
-MgPlotSpecification::MgPlotSpecification(float paperWidth, float paperHeight, CREFSTRING pageUnits,
+MgdPlotSpecification::MgdPlotSpecification(float paperWidth, float paperHeight, CREFSTRING pageUnits,
                                          float left, float top, float right, float bottom) :
     m_marginLeft(left), m_marginTop(top), m_marginRight(right), m_marginBottom(bottom)
 {
@@ -13,7 +13,7 @@
     m_pageUnits = pageUnits;
 }
 
-MgPlotSpecification::MgPlotSpecification() : m_marginLeft(0), m_marginTop(0), m_marginRight(0), m_marginBottom(0)
+MgdPlotSpecification::MgdPlotSpecification() : m_marginLeft(0), m_marginTop(0), m_marginRight(0), m_marginBottom(0)
 {
     m_paperWidth = 0.;
     m_paperHeight = 0.;
@@ -21,67 +21,67 @@
 
 // Returns the paper width in page units
 //
-float MgPlotSpecification::GetPaperWidth()
+float MgdPlotSpecification::GetPaperWidth()
 {
     return m_paperWidth;
 }
 
 // Sets the paper width in page units
 //
-void MgPlotSpecification::SetPaperWidth(float width)
+void MgdPlotSpecification::SetPaperWidth(float width)
 {
     m_paperWidth = width;
 }
 
 // Returns the paper height in page units
 //
-float MgPlotSpecification::GetPaperHeight()
+float MgdPlotSpecification::GetPaperHeight()
 {
     return m_paperHeight;
 }
 
 // Sets the paper height in page units
 //
-void MgPlotSpecification::SetPaperHeight(float height)
+void MgdPlotSpecification::SetPaperHeight(float height)
 {
     m_paperHeight = height;
 }
 
-// Returns the units of measure for the page.  See MgPageUnitsType for valid units.
+// Returns the units of measure for the page.  See MgdPageUnitsType for valid units.
 //
-STRING MgPlotSpecification::GetPageSizeUnits()
+STRING MgdPlotSpecification::GetPageSizeUnits()
 {
     return m_pageUnits;
 }
 
-// Set the units of measure for the page.  See MgPageUnitsType for valid units.
+// Set the units of measure for the page.  See MgdPageUnitsType for valid units.
 //
-void MgPlotSpecification::SetPageSizeUnits(CREFSTRING pageUnits)
+void MgdPlotSpecification::SetPageSizeUnits(CREFSTRING pageUnits)
 {
     m_pageUnits = pageUnits;
 }
 
-float MgPlotSpecification::GetMarginLeft()
+float MgdPlotSpecification::GetMarginLeft()
 {
     return m_marginLeft;
 }
 
-float MgPlotSpecification::GetMarginTop()
+float MgdPlotSpecification::GetMarginTop()
 {
     return m_marginTop;
 }
 
-float MgPlotSpecification::GetMarginRight()
+float MgdPlotSpecification::GetMarginRight()
 {
     return m_marginRight;
 }
 
-float MgPlotSpecification::GetMarginBottom()
+float MgdPlotSpecification::GetMarginBottom()
 {
     return m_marginBottom;
 }
 
-void MgPlotSpecification::SetMargins(float left, float top, float right, float bottom)
+void MgdPlotSpecification::SetMargins(float left, float top, float right, float bottom)
 {
     m_marginLeft   = left;
     m_marginTop    = top;
@@ -91,7 +91,7 @@
 
 // Serialize data to a stream
 //
-void MgPlotSpecification::Serialize(MgStream* stream)
+void MgdPlotSpecification::Serialize(MgStream* stream)
 {
     stream->WriteSingle(m_paperWidth);
     stream->WriteSingle(m_paperHeight);
@@ -105,7 +105,7 @@
 
 // Deserialize data from a stream
 //
-void MgPlotSpecification::Deserialize(MgStream* stream)
+void MgdPlotSpecification::Deserialize(MgStream* stream)
 {
     MgStreamReader* streamReader = (MgStreamReader*)stream;
 

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PlotSpecification.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PlotSpecification.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PlotSpecification.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -20,16 +20,16 @@
 
 #include "MgDesktop.h"
 
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
 ////////////////////////////////////////////////////////////
 /// \brief
 /// Specifies the size and format of the \link ePlot ePlot \endlink
 /// sheet to be created by the Mapping Service operations.
-class MG_DESKTOP_API MgPlotSpecification : public MgSerializable
+class MG_DESKTOP_API MgdPlotSpecification : public MgSerializable
 {
     MG_DECL_DYNCREATE()
-    DECLARE_CLASSNAME(MgPlotSpecification)
+    DECLARE_CLASSNAME(MgdPlotSpecification)
 
 PUBLISHED_API:
     ///////////////////////////////////////////////////////////////////////////////////
@@ -38,13 +38,13 @@
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
-    /// MgPlotSpecification(float paperWidth, float paperHeight, string pageUnits, float left = 0, float top = 0, float right = 0, float bottom = 0);
+    /// MgdPlotSpecification(float paperWidth, float paperHeight, string pageUnits, float left = 0, float top = 0, float right = 0, float bottom = 0);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// MgPlotSpecification(float paperWidth, float paperHeight, String pageUnits, float left = 0, float top = 0, float right = 0, float bottom = 0);
+    /// MgdPlotSpecification(float paperWidth, float paperHeight, String pageUnits, float left = 0, float top = 0, float right = 0, float bottom = 0);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// MgPlotSpecification(float paperWidth, float paperHeight, string pageUnits, float left = 0, float top = 0, float right = 0, float bottom = 0);
+    /// MgdPlotSpecification(float paperWidth, float paperHeight, string pageUnits, float left = 0, float top = 0, float right = 0, float bottom = 0);
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \param paperWidth (float)
@@ -55,7 +55,7 @@
     /// paper height in page units
     /// \param pageUnits (String/string)
     /// Input
-    /// units for page size.  See MgPageUnitsType for valid units of measure
+    /// units for page size.  See MgdPageUnitsType for valid units of measure
     /// \param left (float)
     /// Input
     /// The left margin between the plot and the page edge.
@@ -72,7 +72,7 @@
     /// \return
     /// Nothing
     ///
-    MgPlotSpecification(float paperWidth, float paperHeight, CREFSTRING pageUnits,
+    MgdPlotSpecification(float paperWidth, float paperHeight, CREFSTRING pageUnits,
         float left = 0, float top = 0, float right = 0, float bottom = 0);
 
     ///////////////////////////////////////////////////////
@@ -203,7 +203,7 @@
     ///
     /// \param pageUnits (String/string)
     /// Units of measure for page. See
-    /// MgPageUnitsType for valid units.
+    /// MgdPageUnitsType for valid units.
     ///
     /// \return
     /// Returns nothing.
@@ -304,7 +304,7 @@
     /// \brief
     /// Default constructor to shut Ptr<> up.
     ///
-    MgPlotSpecification();
+    MgdPlotSpecification();
 
     //////////////////////////////////////////////////////////////////
     /// \brief

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PrintLayout.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PrintLayout.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PrintLayout.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -38,7 +38,7 @@
 // Construct a MgPrintLayout object
 //
 MgPrintLayout::MgPrintLayout() :
-    m_scaleBarUnits(MgUnitType::Metric),
+    m_scaleBarUnits(MgdUnitType::Metric),
     m_dPlotScale(0),
     m_dPageWidth(0),
     m_dPageHeight(0),
@@ -51,7 +51,7 @@
     m_bShowCustomLogos(false),
     m_bShowCustomText(false)
 {
-    m_plotSpec = new MgPlotSpecification(8.5f, 11.f, L"inches");  // NOXLATE
+    m_plotSpec = new MgdPlotSpecification(8.5f, 11.f, L"inches");  // NOXLATE
     m_plotCenter = new MgCoordinateXY(0.0, 0.0);
     m_bgColor = new MgColor(255, 255, 255, 0);
 }
@@ -147,7 +147,7 @@
 
 // Get the plot size.
 //
-MgPlotSpecification* MgPrintLayout::GetPlotSize()
+MgdPlotSpecification* MgPrintLayout::GetPlotSize()
 {
     return SAFE_ADDREF(m_plotSpec.p);
 }
@@ -156,7 +156,7 @@
 // Set the plot size.  This will override the page size specified
 // in the PrintLayout resource.
 //
-void MgPrintLayout::SetPlotSize(MgPlotSpecification* plotSpec)
+void MgPrintLayout::SetPlotSize(MgdPlotSpecification* plotSpec)
 {
     m_plotSpec = SAFE_ADDREF(plotSpec);
 }
@@ -266,7 +266,7 @@
                         && positionUnits != L"meters" && positionUnits != L"inches" && positionUnits != L"percent")
                     {
                         // invalid print layout position units
-                        throw new MgInvalidPrintLayoutPositionUnitsException(L"MgPrintLayout.GetLayoutPropertiesFromXml", __LINE__, __WFILE__, NULL, L"", NULL);
+                        throw new MgdInvalidPrintLayoutPositionUnitsException(L"MgPrintLayout.GetLayoutPropertiesFromXml", __LINE__, __WFILE__, NULL, L"", NULL);
                     }
                 }
                 pXmlUtil->GetElementValue(logoNode, "ResourceId", resId, false);
@@ -281,7 +281,7 @@
                         && sizeUnits != L"inches" && sizeUnits != L"meters")
                     {
                         // invalid print layout size units
-                        throw new MgInvalidPrintLayoutSizeUnitsException(L"MgPrintLayout.GetLayoutPropertiesFromXml", __LINE__, __WFILE__, NULL, L"", NULL);
+                        throw new MgdInvalidPrintLayoutSizeUnitsException(L"MgPrintLayout.GetLayoutPropertiesFromXml", __LINE__, __WFILE__, NULL, L"", NULL);
                     }
                 }
                 pXmlUtil->GetElementValue(logoNode, "Rotation", rotation, false);
@@ -328,7 +328,7 @@
                         && positionUnits != L"percent" && positionUnits != L"meters" && positionUnits != L"inches")
                     {
                         // invalid print layout position units
-                        throw new MgInvalidPrintLayoutPositionUnitsException(L"MgPrintLayout.GetLayoutPropertiesFromXml", __LINE__, __WFILE__, NULL, L"", NULL);
+                        throw new MgdInvalidPrintLayoutPositionUnitsException(L"MgPrintLayout.GetLayoutPropertiesFromXml", __LINE__, __WFILE__, NULL, L"", NULL);
                     }
                 }
                 DOMNode* fontNode = pXmlUtil->GetElementNode(textNode, "Font", false);
@@ -341,7 +341,7 @@
                         && fontSizeUnits != L"points" && fontSizeUnits != L"meters" && fontSizeUnits != L"inches")
                     {
                         // invalid print layout font size units
-                        throw new MgInvalidPrintLayoutFontSizeUnitsException(L"MgPrintLayout.GetLayoutPropertiesFromXml", __LINE__, __WFILE__, NULL, L"", NULL);
+                        throw new MgdInvalidPrintLayoutFontSizeUnitsException(L"MgPrintLayout.GetLayoutPropertiesFromXml", __LINE__, __WFILE__, NULL, L"", NULL);
                     }
                 }
                 pXmlUtil->GetElementValue(textNode, "Value", value, false);
@@ -454,7 +454,7 @@
 
     streamReader->GetString(m_plotTitle);
 
-    m_plotSpec = (MgPlotSpecification*)streamReader->GetObject();
+    m_plotSpec = (MgdPlotSpecification*)streamReader->GetObject();
 
     streamReader->GetString(m_scaleBarUnits);
 

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PrintLayout.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PrintLayout.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/PrintLayout.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -146,9 +146,9 @@
     /// Gets the plot size.
     ///
     /// \return
-    /// Returns the size of the plot as MgPlotSpecification
+    /// Returns the size of the plot as MgdPlotSpecification
     ///
-    MgPlotSpecification* GetPlotSize();
+    MgdPlotSpecification* GetPlotSize();
 
     ////////////////////////////////////////////////////////////////////
     /// \brief
@@ -156,12 +156,12 @@
     /// in the PrintLayout resource.
     ///
     /// \param plotSpec
-    /// The plot size as a MgPlotSpecification
+    /// The plot size as a MgdPlotSpecification
     ///
     /// \return
     /// Returns nothing.
     ///
-    void SetPlotSize(MgPlotSpecification* plotSpec);
+    void SetPlotSize(MgdPlotSpecification* plotSpec);
 
     ////////////////////////////////////////////////////////////////
     /// \brief
@@ -271,7 +271,7 @@
 private:
 
     STRING m_plotTitle;
-    Ptr<MgPlotSpecification> m_plotSpec;
+    Ptr<MgdPlotSpecification> m_plotSpec;
     STRING m_scaleBarUnits;
     double m_dPlotScale;
     Ptr<MgCoordinate> m_plotCenter;

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/RenderingOptions.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/RenderingOptions.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/RenderingOptions.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,11 +1,11 @@
 #include "RenderingOptions.h"
 
-MG_IMPL_DYNCREATE(MgRenderingOptions)
+MG_IMPL_DYNCREATE(MgdRenderingOptions)
 
 
 //////////////////////////////////////////////////////////////////
 /// <summary>
-/// Construct an MgRenderingOptions object
+/// Construct an MgdRenderingOptions object
 /// </summary>
 /// <param name="format">Input
 /// Image format. Defines the format of the resulting image
@@ -16,7 +16,7 @@
 /// <param name="selectionColor">Input
 /// Selection color, including filling color and boundary color
 /// </param>
-MgRenderingOptions::MgRenderingOptions(CREFSTRING format, INT32 behavior, MgColor* selectionColor)
+MgdRenderingOptions::MgdRenderingOptions(CREFSTRING format, INT32 behavior, MgColor* selectionColor)
 : m_format(MgUtil::ToUpper(format)),
   m_behavior(behavior)
 {
@@ -31,7 +31,7 @@
 /// <returns>
 /// The string value (is in upper case from CTOR)
 /// </returns>
-STRING MgRenderingOptions::GetImageFormat()
+STRING MgdRenderingOptions::GetImageFormat()
 {
     return m_format;
 }
@@ -44,7 +44,7 @@
 /// <returns>
 /// The integer value
 /// </returns>
-INT32 MgRenderingOptions::GetBehavior()
+INT32 MgdRenderingOptions::GetBehavior()
 {
     return m_behavior;
 }
@@ -57,7 +57,7 @@
 /// <returns>
 /// The MgColor object
 /// </returns>
-MgColor* MgRenderingOptions::GetSelectionColor()
+MgColor* MgdRenderingOptions::GetSelectionColor()
 {
     return SAFE_ADDREF((MgColor*)m_selectionColor);
 }
@@ -70,7 +70,7 @@
 /// <param name="stream">Input
 /// Stream
 /// </param>
-void MgRenderingOptions::Serialize(MgStream* stream)
+void MgdRenderingOptions::Serialize(MgStream* stream)
 {
     stream->WriteString(m_format);
     stream->WriteInt32(m_behavior);
@@ -85,7 +85,7 @@
 /// <param name="stream">Input
 /// Stream
 /// </param>
-void MgRenderingOptions::Deserialize(MgStream* stream)
+void MgdRenderingOptions::Deserialize(MgStream* stream)
 {
     stream->GetString(m_format);
     stream->GetInt32(m_behavior);
@@ -97,7 +97,7 @@
 /// <summary>
 /// Default constructor
 /// </summary>
-MgRenderingOptions::MgRenderingOptions()
+MgdRenderingOptions::MgdRenderingOptions()
 : m_behavior(0),
   m_selectionColor(NULL)
 {
@@ -108,7 +108,7 @@
 /// <summary>
 /// Virtual destructor
 /// </summary>
-MgRenderingOptions::~MgRenderingOptions()
+MgdRenderingOptions::~MgdRenderingOptions()
 {
 }
 
@@ -120,7 +120,7 @@
 /// <returns>
 /// The integer value
 /// </returns>
-INT32 MgRenderingOptions::GetClassId()
+INT32 MgdRenderingOptions::GetClassId()
 {
     return m_cls_id;
 }
@@ -133,7 +133,7 @@
 /// <returns>
 /// Nothing
 /// </returns>
-void MgRenderingOptions::Dispose()
+void MgdRenderingOptions::Dispose()
 {
     delete this;
 }
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/RenderingOptions.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/RenderingOptions.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/RenderingOptions.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -3,17 +3,17 @@
 
 #include "MgDesktop.h"
 
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Options for Rendering Service.
 ///
-class MG_DESKTOP_API MgRenderingOptions: public MgSerializable
+class MG_DESKTOP_API MgdRenderingOptions: public MgSerializable
 {
     MG_DECL_DYNCREATE();
-    DECLARE_CLASSNAME(MgRenderingOptions)
+    DECLARE_CLASSNAME(MgdRenderingOptions)
 
 PUBLISHED_API:
 
@@ -36,7 +36,7 @@
 
     /////////////////////////////////////////////////////////////////
     /// \brief
-    /// Construct an MgRenderingOptions object
+    /// Construct an MgdRenderingOptions object
     ///
     /// \param format
     /// Input
@@ -48,7 +48,7 @@
     /// Input
     /// Selection color, including filling color and boundary color
     ///
-    MgRenderingOptions(CREFSTRING format, INT32 behavior, MgColor* selectionColor);
+    MgdRenderingOptions(CREFSTRING format, INT32 behavior, MgColor* selectionColor);
 
     /////////////////////////////////////////////////////////////////
     /// \brief
@@ -101,13 +101,13 @@
     /// \brief
     /// Default constructor
     ///
-    MgRenderingOptions();
+    MgdRenderingOptions();
 
     /////////////////////////////////////////////////////////////////
     /// \brief
     /// Virtual destructor
     ///
-    virtual ~MgRenderingOptions();
+    virtual ~MgdRenderingOptions();
 
 protected:
 

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/UnitType.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/UnitType.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/UnitType.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -19,22 +19,22 @@
 #include "UnitType.h"
 
 ///////////////////////////////////////////////////////////////////////////////
-/// MgUnitType defines enumerated values used to determine the type
+/// MgdUnitType defines enumerated values used to determine the type
 /// of units for plot decorations (scale bar).
 ///
-const STRING MgUnitType::USEnglish       = L"US-English";
-const STRING MgUnitType::Metric          = L"Metric";
+const STRING MgdUnitType::USEnglish       = L"US-English";
+const STRING MgdUnitType::Metric          = L"Metric";
 
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Page size units for Mapping Service.
 ///
-const STRING MgPageUnitsType::Inches        = L"in";
-const STRING MgPageUnitsType::Millimeters   = L"mm";
+const STRING MgdPageUnitsType::Inches        = L"in";
+const STRING MgdPageUnitsType::Millimeters   = L"mm";
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Coordinate space for geometry returned from QueryFeatureProperties.
 ///
-const STRING MgCoordinateSpace::None        = L"None";
-const STRING MgCoordinateSpace::Map         = L"Map";
-const STRING MgCoordinateSpace::Display     = L"Display";
\ No newline at end of file
+const STRING MgdCoordinateSpace::None        = L"None";
+const STRING MgdCoordinateSpace::Map         = L"Map";
+const STRING MgdCoordinateSpace::Display     = L"Display";
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/UnitType.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/UnitType.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/UnitType.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -18,11 +18,14 @@
 #ifndef DESKTOP_UNITTYPE_H
 #define DESKTOP_UNITTYPE_H
 
+/// \ingroup Desktop_Misc_Module
+/// \{
+
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// MgUnitType defines enumerated values used to determine the type
+/// MgdUnitType defines enumerated values used to determine the type
 /// of units for plot decorations (scale bar).
-class MG_DESKTOP_API MgUnitType
+class MG_DESKTOP_API MgdUnitType
 {
 PUBLISHED_API:
     /// \if INTERNAL
@@ -36,10 +39,6 @@
     static const STRING Metric;     ///\if INTERNAL value("Metric") \endif
 };
 
-
-/// \ingroup Desktop_Module
-/// \{
-
 /////////////////////////////////////////////////////////////////
 /// \brief
 /// Defines page size units for the Mapping Service.
@@ -48,7 +47,7 @@
 ///   * [[TO DO: I should change my examples to use this
 ///     instead of hardcoding the string.]]
 ///
-class MG_DESKTOP_API MgPageUnitsType
+class MG_DESKTOP_API MgdPageUnitsType
 {
 PUBLISHED_API:
     /// \if INTERNAL
@@ -64,14 +63,14 @@
 /// \}
 
 
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Specifies the coordinate space for feature geometry returned from QueryFeatures.
 /// Can also specify that only non-geometric data should be returned by QueryFeature.
 ///
-class MG_DESKTOP_API MgCoordinateSpace
+class MG_DESKTOP_API MgdCoordinateSpace
 {
 PUBLISHED_API:
     /// \if INTERNAL

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -311,8 +311,8 @@
     //ret = RenderDynamicOverlay(map, selection, format, true);
 
     // Call updated RenderDynamicOverlay API
-    MgRenderingOptions options(format, MgRenderingOptions::RenderSelection |
-        MgRenderingOptions::RenderLayers | MgRenderingOptions::KeepSelection, NULL);
+    MgdRenderingOptions options(format, MgdRenderingOptions::RenderSelection |
+        MgdRenderingOptions::RenderLayers | MgdRenderingOptions::KeepSelection, NULL);
     ret = RenderDynamicOverlayInternal(map, selection, &options, NULL);
 
     // Successful operation
@@ -361,8 +361,8 @@
     MG_LOG_TRACE_ENTRY(L"MgdRenderingService::RenderDynamicOverlay()");
 
     // Call updated RenderDynamicOverlay API
-    MgRenderingOptions options(format, MgRenderingOptions::RenderSelection |
-        MgRenderingOptions::RenderLayers | (bKeepSelection? MgRenderingOptions::KeepSelection : 0), NULL);
+    MgdRenderingOptions options(format, MgdRenderingOptions::RenderSelection |
+        MgdRenderingOptions::RenderLayers | (bKeepSelection? MgdRenderingOptions::KeepSelection : 0), NULL);
     ret = RenderDynamicOverlayInternal(map, selection, &options, NULL);
 
     // Successful operation
@@ -389,7 +389,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // called from API (first call of AjaxPgPViewerSampleApplication)
 // default arg pPRMResult = NULL
-MgByteReader* MgdRenderingService::RenderDynamicOverlay(MgdMap* map, MgdSelection* selection, MgRenderingOptions* options)
+MgByteReader* MgdRenderingService::RenderDynamicOverlay(MgdMap* map, MgdSelection* selection, MgdRenderingOptions* options)
 {
     Ptr<MgByteReader> ret;
 
@@ -404,7 +404,7 @@
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
     MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgdSelection");
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
-    MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgRenderingOptions");
+    MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgdRenderingOptions");
     MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
 
     MG_LOG_TRACE_ENTRY(L"MgdRenderingService::RenderDynamicOverlay()");
@@ -438,7 +438,7 @@
 // pPRMResult - a pointer points to Profile Render Map Result.
 MgByteReader* MgdRenderingService::RenderDynamicOverlay(MgdMap* map,
                                                        MgdSelection* selection,
-                                                       MgRenderingOptions* options,
+                                                       MgdRenderingOptions* options,
                                                        ProfileRenderMapResult* pPRMResult)
 {
     Ptr<MgByteReader> ret;
@@ -454,7 +454,7 @@
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
     MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgdSelection");
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
-    MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgRenderingOptions");
+    MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgdRenderingOptions");
     MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
     MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"ProfileRenderMapResult");
     MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
@@ -669,7 +669,7 @@
 
 MgByteReader* MgdRenderingService::RenderDynamicOverlayInternal(MgdMap* map,
                                                                MgdSelection* selection,
-                                                               MgRenderingOptions* options,
+                                                               MgdRenderingOptions* options,
                                                                ProfileRenderMapResult* pPRMResult)
 {
     Ptr<MgByteReader> ret;
@@ -1236,8 +1236,8 @@
                                                           bool renderWatermark,
                                                           ProfileRenderMapResult* pPRMResult)
 {
-    MgRenderingOptions options(format, MgRenderingOptions::RenderSelection |
-        MgRenderingOptions::RenderLayers | (bKeepSelection? MgRenderingOptions::KeepSelection : 0), NULL);
+    MgdRenderingOptions options(format, MgdRenderingOptions::RenderSelection |
+        MgdRenderingOptions::RenderLayers | (bKeepSelection? MgdRenderingOptions::KeepSelection : 0), NULL);
     return RenderMapInternal(map, selection, roLayers, dr, drawWidth, drawHeight, saveWidth, saveHeight, scale, b, expandExtents, &options, renderWatermark, pPRMResult);
 }
 
@@ -1260,7 +1260,7 @@
                                                           double scale,
                                                           RS_Bounds& b,
                                                           bool expandExtents,
-                                                          MgRenderingOptions* options,
+                                                          MgdRenderingOptions* options,
                                                           bool renderWatermark,
                                                           ProfileRenderMapResult* pPRMResult)
 {
@@ -1325,18 +1325,18 @@
 
         INT32 behavior = options->GetBehavior();
 
-        if (behavior & MgRenderingOptions::RenderLayers)    // this is for tiles so observer colormaps
+        if (behavior & MgdRenderingOptions::RenderLayers)    // this is for tiles so observer colormaps
         {
             RenderLayers(map, tempLayers, &ds, dr, dstCs, expandExtents, scale, format, pPRMResult);
         }
 
         // now we need to stylize the selection on top (this is not for tiles!)
-        if (selection && (behavior & MgRenderingOptions::RenderSelection))
+        if (selection && (behavior & MgdRenderingOptions::RenderSelection))
         {
             RenderSelection(map, selection, tempLayers, options, &ds, dr, dstCs, scale, behavior, pPRMResult);
         }
 
-        if (renderWatermark && (behavior & MgRenderingOptions::RenderLayers) && map->GetWatermarkUsage() != 0)
+        if (renderWatermark && (behavior & MgdRenderingOptions::RenderLayers) && map->GetWatermarkUsage() != 0)
         {
             RenderWatermarks(map,tempLayers,&ds, dr,drawWidth, drawHeight, saveWidth, saveHeight, pPRMResult);
         }
@@ -1437,13 +1437,13 @@
     dr->StartMap(&info, b, 1.0, pixelsPerInch, metersPerPixel, NULL);
     dr->StartLayer(NULL, NULL);
 
-    //We need to specify margins and offsets in an MgPlotSpecification,
+    //We need to specify margins and offsets in an MgdPlotSpecification,
     //even though in the image based (non-DWF) case they are 0.
     //Units are given as pixels, needed in order to scale legend
     //layout constants which are in inches.
     //NOTE: we need a left margin of one pixel so that legend icons
     //      do not overlap the legend border
-    Ptr<MgPlotSpecification> spec = new MgPlotSpecification(width - 1.0f, height - 1.0f, L"pixels");
+    Ptr<MgdPlotSpecification> spec = new MgdPlotSpecification(width - 1.0f, height - 1.0f, L"pixels");
     spec->SetMargins(1.0f, 0.0f, 0.0f, 0.0f);
     MgLegendPlotUtil lu(m_svcResource);
     lu.AddLegendElement(map->GetViewScale(), *dr, map, spec, 0.0, 0.0);
@@ -1465,13 +1465,13 @@
         // put this into a byte source
         Ptr<MgByteSource> bs = new MgByteSource(data->GetBytes(), data->GetNumBytes());
 
-        if (format == MgImageFormats::Gif)
+        if (format == MgdImageFormats::Gif)
             bs->SetMimeType(MgMimeType::Gif);
-        else if (format == MgImageFormats::Jpeg)
+        else if (format == MgdImageFormats::Jpeg)
             bs->SetMimeType(MgMimeType::Jpeg);
-        else if (format == MgImageFormats::Png)
+        else if (format == MgdImageFormats::Png)
             bs->SetMimeType(MgMimeType::Png);
-        else if (format == MgImageFormats::Tiff)
+        else if (format == MgdImageFormats::Tiff)
             bs->SetMimeType(MgMimeType::Tiff);
 
         ret = bs->GetReader();
@@ -1563,7 +1563,7 @@
 inline void MgdRenderingService::RenderSelection(MgdMap* map,
                                                       MgdSelection* selection,
                                                       MgReadOnlyLayerCollection* layers,
-                                                      MgRenderingOptions* options,
+                                                      MgdRenderingOptions* options,
                                                       Stylizer* ds,
                                                       Renderer* dr,
                                                       MgCoordinateSystem* dstCs,
@@ -1631,7 +1631,7 @@
         }
 
         MgMappingUtil::StylizeLayers(m_svcResource, m_svcFeature, m_svcDrawing, m_pCSFactory, map,
-            modLayers, overrideFilters, ds, renderer, dstCs, false, false, scale, (behavior & MgRenderingOptions::KeepSelection) != 0,false,pPRSResult);
+            modLayers, overrideFilters, ds, renderer, dstCs, false, false, scale, (behavior & MgdRenderingOptions::KeepSelection) != 0,false,pPRSResult);
 
         // Set selection mode to false to avoid affecting following code
         renderer->SetRenderSelectionMode(false);
@@ -1973,13 +1973,13 @@
         // put this into a byte source
         bs = new MgByteSource(data->GetBytes(), data->GetNumBytes());
 
-        if (format == MgImageFormats::Gif)
+        if (format == MgdImageFormats::Gif)
             bs->SetMimeType(MgMimeType::Gif);
-        else if (format == MgImageFormats::Jpeg)
+        else if (format == MgdImageFormats::Jpeg)
             bs->SetMimeType(MgMimeType::Jpeg);
-        else if (format == MgImageFormats::Png || format == MgImageFormats::Png8)
+        else if (format == MgdImageFormats::Png || format == MgdImageFormats::Png8)
             bs->SetMimeType(MgMimeType::Png);
-        else if (format == MgImageFormats::Tiff)
+        else if (format == MgdImageFormats::Tiff)
             bs->SetMimeType(MgMimeType::Tiff);
     }
     else

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -4,7 +4,7 @@
 class MgdMap;
 class MgdFeatureInformation;
 class SE_Renderer;
-class MgRenderingOptions;
+class MgdRenderingOptions;
 class FeatureInfoRenderer;
 class MgdDrawingService;
 struct RS_Bounds;
@@ -20,9 +20,7 @@
 
 template class Ptr<MgdDrawingService>;
 
-//NOTE: Despite MgdRenderingService not defined in PlatformBase, we don't want a naming collision
-//if this library and MapGuideCommon happend to be linked together
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Service_Module
 /// \{
 class MG_DESKTOP_API MgdRenderingService : public MgService
 {
@@ -54,7 +52,7 @@
 
     virtual MgByteReader* RenderDynamicOverlay(MgdMap* map,
                                                MgdSelection* selection,
-                                               MgRenderingOptions* options);
+                                               MgdRenderingOptions* options);
 
     virtual MgByteReader* RenderMap(MgdMap* map,
                                     MgdSelection* selection,
@@ -95,7 +93,7 @@
 
     virtual MgByteReader* RenderDynamicOverlay(MgdMap* map,
                                                MgdSelection* selection,
-                                               MgRenderingOptions* options,
+                                               MgdRenderingOptions* options,
                                                MdfModel::ProfileRenderMapResult* pPRMResult);
 
     virtual MgByteReader* RenderMap(MgdMap* map,
@@ -182,7 +180,7 @@
     // Internal help called by our PUBLISHED_API versions of RenderDynamicOverlay
     MgByteReader* RenderDynamicOverlayInternal(MgdMap* map,
                                                MgdSelection* selection,
-                                               MgRenderingOptions* options,
+                                               MgdRenderingOptions* options,
                                                MdfModel::ProfileRenderMapResult* pPRMResult);
 
     // Internal help called by our PUBLISHED_API versions of RenderMap
@@ -220,7 +218,7 @@
                                     double scale,
                                     RS_Bounds& b,
                                     bool expandExtents,
-                                    MgRenderingOptions* options,
+                                    MgdRenderingOptions* options,
                                     bool renderWatermark,
                                     MdfModel::ProfileRenderMapResult* pPRMResult = NULL);
 
@@ -253,7 +251,7 @@
     void RenderSelection(MgdMap* map,
                          MgdSelection* selection,
                          MgReadOnlyLayerCollection* layers,
-                         MgRenderingOptions* options,
+                         MgdRenderingOptions* options,
                          Stylizer* ds,
                          Renderer* dr,
                          MgCoordinateSystem* dstCs,

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/ByteSourceDwfInputStreamImpl.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/ByteSourceDwfInputStreamImpl.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/ByteSourceDwfInputStreamImpl.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -47,7 +47,7 @@
 /// </returns>
 ///
 /// <exceptions>
-/// MgDwfException
+/// MgdDwfException
 /// </exceptions>
 ///----------------------------------------------------------------------------
 
@@ -80,7 +80,7 @@
 /// </returns>
 ///
 /// <exceptions>
-/// MgDwfException
+/// MgdDwfException
 /// </exceptions>
 ///----------------------------------------------------------------------------
 
@@ -111,7 +111,7 @@
 /// </returns>
 ///
 /// <exceptions>
-/// MgDwfException
+/// MgdDwfException
 /// </exceptions>
 ///----------------------------------------------------------------------------
 

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/OperationInfo.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/OperationInfo.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/OperationInfo.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -132,7 +132,7 @@
         MgStringCollection arguments;
         arguments.Add(name);
 
-        throw new MgParameterNotFoundException(
+        throw new MgdParameterNotFoundException(
             L"MgOperationInfo.GetParameter", __LINE__, __WFILE__, &arguments, L"", NULL);
     }
 
@@ -158,7 +158,7 @@
         MgStringCollection arguments;
         arguments.Add(name);
 
-        throw new MgDuplicateParameterException(
+        throw new MgdDuplicateParameterException(
             L"MgOperationInfo.SetParameter", __LINE__, __WFILE__, &arguments, L"", NULL);
     }
 }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/ResourceDefs.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/ResourceDefs.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/ResourceDefs.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -54,7 +54,7 @@
     {                                                                         \
         MgStringCollection arguments;                                         \
         arguments.Add(STRING(e.message()));                                   \
-        mgException = new MgDwfException(methodName, __LINE__, __WFILE__, NULL, L"MgFormatInnerExceptionMessage", &arguments); \
+        mgException = new MgdDwfException(methodName, __LINE__, __WFILE__, NULL, L"MgFormatInnerExceptionMessage", &arguments); \
     }                                                                         \
     catch (const XMLException& e)                                             \
     {                                                                         \

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataManager.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataManager.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataManager.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -467,7 +467,7 @@
                     STRING mName = MgUtil::MultiByteToWideChar(mappingName);
                     MgStringCollection args;
                     args.Add(mName);
-                    throw new MgAliasNotFoundException(L"MgUnmanagedDataManager::SubstituteDataPathAliases", __LINE__, __WFILE__, &args, L"MgAliasNotFoundException", NULL);
+                    throw new MgdAliasNotFoundException(L"MgUnmanagedDataManager::SubstituteDataPathAliases", __LINE__, __WFILE__, &args, L"MgdAliasNotFoundException", NULL);
                 }
             }
             break;

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataType.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataType.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataType.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -6,6 +6,6 @@
 /// The exact list of supported formats is not defined yet.
 /// At least PNG will be supported.
 ///
-const STRING MgUnmanagedDataType::Folders = L"Folders";
-const STRING MgUnmanagedDataType::Files   = L"Files";
-const STRING MgUnmanagedDataType::Both    = L"Both";
+const STRING MgdUnmanagedDataType::Folders = L"Folders";
+const STRING MgdUnmanagedDataType::Files   = L"Files";
+const STRING MgdUnmanagedDataType::Both    = L"Both";

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataType.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataType.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataType.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,8 +1,8 @@
 #ifndef DESKTOP_UNMANAGED_DATA_TYPE_H
 #define DESKTOP_UNMANAGED_DATA_TYPE_H
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
-class MG_DESKTOP_API MgUnmanagedDataType 
+class MG_DESKTOP_API MgdUnmanagedDataType 
 {
 PUBLISHED_API:
     /// \internal

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/ResourceService.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/ResourceService.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/ResourceService.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -2,7 +2,7 @@
 #define DESKTOP_RESOURCE_SERVICE_H
 
 #include "MgDesktop.h"
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Service_Module
 /// \{
 class MG_DESKTOP_API MgdResourceService : public MgResourceService
 {

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -8,7 +8,7 @@
 
 // The MgdScrollableFeatureReader is an extension to the MgFeatureReader 
 // that can be traversed in the forward and backward direction (scrollable)
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
 class MG_DESKTOP_API MgdScrollableFeatureReader : public MgdFeatureReader
 {

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/ServiceFactory.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/ServiceFactory.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/ServiceFactory.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -10,6 +10,10 @@
 class MgdRenderingService;
 /// \ingroup Desktop_Module
 /// \{
+
+///\brief
+/// The MgServiceFactory class allows you to create instances of service
+/// classes
 class MG_DESKTOP_API MgServiceFactory : public MgGuardDisposable
 {
     MG_DECL_DYNCREATE()
@@ -17,6 +21,29 @@
 
 PUBLISHED_API:
     MgServiceFactory();
+    ///\brief
+    /// Creates an instances of the specified service
+    ///
+    ///\param serviceType (MgServiceType)
+    /// The type of service to create
+    ///
+    ///\return
+    /// An instance of the specified service. It must be cast to the appropriate
+    /// subclass
+    ///
+    ///\exception MgServiceNotSupportedException
+    ///
+    ///\remarks
+    /// Depending on the service type, this method will return instances of the following
+    /// types:
+    /// \li MgServiceType::FeatureService - MgdFeatureService
+    /// \li MgServiceType::ResourceService - MgdResourceService
+    /// \li MgServiceType::DrawingService - MgdDrawingService
+    /// \li MgServiceType::MappingService - MgdMappingService
+    /// \li MgServiceType::RenderingService - MgdRenderingService
+    /// \li MgServiceType::ProfilingService - MgdProfilingService
+    /// \li MgServiceType::TileService - MgdTileService
+    ///
     MgService* CreateService(INT32 serviceType);
 
 INTERNAL_API:

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/SqlReader.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/SqlReader.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/SqlReader.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -5,7 +5,7 @@
 
 class FdoISQLDataReader;
 class MgFeatureConnection;
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
 class MG_DESKTOP_API MgdSqlDataReader : public MgSqlDataReader
 {

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Tile/TileCache.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Tile/TileCache.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Tile/TileCache.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -65,13 +65,13 @@
             MgConfigProperties::DefaultTileServicePropertyImageFormat);
 
         // Only allow GIF, PNG, PNG8 and JPG as tile formats
-        if (format == MgImageFormats::Png || format == MgImageFormats::Png8 || format == MgImageFormats::Jpeg || format == MgImageFormats::Gif)
+        if (format == MgdImageFormats::Png || format == MgdImageFormats::Png8 || format == MgdImageFormats::Jpeg || format == MgdImageFormats::Gif)
         {
             MgTileParameters::tileFormat = format;
         }
         else
         {
-            MgTileParameters::tileFormat = MgImageFormats::Png;
+            MgTileParameters::tileFormat = MgdImageFormats::Png;
         }
     }
 }
@@ -101,11 +101,11 @@
     //     <lockPathname> = <fullPath>/<row>_<column>.lck
     tilePathname += fileName;
     lockPathname = tilePathname;
-    if (MgTileParameters::tileFormat == MgImageFormats::Jpeg)
+    if (MgTileParameters::tileFormat == MgdImageFormats::Jpeg)
     {
         tilePathname += L"jpg";
     }
-    else if (MgTileParameters::tileFormat == MgImageFormats::Gif)
+    else if (MgTileParameters::tileFormat == MgdImageFormats::Gif)
     {
         tilePathname += L"gif";
     }
@@ -139,11 +139,11 @@
     {
         Ptr<MgByteSource> byteSource = new MgByteSource(tilePathname, false);
 
-        if (MgTileParameters::tileFormat == MgImageFormats::Jpeg)
+        if (MgTileParameters::tileFormat == MgdImageFormats::Jpeg)
         {
             byteSource->SetMimeType(MgMimeType::Jpeg);
         }
-        else if (MgTileParameters::tileFormat == MgImageFormats::Gif)
+        else if (MgTileParameters::tileFormat == MgdImageFormats::Gif)
         {
             byteSource->SetMimeType(MgMimeType::Gif);
         }

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/TileService.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/TileService.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/TileService.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -2,7 +2,7 @@
 #define DESKTOP_TILE_SERVICE_H
 
 #include "Tile/TileCache.h"
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Service_Module
 /// \{
 class MG_DESKTOP_API MgdTileService : public MgService
 {

Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Transaction.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Transaction.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Transaction.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -5,7 +5,7 @@
 
 class MgFeatureConnection;
 class FdoITransaction;
-/// \ingroup Desktop_Module
+/// \ingroup Desktop_Misc_Module
 /// \{
 class MG_DESKTOP_API MgdTransaction : public MgTransaction
 {

Modified: branches/2.4/MgDev/Desktop/MgDesktop/System/ClassId.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/System/ClassId.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/System/ClassId.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -23,63 +23,63 @@
 #define MapGuide_Desktop_MapLayer_ZcvController MAPGUIDE_DESKTOP_MAPLAYER_ID+5
 
 // MapGuide Exceptions
-#define MapGuide_Desktop_Exception_MgAuthenticationFailedException              MAPGUIDE_DESKTOP_EXCEPTION_ID+0
-#define MapGuide_Desktop_Exception_MgConnectionFailedException                  MAPGUIDE_DESKTOP_EXCEPTION_ID+1
-#define MapGuide_Desktop_Exception_MgConnectionNotOpenException                 MAPGUIDE_DESKTOP_EXCEPTION_ID+2
-#define MapGuide_Desktop_Exception_MgDbException                                MAPGUIDE_DESKTOP_EXCEPTION_ID+3
-#define MapGuide_Desktop_Exception_MgDbXmlException                             MAPGUIDE_DESKTOP_EXCEPTION_ID+4
-#define MapGuide_Desktop_Exception_MgDuplicateGroupException                    MAPGUIDE_DESKTOP_EXCEPTION_ID+5
-#define MapGuide_Desktop_Exception_MgDuplicateNameException                     MAPGUIDE_DESKTOP_EXCEPTION_ID+6
-#define MapGuide_Desktop_Exception_MgDuplicateParameterException                MAPGUIDE_DESKTOP_EXCEPTION_ID+7
-#define MapGuide_Desktop_Exception_MgDuplicateRepositoryException               MAPGUIDE_DESKTOP_EXCEPTION_ID+8
-#define MapGuide_Desktop_Exception_MgDuplicateRoleException                     MAPGUIDE_DESKTOP_EXCEPTION_ID+9
-#define MapGuide_Desktop_Exception_MgDuplicateServerException                   MAPGUIDE_DESKTOP_EXCEPTION_ID+10
-#define MapGuide_Desktop_Exception_MgDuplicateSessionException                  MAPGUIDE_DESKTOP_EXCEPTION_ID+11
-#define MapGuide_Desktop_Exception_MgDuplicateUserException                     MAPGUIDE_DESKTOP_EXCEPTION_ID+12
-#define MapGuide_Desktop_Exception_MgDwfException                               MAPGUIDE_DESKTOP_EXCEPTION_ID+13
-#define MapGuide_Desktop_Exception_MgDwfSectionNotFoundException                MAPGUIDE_DESKTOP_EXCEPTION_ID+14
-#define MapGuide_Desktop_Exception_MgDwfSectionResourceNotFoundException        MAPGUIDE_DESKTOP_EXCEPTION_ID+15
-#define MapGuide_Desktop_Exception_MgEndOfStreamException                       MAPGUIDE_DESKTOP_EXCEPTION_ID+16
-#define MapGuide_Desktop_Exception_MgEvaluationExpiredException                 MAPGUIDE_DESKTOP_EXCEPTION_ID+17
-#define MapGuide_Desktop_Exception_MgGroupNotFoundException                     MAPGUIDE_DESKTOP_EXCEPTION_ID+18
-#define MapGuide_Desktop_Exception_MgInvalidDwfPackageException                 MAPGUIDE_DESKTOP_EXCEPTION_ID+19
-#define MapGuide_Desktop_Exception_MgInvalidDwfSectionException                 MAPGUIDE_DESKTOP_EXCEPTION_ID+20
-#define MapGuide_Desktop_Exception_MgInvalidFeatureSourceException              MAPGUIDE_DESKTOP_EXCEPTION_ID+21
-#define MapGuide_Desktop_Exception_MgInvalidIpAddressException                  MAPGUIDE_DESKTOP_EXCEPTION_ID+22
-#define MapGuide_Desktop_Exception_MgInvalidLicenseException                    MAPGUIDE_DESKTOP_EXCEPTION_ID+23
-#define MapGuide_Desktop_Exception_MgInvalidLogEntryException                   MAPGUIDE_DESKTOP_EXCEPTION_ID+24
-#define MapGuide_Desktop_Exception_MgInvalidOperationVersionException           MAPGUIDE_DESKTOP_EXCEPTION_ID+25
-#define MapGuide_Desktop_Exception_MgInvalidPasswordException                   MAPGUIDE_DESKTOP_EXCEPTION_ID+26
-#define MapGuide_Desktop_Exception_MgInvalidPrintLayoutFontSizeUnitsException   MAPGUIDE_DESKTOP_EXCEPTION_ID+27
-#define MapGuide_Desktop_Exception_MgInvalidPrintLayoutPositionUnitsException   MAPGUIDE_DESKTOP_EXCEPTION_ID+28
-#define MapGuide_Desktop_Exception_MgInvalidPrintLayoutSizeUnitsException       MAPGUIDE_DESKTOP_EXCEPTION_ID+29
-#define MapGuide_Desktop_Exception_MgInvalidSerialNumberException               MAPGUIDE_DESKTOP_EXCEPTION_ID+30
-#define MapGuide_Desktop_Exception_MgInvalidServerNameException                 MAPGUIDE_DESKTOP_EXCEPTION_ID+31
-#define MapGuide_Desktop_Exception_MgLicenseException                           MAPGUIDE_DESKTOP_EXCEPTION_ID+32
-#define MapGuide_Desktop_Exception_MgLicenseExpiredException                    MAPGUIDE_DESKTOP_EXCEPTION_ID+33
-#define MapGuide_Desktop_Exception_MgLogOpenFailedException                     MAPGUIDE_DESKTOP_EXCEPTION_ID+34
-#define MapGuide_Desktop_Exception_MgOperationProcessingException               MAPGUIDE_DESKTOP_EXCEPTION_ID+35
-#define MapGuide_Desktop_Exception_MgParameterNotFoundException                 MAPGUIDE_DESKTOP_EXCEPTION_ID+36
-#define MapGuide_Desktop_Exception_MgPathTooLongException                       MAPGUIDE_DESKTOP_EXCEPTION_ID+37
-#define MapGuide_Desktop_Exception_MgPermissionDeniedException                  MAPGUIDE_DESKTOP_EXCEPTION_ID+38
-#define MapGuide_Desktop_Exception_MgPortNotAvailableException                  MAPGUIDE_DESKTOP_EXCEPTION_ID+39
-#define MapGuide_Desktop_Exception_MgPrintToScaleModeNotSelectedException       MAPGUIDE_DESKTOP_EXCEPTION_ID+40
-#define MapGuide_Desktop_Exception_MgRepositoryCreationFailedException          MAPGUIDE_DESKTOP_EXCEPTION_ID+41
-#define MapGuide_Desktop_Exception_MgRepositoryNotFoundException                MAPGUIDE_DESKTOP_EXCEPTION_ID+42
-#define MapGuide_Desktop_Exception_MgRepositoryNotOpenException                 MAPGUIDE_DESKTOP_EXCEPTION_ID+43
-#define MapGuide_Desktop_Exception_MgRepositoryOpenFailedException              MAPGUIDE_DESKTOP_EXCEPTION_ID+44
-#define MapGuide_Desktop_Exception_MgRoleNotFoundException                      MAPGUIDE_DESKTOP_EXCEPTION_ID+45
-#define MapGuide_Desktop_Exception_MgServerNotFoundException                    MAPGUIDE_DESKTOP_EXCEPTION_ID+46
-#define MapGuide_Desktop_Exception_MgServerNotOnlineException                   MAPGUIDE_DESKTOP_EXCEPTION_ID+47
-#define MapGuide_Desktop_Exception_MgSessionExpiredException                    MAPGUIDE_DESKTOP_EXCEPTION_ID+48
-#define MapGuide_Desktop_Exception_MgUnauthorizedAccessException                MAPGUIDE_DESKTOP_EXCEPTION_ID+49
-#define MapGuide_Desktop_Exception_MgUriFormatException                         MAPGUIDE_DESKTOP_EXCEPTION_ID+50
-#define MapGuide_Desktop_Exception_MgStylizeLayerFailedException                MAPGUIDE_DESKTOP_EXCEPTION_ID+51
-#define MapGuide_Desktop_Exception_MgSessionNotFoundException                   MAPGUIDE_DESKTOP_EXCEPTION_ID+52
-#define MapGuide_Desktop_Exception_MgUnsupportedProviderThreadModelException    MAPGUIDE_DESKTOP_EXCEPTION_ID+53
-#define MapGuide_Desktop_Exception_MgAllProviderConnectionsUsedException        MAPGUIDE_DESKTOP_EXCEPTION_ID+54
-#define MapGuide_Desktop_Exception_MgRasterTransformationNotSupportedException  MAPGUIDE_DESKTOP_EXCEPTION_ID+55
-#define MapGuide_Desktop_Exception_MgAliasNotFoundException                     MAPGUIDE_DESKTOP_EXCEPTION_ID+56
+#define MapGuide_Desktop_Exception_AuthenticationFailedException              MAPGUIDE_DESKTOP_EXCEPTION_ID+0
+#define MapGuide_Desktop_Exception_ConnectionFailedException                  MAPGUIDE_DESKTOP_EXCEPTION_ID+1
+#define MapGuide_Desktop_Exception_ConnectionNotOpenException                 MAPGUIDE_DESKTOP_EXCEPTION_ID+2
+#define MapGuide_Desktop_Exception_DbException                                MAPGUIDE_DESKTOP_EXCEPTION_ID+3
+#define MapGuide_Desktop_Exception_DbXmlException                             MAPGUIDE_DESKTOP_EXCEPTION_ID+4
+#define MapGuide_Desktop_Exception_DuplicateGroupException                    MAPGUIDE_DESKTOP_EXCEPTION_ID+5
+#define MapGuide_Desktop_Exception_DuplicateNameException                     MAPGUIDE_DESKTOP_EXCEPTION_ID+6
+#define MapGuide_Desktop_Exception_DuplicateParameterException                MAPGUIDE_DESKTOP_EXCEPTION_ID+7
+#define MapGuide_Desktop_Exception_DuplicateRepositoryException               MAPGUIDE_DESKTOP_EXCEPTION_ID+8
+#define MapGuide_Desktop_Exception_DuplicateRoleException                     MAPGUIDE_DESKTOP_EXCEPTION_ID+9
+#define MapGuide_Desktop_Exception_DuplicateServerException                   MAPGUIDE_DESKTOP_EXCEPTION_ID+10
+#define MapGuide_Desktop_Exception_DuplicateSessionException                  MAPGUIDE_DESKTOP_EXCEPTION_ID+11
+#define MapGuide_Desktop_Exception_DuplicateUserException                     MAPGUIDE_DESKTOP_EXCEPTION_ID+12
+#define MapGuide_Desktop_Exception_DwfException                               MAPGUIDE_DESKTOP_EXCEPTION_ID+13
+#define MapGuide_Desktop_Exception_DwfSectionNotFoundException                MAPGUIDE_DESKTOP_EXCEPTION_ID+14
+#define MapGuide_Desktop_Exception_DwfSectionResourceNotFoundException        MAPGUIDE_DESKTOP_EXCEPTION_ID+15
+#define MapGuide_Desktop_Exception_EndOfStreamException                       MAPGUIDE_DESKTOP_EXCEPTION_ID+16
+#define MapGuide_Desktop_Exception_EvaluationExpiredException                 MAPGUIDE_DESKTOP_EXCEPTION_ID+17
+#define MapGuide_Desktop_Exception_GroupNotFoundException                     MAPGUIDE_DESKTOP_EXCEPTION_ID+18
+#define MapGuide_Desktop_Exception_InvalidDwfPackageException                 MAPGUIDE_DESKTOP_EXCEPTION_ID+19
+#define MapGuide_Desktop_Exception_InvalidDwfSectionException                 MAPGUIDE_DESKTOP_EXCEPTION_ID+20
+#define MapGuide_Desktop_Exception_InvalidFeatureSourceException              MAPGUIDE_DESKTOP_EXCEPTION_ID+21
+#define MapGuide_Desktop_Exception_InvalidIpAddressException                  MAPGUIDE_DESKTOP_EXCEPTION_ID+22
+#define MapGuide_Desktop_Exception_InvalidLicenseException                    MAPGUIDE_DESKTOP_EXCEPTION_ID+23
+#define MapGuide_Desktop_Exception_InvalidLogEntryException                   MAPGUIDE_DESKTOP_EXCEPTION_ID+24
+#define MapGuide_Desktop_Exception_InvalidOperationVersionException           MAPGUIDE_DESKTOP_EXCEPTION_ID+25
+#define MapGuide_Desktop_Exception_InvalidPasswordException                   MAPGUIDE_DESKTOP_EXCEPTION_ID+26
+#define MapGuide_Desktop_Exception_InvalidPrintLayoutFontSizeUnitsException   MAPGUIDE_DESKTOP_EXCEPTION_ID+27
+#define MapGuide_Desktop_Exception_InvalidPrintLayoutPositionUnitsException   MAPGUIDE_DESKTOP_EXCEPTION_ID+28
+#define MapGuide_Desktop_Exception_InvalidPrintLayoutSizeUnitsException       MAPGUIDE_DESKTOP_EXCEPTION_ID+29
+#define MapGuide_Desktop_Exception_InvalidSerialNumberException               MAPGUIDE_DESKTOP_EXCEPTION_ID+30
+#define MapGuide_Desktop_Exception_InvalidServerNameException                 MAPGUIDE_DESKTOP_EXCEPTION_ID+31
+#define MapGuide_Desktop_Exception_LicenseException                           MAPGUIDE_DESKTOP_EXCEPTION_ID+32
+#define MapGuide_Desktop_Exception_LicenseExpiredException                    MAPGUIDE_DESKTOP_EXCEPTION_ID+33
+#define MapGuide_Desktop_Exception_LogOpenFailedException                     MAPGUIDE_DESKTOP_EXCEPTION_ID+34
+#define MapGuide_Desktop_Exception_OperationProcessingException               MAPGUIDE_DESKTOP_EXCEPTION_ID+35
+#define MapGuide_Desktop_Exception_ParameterNotFoundException                 MAPGUIDE_DESKTOP_EXCEPTION_ID+36
+#define MapGuide_Desktop_Exception_PathTooLongException                       MAPGUIDE_DESKTOP_EXCEPTION_ID+37
+#define MapGuide_Desktop_Exception_PermissionDeniedException                  MAPGUIDE_DESKTOP_EXCEPTION_ID+38
+#define MapGuide_Desktop_Exception_PortNotAvailableException                  MAPGUIDE_DESKTOP_EXCEPTION_ID+39
+#define MapGuide_Desktop_Exception_PrintToScaleModeNotSelectedException       MAPGUIDE_DESKTOP_EXCEPTION_ID+40
+#define MapGuide_Desktop_Exception_RepositoryCreationFailedException          MAPGUIDE_DESKTOP_EXCEPTION_ID+41
+#define MapGuide_Desktop_Exception_RepositoryNotFoundException                MAPGUIDE_DESKTOP_EXCEPTION_ID+42
+#define MapGuide_Desktop_Exception_RepositoryNotOpenException                 MAPGUIDE_DESKTOP_EXCEPTION_ID+43
+#define MapGuide_Desktop_Exception_RepositoryOpenFailedException              MAPGUIDE_DESKTOP_EXCEPTION_ID+44
+#define MapGuide_Desktop_Exception_RoleNotFoundException                      MAPGUIDE_DESKTOP_EXCEPTION_ID+45
+#define MapGuide_Desktop_Exception_ServerNotFoundException                    MAPGUIDE_DESKTOP_EXCEPTION_ID+46
+#define MapGuide_Desktop_Exception_ServerNotOnlineException                   MAPGUIDE_DESKTOP_EXCEPTION_ID+47
+#define MapGuide_Desktop_Exception_SessionExpiredException                    MAPGUIDE_DESKTOP_EXCEPTION_ID+48
+#define MapGuide_Desktop_Exception_UnauthorizedAccessException                MAPGUIDE_DESKTOP_EXCEPTION_ID+49
+#define MapGuide_Desktop_Exception_UriFormatException                         MAPGUIDE_DESKTOP_EXCEPTION_ID+50
+#define MapGuide_Desktop_Exception_StylizeLayerFailedException                MAPGUIDE_DESKTOP_EXCEPTION_ID+51
+#define MapGuide_Desktop_Exception_SessionNotFoundException                   MAPGUIDE_DESKTOP_EXCEPTION_ID+52
+#define MapGuide_Desktop_Exception_UnsupportedProviderThreadModelException    MAPGUIDE_DESKTOP_EXCEPTION_ID+53
+#define MapGuide_Desktop_Exception_AllProviderConnectionsUsedException        MAPGUIDE_DESKTOP_EXCEPTION_ID+54
+#define MapGuide_Desktop_Exception_RasterTransformationNotSupportedException  MAPGUIDE_DESKTOP_EXCEPTION_ID+55
+#define MapGuide_Desktop_Exception_AliasNotFoundException                     MAPGUIDE_DESKTOP_EXCEPTION_ID+56
 
 
 //Basic Service functionality

Modified: branches/2.4/MgDev/Desktop/MgDesktop/System/PlatformInit.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/System/PlatformInit.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/System/PlatformInit.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -195,7 +195,7 @@
 static bool initStatic = InitializeStaticPlatformData();
 
 #define EXCEPTION_CLASS_CREATOR(className) \
-    fact->Register(MapGuide_Desktop_Exception_##className, className::CreateObject);
+    fact->Register(MapGuide_Desktop_Exception_##className, Mgd##className::CreateObject);
 
 bool InitializeStaticPlatformData()
 {
@@ -206,19 +206,19 @@
     fact->Register(MapGuide_Desktop_MapLayer_Layer, MgdLayer::CreateObject);
     fact->Register(MapGuide_Desktop_MapLayer_Selection, MgdSelection::CreateObject);
 
-    EXCEPTION_CLASS_CREATOR(MgConnectionFailedException)
-    EXCEPTION_CLASS_CREATOR(MgDuplicateParameterException)
-    EXCEPTION_CLASS_CREATOR(MgDwfException)
-    EXCEPTION_CLASS_CREATOR(MgDwfSectionNotFoundException)
-    EXCEPTION_CLASS_CREATOR(MgDwfSectionResourceNotFoundException)
-    EXCEPTION_CLASS_CREATOR(MgInvalidDwfPackageException)
-    EXCEPTION_CLASS_CREATOR(MgInvalidDwfSectionException)
-    EXCEPTION_CLASS_CREATOR(MgInvalidFeatureSourceException)
-    EXCEPTION_CLASS_CREATOR(MgParameterNotFoundException)
-    EXCEPTION_CLASS_CREATOR(MgStylizeLayerFailedException)
-    EXCEPTION_CLASS_CREATOR(MgInvalidPrintLayoutFontSizeUnitsException)
-    EXCEPTION_CLASS_CREATOR(MgInvalidPrintLayoutPositionUnitsException)
-    EXCEPTION_CLASS_CREATOR(MgInvalidPrintLayoutSizeUnitsException)
+    EXCEPTION_CLASS_CREATOR(ConnectionFailedException)
+    EXCEPTION_CLASS_CREATOR(DuplicateParameterException)
+    EXCEPTION_CLASS_CREATOR(DwfException)
+    EXCEPTION_CLASS_CREATOR(DwfSectionNotFoundException)
+    EXCEPTION_CLASS_CREATOR(DwfSectionResourceNotFoundException)
+    EXCEPTION_CLASS_CREATOR(InvalidDwfPackageException)
+    EXCEPTION_CLASS_CREATOR(InvalidDwfSectionException)
+    EXCEPTION_CLASS_CREATOR(InvalidFeatureSourceException)
+    EXCEPTION_CLASS_CREATOR(ParameterNotFoundException)
+    EXCEPTION_CLASS_CREATOR(StylizeLayerFailedException)
+    EXCEPTION_CLASS_CREATOR(InvalidPrintLayoutFontSizeUnitsException)
+    EXCEPTION_CLASS_CREATOR(InvalidPrintLayoutPositionUnitsException)
+    EXCEPTION_CLASS_CREATOR(InvalidPrintLayoutSizeUnitsException)
 
     return true;
 }
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgDesktop/System/PlatformInit.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/System/PlatformInit.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/MgDesktop/System/PlatformInit.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,15 +1,46 @@
 #ifndef DESKTOP_PLATFORM_INIT_H
 #define DESKTOP_PLATFORM_INIT_H
 
+/// \ingroup Desktop_Module
+/// \{
+
+///\brief
+/// A static utility class that provides the means for initializing and tearing down
+/// the MapGuide Platform. You must initialize the platform before you can use any
+/// service classes or the Coordinate System API.
 class MG_DESKTOP_API MgPlatform
 {
 PUBLISHED_API:
+    ///////////////////////////////////////////////////////////////////////////////
+    ///\brief
+    /// Gets whether the the MapGuide Desktop Platform has been initialized. You
+    /// cannot use most MapGuide service classes until the platform has been
+    /// initialized. Call MgPlatform::Initialize(CREFSTRING) to initialize the
+    /// platform.
+    ///
+    ///\return
+    /// true if the platform has been initialized.
     static bool IsInitialized();
+
+    ///////////////////////////////////////////////////////////////////////////////
+    ///\brief
+    /// Initializes the MapGuide Desktop Platform. This must be called at least 
+    /// once before using any service classes in the MapGuide API. Subsequent calls
+    /// will do nothing.
+    ///
+    ///\param configFile (String/string)
+    /// The path to the MapGuide Desktop Platform configuration file (Platform.ini)
     static void Initialize(CREFSTRING configFile);
+
+    ///////////////////////////////////////////////////////////////////////////////
+    ///\brief
+    /// Performs cleanup of the MapGuide Desktop Platform. This should be called
+    /// as part of your application's cleanup or exit routine. You should not use
+    /// any other classes in the MapGuide API after completing this call.
     static void Terminate();
 
 private:
     static bool sm_init;
 };
-
+/// \}
 #endif
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/UnitTest/TestMappingService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/UnitTest/TestMappingService.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/UnitTest/TestMappingService.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -223,33 +223,33 @@
         map4->SetViewScale(20e+6);
 
         // Create the DwfVersion
-        Ptr<MgDwfVersion> version = new MgDwfVersion();
+        Ptr<MgdDwfVersion> version = new MgdDwfVersion();
 
         // Create some plotSpecs
-        Ptr<MgPlotSpecification> plotSpec1 = new MgPlotSpecification(8.5f, 11.f, L"in", 0.5, 0.5, 0.5, 0.5);
-        Ptr<MgPlotSpecification> plotSpec2 = new MgPlotSpecification(11.f, 8.5f, L"in", 1, 1, 1, 1);
-        Ptr<MgPlotSpecification> plotSpec3 = new MgPlotSpecification(8.f, 11.f, L"in", 0.25, 0.25, 0.25, 0.25);
-        Ptr<MgPlotSpecification> plotSpec4 = new MgPlotSpecification(8.5f, 11.f, L"in", 0.25, 0.25, 0.25, 0.25);
+        Ptr<MgdPlotSpecification> plotSpec1 = new MgdPlotSpecification(8.5f, 11.f, L"in", 0.5, 0.5, 0.5, 0.5);
+        Ptr<MgdPlotSpecification> plotSpec2 = new MgdPlotSpecification(11.f, 8.5f, L"in", 1, 1, 1, 1);
+        Ptr<MgdPlotSpecification> plotSpec3 = new MgdPlotSpecification(8.f, 11.f, L"in", 0.25, 0.25, 0.25, 0.25);
+        Ptr<MgdPlotSpecification> plotSpec4 = new MgdPlotSpecification(8.5f, 11.f, L"in", 0.25, 0.25, 0.25, 0.25);
 
         Ptr<MgResourceIdentifier> allElementsLayout = new MgResourceIdentifier(L"Library://UnitTests/PrintLayouts/AllElements.PrintLayout");
-        Ptr<MgLayout> layout = new MgLayout(allElementsLayout, L"Layout1", MgUnitType::USEnglish);
+        Ptr<MgdLayout> layout = new MgdLayout(allElementsLayout, L"Layout1", MgdUnitType::USEnglish);
 
         // Create some MapPlots
-        Ptr<MgMapPlot> mapPlot1 = new MgMapPlot(map1, plotSpec1, layout);
+        Ptr<MgdMapPlot> mapPlot1 = new MgdMapPlot(map1, plotSpec1, layout);
 
         Ptr<MgCoordinate> center = new MgCoordinateXY(-100, 40);
         double scale = 50e+6;
-        Ptr<MgMapPlot> mapPlot2 = new MgMapPlot(map2, center, scale, plotSpec2, layout);
+        Ptr<MgdMapPlot> mapPlot2 = new MgdMapPlot(map2, center, scale, plotSpec2, layout);
 
         Ptr<MgCoordinate> ll = new MgCoordinateXY(-130, 45);
         Ptr<MgCoordinate> ur = new MgCoordinateXY(-100, 60);
         Ptr<MgEnvelope> extent = new MgEnvelope(ll, ur);
-        Ptr<MgMapPlot> mapPlot3 = new MgMapPlot(map3, extent, false, plotSpec3, layout);
+        Ptr<MgdMapPlot> mapPlot3 = new MgdMapPlot(map3, extent, false, plotSpec3, layout);
 
-        Ptr<MgMapPlot> mapPlot4 = new MgMapPlot(map4, extent, true, plotSpec4, layout);
+        Ptr<MgdMapPlot> mapPlot4 = new MgdMapPlot(map4, extent, true, plotSpec4, layout);
 
         // Setup the MapPlot collection
-        Ptr<MgMapPlotCollection> mapPlots = new MgMapPlotCollection();
+        Ptr<MgdMapPlotCollection> mapPlots = new MgdMapPlotCollection();
         mapPlots->Add(mapPlot1);
         mapPlots->Add(mapPlot2);
         mapPlots->Add(mapPlot3);
@@ -287,17 +287,17 @@
         Ptr<MgdMap> map1 = new MgdMap(mapRes1, L"UnitTestSheboygan1");
         map1->SetViewScale(400e+6);
 
-        Ptr<MgDwfVersion> version = new MgDwfVersion();
+        Ptr<MgdDwfVersion> version = new MgdDwfVersion();
 
         Ptr<MgResourceIdentifier> allElementsLayout = new MgResourceIdentifier(L"Library://UnitTests/PrintLayouts/AllElements.PrintLayout");
 
-        Ptr<MgPlotSpecification> plotSpec = new MgPlotSpecification(8.5f, 11.f, L"inches", .5, .5, .5, .5);
+        Ptr<MgdPlotSpecification> plotSpec = new MgdPlotSpecification(8.5f, 11.f, L"inches", .5, .5, .5, .5);
         Ptr<MgCoordinate> center = new MgCoordinateXY(-120, 40);
         double scale = 20e+6;
         Ptr<MgCoordinate> ll = new MgCoordinateXY(-180, 0);
         Ptr<MgCoordinate> ur = new MgCoordinateXY(0, 90);
         MgEnvelope extents(ll, ur);
-        Ptr<MgLayout> layout = new MgLayout(allElementsLayout, L"TestTitle", MgUnitType::USEnglish);
+        Ptr<MgdLayout> layout = new MgdLayout(allElementsLayout, L"TestTitle", MgdUnitType::USEnglish);
 
         // call the API
         Ptr<MgByteReader> eplot = m_svcMapping->GeneratePlot(map1, plotSpec, NULL, version);
@@ -332,17 +332,17 @@
         Ptr<MgdMap> map1 = new MgdMap(mapRes1, L"UnitTestSheboygan1");
         map1->SetViewScale(400e+6);
 
-        Ptr<MgDwfVersion> version = new MgDwfVersion();
+        Ptr<MgdDwfVersion> version = new MgdDwfVersion();
 
         Ptr<MgResourceIdentifier> allElementsLayout = new MgResourceIdentifier(L"Library://UnitTests/PrintLayouts/AllElements.PrintLayout");
 
-        Ptr<MgPlotSpecification> plotSpec = new MgPlotSpecification(8.f, 11.f, L"inches", .5, .5, .5, .5);
+        Ptr<MgdPlotSpecification> plotSpec = new MgdPlotSpecification(8.f, 11.f, L"inches", .5, .5, .5, .5);
         Ptr<MgCoordinate> center = new MgCoordinateXY(-120, 40);
         double scale = 20e+6;
         Ptr<MgCoordinate> ll = new MgCoordinateXY(-180, 0);
         Ptr<MgCoordinate> ur = new MgCoordinateXY(0, 90);
         MgEnvelope extents(ll, ur);
-        Ptr<MgLayout> layout = new MgLayout(allElementsLayout, L"TestTitle", MgUnitType::USEnglish);
+        Ptr<MgdLayout> layout = new MgdLayout(allElementsLayout, L"TestTitle", MgdUnitType::USEnglish);
 
         // call the API
         Ptr<MgByteReader> eplot = m_svcMapping->GeneratePlot(map1, center, scale, plotSpec, layout, version);
@@ -376,17 +376,17 @@
         Ptr<MgdMap> map1 = new MgdMap(mapRes1, L"UnitTestSheboygan1");
         map1->SetViewScale(400e+6);
 
-        Ptr<MgDwfVersion> version = new MgDwfVersion();
+        Ptr<MgdDwfVersion> version = new MgdDwfVersion();
 
         Ptr<MgResourceIdentifier> allElementsLayout = new MgResourceIdentifier(L"Library://UnitTests/PrintLayouts/AllElements.PrintLayout");
 
-        Ptr<MgPlotSpecification> plotSpec = new MgPlotSpecification(11.f, 8.5f, L"inches", .5, .5, .5, .5);
+        Ptr<MgdPlotSpecification> plotSpec = new MgdPlotSpecification(11.f, 8.5f, L"inches", .5, .5, .5, .5);
         Ptr<MgCoordinate> center = new MgCoordinateXY(-120, 40);
         double scale = 20e+6;
         Ptr<MgCoordinate> ll = new MgCoordinateXY(-180, 0);
         Ptr<MgCoordinate> ur = new MgCoordinateXY(0, 90);
         Ptr<MgEnvelope> extents = new MgEnvelope(ll, ur);
-        Ptr<MgLayout> layout = new MgLayout(allElementsLayout, L"TestTitle", MgUnitType::USEnglish);
+        Ptr<MgdLayout> layout = new MgdLayout(allElementsLayout, L"TestTitle", MgdUnitType::USEnglish);
 
         // call the API
         Ptr<MgByteReader> eplot = m_svcMapping->GeneratePlot(map1, extents, false, plotSpec, layout, version);
@@ -420,17 +420,17 @@
         Ptr<MgdMap> map1 = new MgdMap(mapRes1, L"UnitTestSheboygan1");
         map1->SetViewScale(400e+6);
 
-        Ptr<MgDwfVersion> version = new MgDwfVersion();
+        Ptr<MgdDwfVersion> version = new MgdDwfVersion();
 
         Ptr<MgResourceIdentifier> allElementsLayout = new MgResourceIdentifier(L"Library://UnitTests/PrintLayouts/AllElements.PrintLayout");
 
-        Ptr<MgPlotSpecification> plotSpec = new MgPlotSpecification(8.f, 11.f, L"inches", .5, .5, .5, .5);
+        Ptr<MgdPlotSpecification> plotSpec = new MgdPlotSpecification(8.f, 11.f, L"inches", .5, .5, .5, .5);
         Ptr<MgCoordinate> center = new MgCoordinateXY(-120, 40);
         double scale = 20e+6;
         Ptr<MgCoordinate> ll = new MgCoordinateXY(-180, 0);
         Ptr<MgCoordinate> ur = new MgCoordinateXY(0, 90);
         Ptr<MgEnvelope> extents = new MgEnvelope(ll, ur);
-        Ptr<MgLayout> layout = new MgLayout(allElementsLayout, L"TestTitle", MgUnitType::USEnglish);
+        Ptr<MgdLayout> layout = new MgdLayout(allElementsLayout, L"TestTitle", MgdUnitType::USEnglish);
 
         // call the API
         Ptr<MgByteReader> eplot = m_svcMapping->GeneratePlot(map1, extents, true, plotSpec, NULL, version);

Modified: branches/2.4/MgDev/Desktop/UnitTest/TestProfilingService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/UnitTest/TestProfilingService.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/UnitTest/TestProfilingService.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -427,7 +427,7 @@
         Ptr<MgdSelection> selectionOnMapWithWatermark = CreateSelection(mapWithWatermark);
 
         // make a rendering option
-        Ptr<MgRenderingOptions> options = new MgRenderingOptions(L"PNG",MgRenderingOptions::RenderSelection| MgRenderingOptions::RenderLayers| MgRenderingOptions::KeepSelection,NULL);
+        Ptr<MgdRenderingOptions> options = new MgdRenderingOptions(L"PNG",MgdRenderingOptions::RenderSelection| MgdRenderingOptions::RenderLayers| MgdRenderingOptions::KeepSelection,NULL);
         
         // profile rendering normal map
         Ptr<MgByteReader> rdr1 = m_svcProfiling->ProfileRenderDynamicOverlay(map, NULL, options);
@@ -471,7 +471,7 @@
         Ptr<MgdSelection> selectionOnMapWithWatermark = CreateSelection(mapWithWatermark);
 
         // make a rendering option
-        Ptr<MgRenderingOptions> options = new MgRenderingOptions(L"PNG",MgRenderingOptions::RenderSelection| MgRenderingOptions::RenderLayers| MgRenderingOptions::KeepSelection,NULL);
+        Ptr<MgdRenderingOptions> options = new MgdRenderingOptions(L"PNG",MgdRenderingOptions::RenderSelection| MgdRenderingOptions::RenderLayers| MgdRenderingOptions::KeepSelection,NULL);
 
         Ptr<MgCoordinate> coordNewCenter = new MgCoordinateXY(-87.733253, 43.746199);
         Ptr<MgColor> bgc = new MgColor(255, 255, 255, 255);

Modified: branches/2.4/MgDev/Desktop/UnitTest/TestResourceService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/UnitTest/TestResourceService.cpp	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Desktop/UnitTest/TestResourceService.cpp	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1083,12 +1083,12 @@
         }
 
         // Try to enumerate mappings
-        Ptr<MgByteReader> byteReader0 = pService->EnumerateUnmanagedData(L"", false, MgUnmanagedDataType::Folders, L"");
+        Ptr<MgByteReader> byteReader0 = pService->EnumerateUnmanagedData(L"", false, MgdUnmanagedDataType::Folders, L"");
         STRING mimeType0 = byteReader0->GetMimeType();
         CPPUNIT_ASSERT(wcscmp(mimeType0.c_str(), MgMimeType::Xml.c_str()) == 0);
 
         // Enumerate all unmanaged data files
-        Ptr<MgByteReader> byteReader1 = pService->EnumerateUnmanagedData(L"", true, MgUnmanagedDataType::Files, L"");
+        Ptr<MgByteReader> byteReader1 = pService->EnumerateUnmanagedData(L"", true, MgdUnmanagedDataType::Files, L"");
         STRING mimeType1 = byteReader1->GetMimeType();
         CPPUNIT_ASSERT(wcscmp(mimeType1.c_str(), MgMimeType::Xml.c_str()) == 0);
     }

Modified: branches/2.4/MgDev/Doc/MgDesktop_Doxyfile
===================================================================
--- branches/2.4/MgDev/Doc/MgDesktop_Doxyfile	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Doc/MgDesktop_Doxyfile	2012-08-30 13:31:03 UTC (rev 6963)
@@ -105,7 +105,7 @@
                          ../Common/Foundation \
                          ../Common/Geometry \
                          ../Common/PlatformBase \
-                         ../Desktop/MgDesktop 
+                         ../Desktop/MgDesktop
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.h
 RECURSIVE              = YES
@@ -171,6 +171,35 @@
                          */Data/Vector3D.h \
                          */Data/Margin.h \
                          */Data/SerializableCollection.h \
+                         */Log \
+                         */Services/Feature/Commands \
+                         */Services/Drawing \
+                         */Services/Resource \
+                         */Services/Feature/Fdo* \
+                         */Services/Feature/Feature* \
+                         */Services/Feature/Gws* \
+                         */Services/Feature/GeometryDataReaderCreator.h \
+                         */Services/Feature/Int16DataReaderCreator.h \
+                         */Services/Feature/Int32DataReaderCreator.h \
+                         */Services/Feature/Int64DataReaderCreator.h \
+                         */Services/Feature/JoinFeatureReader.h \
+                         */Services/Feature/Matrix.h \
+                         */Services/Feature/MgCSTrans.h \
+                         */Services/Feature/ProjectedFeatureReader.h \
+                         */Services/Feature/SingleDataReaderCreator.h \
+                         */Services/Feature/SpatialContextCacheItem.h \
+                         */Services/Feature/StringDataReaderCreator.h \
+                         */Services/Feature/RasterHelper.h \
+                         */Services/Feature/TransformCache.h \
+                         */Services/Feature/UniqueFunction.h \
+                         */Services/Rendering/RSMg* \
+                         */Services/Rendering/LegendPlotUtil.h \
+                         */Services/Rendering/MappingUtil.h \
+                         */Services/Stylization \
+                         */Services/Tile \
+                         */System/Mutex.h \
+                         */System/ThreadBase.h \
+                         */System/TimerUtil.h \
                          */.svn
 EXCLUDE_SYMBOLS        =
 EXAMPLE_PATH           = headers_and_footers

Modified: branches/2.4/MgDev/Doc/external_topics/Desktop_Introduction.h
===================================================================
--- branches/2.4/MgDev/Doc/external_topics/Desktop_Introduction.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Doc/external_topics/Desktop_Introduction.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -1,7 +1,34 @@
 /**
+\if DESKTOPAPI
 \addtogroup Desktop_Module
 <p>
-	The Resource Service enables you to manipulate repositories
-	and resources.
+	The Desktop Platform enables you work with the classes in the MapGuide API through desktop-specific subclasses
 </p>
+<p>
+	<strong>Note:</strong> With the exception of MgServiceFactory and MgPlatform, all classes in the Desktop Platform are prefixed 
+	with "Mgd" instead of "Mg" to distinguish them from the MapGuide core classes that most of these extend from. This
+	is done to avoid the potential naming collisions of classes if you are developing applications that use both the
+	official MapGuide API and mg-desktop.
+</p>
+<p>
+	Any such classes can be up-casted to their "Mg" counterparts and can be used with any method that takes an "Mg" class.
+</p>
+<p>Some examples of Desktop Platform classes that extend their MapGuide core counterparts</p>
+<ul>
+	<li>MgdFeatureService -> MgFeatureService</li>
+	<li>MgdResourceService -> MgResourceService</li>
+	<li>MgdMap -> MgMapBase</li>
+	<li>MgdLayer -> MgLayerBase</li>
+	<li>MgdSelection -> MgSelectionBase</li>
+</ul>
+<p>
+	<strong>Note:</strong> If you are using the Desktop Platform classes in conjunction with the official MapGuide API clases,
+	you cannot cast Desktop classes to their MapGuide counterparts or vice versa. For example, such casts are not allowed:
+</p>
+<ul>
+	<li>MgdMap <-> MgMap</li>
+	<li>MgdLayer <-> MgLayer</li>
+	<li>MgdSelection <-> MgSelection</li>
+</ul>
+\endif
 **/

Modified: branches/2.4/MgDev/Doc/group_and_page_definitions/define_groups.h
===================================================================
--- branches/2.4/MgDev/Doc/group_and_page_definitions/define_groups.h	2012-08-29 18:20:32 UTC (rev 6962)
+++ branches/2.4/MgDev/Doc/group_and_page_definitions/define_groups.h	2012-08-30 13:31:03 UTC (rev 6963)
@@ -2,6 +2,22 @@
 	\if DESKTOPAPI
 	<!-- ------------ DESKTOP PLATFORM -------------- -->
 	\defgroup Desktop_Module Desktop Platform
+
+	<!-- ------------ DESKTOP SERVICES ------------ -->
+	\defgroup Desktop_Service_Module Desktop Services
+	\ingroup Desktop_Module
+
+	<!-- ------------ DESKTOP MAPS AND LAYERS ------------ -->
+	\defgroup Desktop_Map_and_Layers_Module Desktop Maps and Layers
+	\ingroup Desktop_Module
+
+	<!-- ------------ DESKTOP EXCEPTIONS ------------ -->
+	\defgroup Desktop_Exceptions_Module Desktop Exceptions
+	\ingroup Desktop_Module
+
+	<!-- ------------ DESKTOP EXCEPTIONS ------------ -->
+	\defgroup Desktop_Misc_Module Desktop Misc Classes
+	\ingroup Desktop_Module
 	\endif
 
 	<!-- ------------ MAPS AND LAYERS------------- -->



More information about the mapguide-commits mailing list