[mapguide-commits] r4507 - in trunk/MgDev: Common/CoordinateSystem Common/Foundation Common/Foundation/System Common/Geometry Common/Geometry/CoordinateSystem Common/Geometry/GeometryConsoleTest Common/Geometry/Spatial Common/MapGuideCommon Common/MapGuideCommon/MapLayer Common/MapGuideCommon/Resources Common/MapGuideCommon/Services Common/MapGuideCommon/System Common/MdfModel/PrintLayout Common/MdfParser/Common Common/MdfParser/PrintLayout Common/PlatformBase Common/PlatformBase/Exception Common/PlatformBase/MapLayer Common/PlatformBase/Services Common/PlatformBase/Services/PrintLayoutService Common/Renderers Common/Schema Server/RepositoryAdmin Server/src/Common/Manager Server/src/Core Server/src/Gws/GwsQueryEngine Server/src/Gws/GwsResource Server/src/Services/Feature Server/src/Services/Mapping Server/src/Services/Resource Server/src/UnitTesting Server/src/Wfs Server/src/Wms UnitTest/Common/DotNetWrappers UnitTest/Common/FoundationTest/DotNetApi Web/src/ApacheAgent Web/src/CgiAgent Web/src/DotNetUnmanagedApi/Geometry Web/src/DotNetUnmanagedApi/MapGuideCommon Web/src/DotNetUnmanagedApi/PlatformBase Web/src/DotNetUnmanagedApi/Web Web/src/HttpHandler Web/src/JavaApi/org/osgeo/mapguide Web/src/WebApp Web/src/localized/help/en/style Web/src/mapviewerjava Web/src/mapviewernet Web/src/mapviewerphp Web/src/mapviewerphp/templates Web/src/schemareport Web/src/viewerfiles

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Sat Jan 9 03:30:47 EST 2010


Author: waltweltonlair
Date: 2010-01-09 03:30:45 -0500 (Sat, 09 Jan 2010)
New Revision: 4507

Modified:
   trunk/MgDev/Common/CoordinateSystem/CoordSys.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysDatumDictionary.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysGridGeneric.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysGrids.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysGrids.h
   trunk/MgDev/Common/CoordinateSystem/CoordSysMathComparator.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysMgrs.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysMgrsMajorRegion.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysMgrsZone.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysOneGrid.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysUtil.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysUtil.h
   trunk/MgDev/Common/CoordinateSystem/namestruct.h
   trunk/MgDev/Common/Foundation/Makefile.am
   trunk/MgDev/Common/Foundation/System/FileUtil.cpp
   trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp
   trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.h
   trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGrids.h
   trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemMgrs.h
   trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridLevel.h
   trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h
   trunk/MgDev/Common/Geometry/CoordinateSystemMgrs.h
   trunk/MgDev/Common/Geometry/GeometryConsoleTest/GeometryConsoleTest.cpp
   trunk/MgDev/Common/Geometry/GeometryConsoleTest/targetver.h
   trunk/MgDev/Common/Geometry/Spatial/MathUtility.cpp
   trunk/MgDev/Common/Geometry/Spatial/MathUtility.h
   trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp
   trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.h
   trunk/MgDev/Common/MapGuideCommon/Makefile.am
   trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.cpp
   trunk/MgDev/Common/MapGuideCommon/Resources/mapguide_en.res
   trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureReader.h
   trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.cpp
   trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.h
   trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureTransaction.h
   trunk/MgDev/Common/MapGuideCommon/Services/ProxyResourceService.h
   trunk/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.cpp
   trunk/MgDev/Common/MapGuideCommon/Services/SiteManager.cpp
   trunk/MgDev/Common/MapGuideCommon/Services/SqlResult.h
   trunk/MgDev/Common/MapGuideCommon/System/UserInformation.cpp
   trunk/MgDev/Common/MdfModel/PrintLayout/DataConfiguration.h
   trunk/MgDev/Common/MdfModel/PrintLayout/PrintLayoutElement.h
   trunk/MgDev/Common/MdfModel/PrintLayout/PropertyMapping.h
   trunk/MgDev/Common/MdfParser/Common/IOExtent3D.cpp
   trunk/MgDev/Common/MdfParser/Common/IOStringObjectCollection.cpp
   trunk/MgDev/Common/MdfParser/PrintLayout/IOMapView.cpp
   trunk/MgDev/Common/MdfParser/PrintLayout/IOMapViewportDefinition.cpp
   trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutDefinition.cpp
   trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementCollection.cpp
   trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementDefinition.cpp
   trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementStyle.cpp
   trunk/MgDev/Common/PlatformBase/Exception/FdoException.cpp
   trunk/MgDev/Common/PlatformBase/Makefile.am
   trunk/MgDev/Common/PlatformBase/MapLayer/LayerBase.cpp
   trunk/MgDev/Common/PlatformBase/Services/FeatureDefs.h
   trunk/MgDev/Common/PlatformBase/Services/FeatureQueryOptions.cpp
   trunk/MgDev/Common/PlatformBase/Services/FeatureQueryOptions.h
   trunk/MgDev/Common/PlatformBase/Services/FeatureReader.h
   trunk/MgDev/Common/PlatformBase/Services/FeatureService.h
   trunk/MgDev/Common/PlatformBase/Services/Parameter.cpp
   trunk/MgDev/Common/PlatformBase/Services/Parameter.h
   trunk/MgDev/Common/PlatformBase/Services/ParameterCollection.h
   trunk/MgDev/Common/PlatformBase/Services/ParameterDirection.h
   trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/MapViewportBase.cpp
   trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutBase.cpp
   trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.cpp
   trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.h
   trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.cpp
   trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.h
   trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PropertyMapping.h
   trunk/MgDev/Common/PlatformBase/Services/RasterPropertyDefinition.h
   trunk/MgDev/Common/PlatformBase/Services/ResourceService.h
   trunk/MgDev/Common/Renderers/AGGImageIO.cpp
   trunk/MgDev/Common/Schema/ApplicationDefinition-1.0.0.xsd
   trunk/MgDev/Common/Schema/FdoProviderCapabilities-1.0.0.xsd
   trunk/MgDev/Common/Schema/FdoProviderCapabilities-1.1.0.xsd
   trunk/MgDev/Server/RepositoryAdmin/license.txt
   trunk/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp
   trunk/MgDev/Server/src/Common/Manager/Makefile.am
   trunk/MgDev/Server/src/Core/Makefile.am
   trunk/MgDev/Server/src/Core/serverconfig.ini
   trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFlatFdoReader.cpp
   trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsMultiSelectIterator.cpp
   trunk/MgDev/Server/src/Gws/GwsQueryEngine/Makefile.am
   trunk/MgDev/Server/src/Gws/GwsResource/Makefile.am
   trunk/MgDev/Server/src/Services/Feature/JoinFeatureReader.h
   trunk/MgDev/Server/src/Services/Feature/Makefile.am
   trunk/MgDev/Server/src/Services/Feature/ServerCreateFeatureSource.cpp
   trunk/MgDev/Server/src/Services/Feature/ServerFdoFeatureReader.cpp
   trunk/MgDev/Server/src/Services/Feature/ServerFdoFeatureReader.h
   trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp
   trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.h
   trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransaction.cpp
   trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransaction.h
   trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransactionPool.cpp
   trunk/MgDev/Server/src/Services/Feature/ServerGetSpatialContexts.cpp
   trunk/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.h
   trunk/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp
   trunk/MgDev/Server/src/Services/Feature/ServerSqlCommand.cpp
   trunk/MgDev/Server/src/Services/Feature/ServerSqlCommand.h
   trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
   trunk/MgDev/Server/src/Services/Resource/ApplicationRepositoryManager.cpp
   trunk/MgDev/Server/src/Services/Resource/ApplicationResourceContentManager.cpp
   trunk/MgDev/Server/src/Services/Resource/OpGetResourceContents.cpp
   trunk/MgDev/Server/src/Services/Resource/ServerResourceService.cpp
   trunk/MgDev/Server/src/UnitTesting/TestKmlService.cpp
   trunk/MgDev/Server/src/UnitTesting/TestResourceService.cpp
   trunk/MgDev/Server/src/Wfs/1.0.0.xml.awd
   trunk/MgDev/Server/src/Wfs/1.1.0.xml.awd
   trunk/MgDev/Server/src/Wfs/OgcWfsService.config.awd
   trunk/MgDev/Server/src/Wms/1.0.0.xml.awd
   trunk/MgDev/Server/src/Wms/1.1.0.xml.awd
   trunk/MgDev/Server/src/Wms/1.1.1.xml.awd
   trunk/MgDev/Server/src/Wms/OgcWmsService.config.awd
   trunk/MgDev/Server/src/Wms/REGRESS.xml.awd
   trunk/MgDev/UnitTest/Common/DotNetWrappers/DotNetWrappers.csproj
   trunk/MgDev/UnitTest/Common/FoundationTest/DotNetApi/Makefile
   trunk/MgDev/Web/src/ApacheAgent/Makefile.am
   trunk/MgDev/Web/src/CgiAgent/Makefile.am
   trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml
   trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApiGen.xml
   trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml
   trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApiGen.xml
   trunk/MgDev/Web/src/HttpHandler/Makefile.am
   trunk/MgDev/Web/src/JavaApi/org/osgeo/mapguide/MgBase64.java
   trunk/MgDev/Web/src/WebApp/Makefile.am
   trunk/MgDev/Web/src/localized/help/en/style/cpm.css
   trunk/MgDev/Web/src/mapviewerjava/legend.jsp
   trunk/MgDev/Web/src/mapviewerjava/measure.jsp
   trunk/MgDev/Web/src/mapviewernet/measure.aspx
   trunk/MgDev/Web/src/mapviewerphp/measure.php
   trunk/MgDev/Web/src/mapviewerphp/templates/1.0.0.xml
   trunk/MgDev/Web/src/mapviewerphp/templates/1.1.0.xml
   trunk/MgDev/Web/src/mapviewerphp/templates/1.1.1.xml
   trunk/MgDev/Web/src/mapviewerphp/templates/regress.xml
   trunk/MgDev/Web/src/schemareport/displayschema.xsl
   trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
   trunk/MgDev/Web/src/viewerfiles/bufferui.templ
   trunk/MgDev/Web/src/viewerfiles/dwfmappane.templ
   trunk/MgDev/Web/src/viewerfiles/legendui.templ
   trunk/MgDev/Web/src/viewerfiles/mainframe.templ
   trunk/MgDev/Web/src/viewerfiles/sarissa.js
   trunk/MgDev/Web/src/viewerfiles/statusbar.templ
Log:
Tab/whitespace cleanup


Modified: trunk/MgDev/Common/CoordinateSystem/CoordSys.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSys.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSys.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -43,8 +43,8 @@
 extern "C"
 {
     extern double cs_Km360;
-    extern double cs_One;				/* 1.0                */
-    extern double cs_Two_pi;		    /* 2 pi */
+    extern double cs_One;               /* 1.0                */
+    extern double cs_Two_pi;            /* 2 pi */
 }
 
 using namespace CSLibrary;
@@ -153,7 +153,7 @@
 
         //We've got a datum object.  Complete the initialization.
         return SetDatumDefinition(dynamic_cast<MgCoordinateSystemDatum*>(pDatum.p));
-    }	//if it's geodetic
+    }   //if it's geodetic
     else
     {
         //It's cartographic.  We need an ellipsoid definition.
@@ -175,7 +175,7 @@
 
         //We've got the ellipsoid definition.  Complete the initialization.
         return SetEllipsoidDefinition(dynamic_cast<MgCoordinateSystemEllipsoid*>(pEllipsoid.p));
-    }	//if it's cartographic
+    }   //if it's cartographic
 
     MG_CATCH(L"MgCoordinateSystem.InitFromCatalog")
     if (mgException != NULL)
@@ -1447,7 +1447,7 @@
 
         //Check to see if the datum is there
         bIsUsable = pDtDict->Has(strDt);
-    }	//if it's geodetic
+    }   //if it's geodetic
     else
     {
         //It's cartographic (not geodetic), so make sure
@@ -1471,7 +1471,7 @@
 
         //Check to see if the ellipsoid is there
         bIsUsable = pElDict->Has(pStrEl);
-    }	//if it's cartographic
+    }   //if it's cartographic
 
     MG_CATCH_AND_THROW(L"MgCoordinateSystem.IsUsable")
 
@@ -1498,7 +1498,7 @@
     MgCoordinateSystem* pCsDef=dynamic_cast<MgCoordinateSystem*>(pDef);
     if (!pCsDef)
     {
-        return false;	//not a coordsys def!
+        return false;   //not a coordsys def!
     }
 
     //Build a Mentor struct from the other datum interface
@@ -3061,7 +3061,7 @@
             //Set it to zero.
             pdParms[i] = 0.0;
         }
-    }	//for each of the knCsNumParams parameters
+    }   //for each of the knCsNumParams parameters
 }
 
 //-------------------- Private member functions ---------------------

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysDatumDictionary.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysDatumDictionary.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysDatumDictionary.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -25,7 +25,7 @@
 #include "CoordSysDatumDictionary.h"    //for CCoordinateSystemDatumDictionary
 
 #include "CoordSysUtil.h"               //for Convert_Wide_To_Ascii
-#include "MentorUtil.h"		            //for OpenDictionaryFile()
+#include "MentorUtil.h"                 //for OpenDictionaryFile()
 #include "MentorDictionary.h"
 #include "cs_map.h"
 

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGridGeneric.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGridGeneric.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGridGeneric.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -151,7 +151,7 @@
 INT32 CCoordinateSystemGridGeneric::ApproxGridRegionMemoryUsage (MgCoordinateSystemGridSpecification* specification)
 {
     INT32 memoryUse;
-    
+
     memoryUse = (m_FrameBoundary != 0) ? 0 : -1;
     return memoryUse;
 }

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGrids.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGrids.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGrids.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -141,14 +141,14 @@
 bool CCoordinateSystemGridSpecification::IsSameAs(MgCoordinateSystemGridSpecification* specification)
 {
     bool areTheSame (false);
-    
+
     double dblTol (1.0E-04);
-    
+
     areTheSame  = fabs (specification->GetEastingBase()       - m_EastingBase)       < dblTol;
     areTheSame &= fabs (specification->GetNorthingBase()      - m_NorthingBase)      < dblTol;
     areTheSame &= fabs (specification->GetEastingIncrement()  - m_EastingIncrement)  < dblTol;
     areTheSame &= fabs (specification->GetNorthingIncrement() - m_NorthingIncrement) < dblTol;
-    
+
     areTheSame &= fabs (specification->GetTickEastingIncrement()  - m_TickEastingIncrement)  < dblTol;
     areTheSame &= fabs (specification->GetTickNorthingIncrement() - m_TickNorthingIncrement) < dblTol;
 
@@ -348,7 +348,7 @@
     MgCoordinateSystemFactory csFactory;
     Ptr<MgCoordinateSystemCatalog> catalogPtr = csFactory.GetCatalog ();
     Ptr<MgCoordinateSystemUnitInformation> unitInfoPtr = catalogPtr->GetUnitInformation ();
-    
+
     // Verify that the unit type of the specification match the unit type
     // to which we are to convert.
     GetUnitInfo(trgUnitCode,&trgUnitType,NULL);
@@ -426,7 +426,7 @@
         nePnt = factory.CreateCoordinateXY(northeast->GetX(),northeast->GetY());
         nwPnt = factory.CreateCoordinateXY(southwest->GetX(),northeast->GetY());
         clPnt = factory.CreateCoordinateXY(southwest->GetX(),southwest->GetY());
-        
+
         if (!swPnt|| !swPnt || !nePnt || !nwPnt ||!clPnt)
         {
             throw new MgOutOfMemoryException(L"MgCoordinateSystemGridBoundary.SetBoundaryExtents",
@@ -469,13 +469,13 @@
     Ptr<MgLinearRing> outerRing;
     Ptr<MgCoordinateIterator> ringItr;
     Ptr<MgCoordinate> coordPtr;
-    
+
     MG_TRY ()
         // Set up the accumulation values so we will always capture the first
         // values encountered in the actual polygon.
         eastMin = northMin = 1.0E+300;
         eastMax = northMax = -1.0E+300;
-        
+
         // We loop through theouter ring of the polygon.  For the purpose of this function,
         // the first ordinate in each coordinate is considered the easting and the
         // second ordinate in each coordinate is considered the northing.
@@ -529,7 +529,7 @@
             // Create the repository for the interior rings, now that we know
             // there are some (this is rare).
             interiorRings = new MgLinearRingCollection ();
-            
+
             for (index = 0;index < interiorRingCount;index += 1)
             {
                 sourceRing = m_GridBoundary->GetInteriorRing (index);
@@ -629,7 +629,7 @@
         // a linear ring which is our required return type.
         result = new MgLinearRing (targetCollection);
     MG_CATCH_AND_THROW(L"MgCoordinateSystemGridBoundary.TransformLinearRing")
-    
+
     return result.Detach ();
 }
 //=============================================================================
@@ -753,7 +753,7 @@
         // Generate and clip each of the four bounding lines.
         lineString = gridToFrame->GridLine (southwest,southeast,curvePrecision,maxPoints);
         m_SouthLine = frameBoundary->ClipLineString (lineString);
-        
+
         lineString = gridToFrame->GridLine (southeast,northeast,curvePrecision,maxPoints);
         m_EastLine = frameBoundary->ClipLineString (lineString);
 
@@ -834,7 +834,7 @@
                                                       m_Position                 (),
                                                       m_Direction                ()
 {
-}                                                      
+}
 CCoordinateSystemGridTick::~CCoordinateSystemGridTick ()
 {
 }
@@ -905,7 +905,7 @@
 INT32 CCoordinateSystemGridLineCollection::GetCount () const
 {
     INT32 lineCount;
-    
+
     lineCount = m_GridLineCollection->GetCount();
     return lineCount;
 }
@@ -1049,7 +1049,7 @@
 
     // Memory check is done inside Add()
     MG_TRY ()
-        
+
         toAddCount = aGridRegionCollection->GetCount ();
         for (index = 0;index < toAddCount;index += 1)
         {
@@ -1091,7 +1091,7 @@
 MgCoordinateSystemGridTick* CCoordinateSystemGridTickCollection::GetItem (INT32 index) const
 {
     MgCoordinateSystemGridTick *itemPtr = static_cast<MgCoordinateSystemGridTick*>(m_GridTickCollection->GetItem (index));
-    return itemPtr; 
+    return itemPtr;
 }
 void CCoordinateSystemGridTickCollection::RemoveAt (INT32 index)
 {

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGrids.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGrids.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGrids.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -161,7 +161,7 @@
     /// point must be southwest of the northeast location.
     /// \param northeast
     /// Northeast corner of the boundary in which a grid is to be drawn.
-    /// This point must be northeast of the southwest location.     
+    /// This point must be northeast of the southwest location.
     void SetBoundaryExtents (MgCoordinate* southwest,MgCoordinate* northeast);
 
     ////////////////////////////////////////////////////////////////////////////
@@ -223,7 +223,7 @@
     /// \param precision
     /// A value which indicates, in target coordinate system units, how
     /// precisely any complex curve approximation generated must match the
-    /// the true complex curve. 
+    /// the true complex curve.
     /// \remarks
     /// The transformation must be a coordinate system transformation.  The
     /// existing grid boundary is assumed to be defined in terms of the
@@ -264,7 +264,7 @@
     // standard Transform function.
     MgLinearRing* TransformLinearRing (MgLinearRing* linearString,
                                        MgCoordinateSystemTransform* transformation,
-                                       double curvePrecision); 
+                                       double curvePrecision);
     bool m_Large;
     INT32 m_MaxCurvePoints;
     Ptr<MgPolygon> m_GridBoundary;
@@ -279,7 +279,7 @@
 public:
     CCoordinateSystemGridLine (INT32 orientation,double value);
     ~CCoordinateSystemGridLine (void);
-    
+
     INT32 GetGridOrientation(void);
     double GetRealValue(void);
     INT32 GetCount (void);
@@ -352,7 +352,7 @@
 //=============================================================================
 // CCoordinateSystemGridTick  --  Implements MgCoordinateSystemGridTick
 //
-// 
+//
 class CCoordinateSystemGridTick : public MgCoordinateSystemGridTick
 {
 public:
@@ -452,7 +452,7 @@
 // CCoordinateSystemGridTick objects.  CCoordinateSystemGridTickCollection
 // objects will contain MgCoordinateSystemGridTick objects for the entire
 // boundary or for an individual grid line.
-class CCoordinateSystemGridTickCollection : public MgCoordinateSystemGridTickCollection 
+class CCoordinateSystemGridTickCollection : public MgCoordinateSystemGridTickCollection
 {
 public:
     CCoordinateSystemGridTickCollection (INT64 memoryThreshold);
@@ -474,7 +474,7 @@
 private:
     // Not Implemented
     CCoordinateSystemGridTickCollection (const CCoordinateSystemGridTickCollection& source);
-    CCoordinateSystemGridTickCollection& operator= (const CCoordinateSystemGridTickCollection& rhs);  
+    CCoordinateSystemGridTickCollection& operator= (const CCoordinateSystemGridTickCollection& rhs);
 };
 
 }   /* namespace CSLibrary */

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysMathComparator.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysMathComparator.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysMathComparator.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -150,7 +150,7 @@
     bool bResult;
     unsigned paramCount;
     unsigned orgDeltaZeroCount;
-    
+
     cs_Dtdef_ def1, def2;
 
     bResult = BuildDtDefFromInterface(pDefinition1, def1);

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysMgrs.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysMgrs.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysMgrs.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -35,31 +35,31 @@
 // Static constants.
 const CCoordinateSystemMgrs::CCoordinateSystemMgrsSeries CCoordinateSystemMgrs::MgrsSeriesNormal [6] =
 {
-	{	L"ABCDEFGH", L"ABCDEFGHJKLMNPQRSTUV" },
-	{	L"JKLMNPQR", L"FGHJKLMNPQRSTUVABCDE" },
-	{	L"STUVWXYZ", L"ABCDEFGHJKLMNPQRSTUV" },
-	{	L"ABCDEFGH", L"FGHJKLMNPQRSTUVABCDE" },
-	{	L"JKLMNPQR", L"ABCDEFGHJKLMNPQRSTUV" },
-	{	L"STUVWXYZ", L"FGHJKLMNPQRSTUVABCDE" }
+    {L"ABCDEFGH", L"ABCDEFGHJKLMNPQRSTUV" },
+    {L"JKLMNPQR", L"FGHJKLMNPQRSTUVABCDE" },
+    {L"STUVWXYZ", L"ABCDEFGHJKLMNPQRSTUV" },
+    {L"ABCDEFGH", L"FGHJKLMNPQRSTUVABCDE" },
+    {L"JKLMNPQR", L"ABCDEFGHJKLMNPQRSTUV" },
+    {L"STUVWXYZ", L"FGHJKLMNPQRSTUVABCDE" }
 };
 const CCoordinateSystemMgrs::CCoordinateSystemMgrsSeries CCoordinateSystemMgrs::MgrsSeriesBessel [6] =
 {
-	{	L"ABCDEFGH", L"LMNPQRSTUVABCDEFGHJK" },
-	{	L"JKLMNPQR", L"RSTUVABCDEFGHJKLMNPQ" },
-	{	L"STUVWXYZ", L"LMNPQRSTUVABCDEFGHJK" },
-	{	L"ABCDEFGH", L"RSTUVABCDEFGHJKLMNPQ" },
-	{	L"JKLMNPQR", L"LMNPQRSTUVABCDEFGHJK" },
-	{	L"STUVWXYZ", L"RSTUVABCDEFGHJKLMNPQ" }
+    {L"ABCDEFGH", L"LMNPQRSTUVABCDEFGHJK" },
+    {L"JKLMNPQR", L"RSTUVABCDEFGHJKLMNPQ" },
+    {L"STUVWXYZ", L"LMNPQRSTUVABCDEFGHJK" },
+    {L"ABCDEFGH", L"RSTUVABCDEFGHJKLMNPQ" },
+    {L"JKLMNPQR", L"LMNPQRSTUVABCDEFGHJK" },
+    {L"STUVWXYZ", L"RSTUVABCDEFGHJKLMNPQ" }
 };
 const wchar_t CCoordinateSystemMgrs::MgrsSeriesPolarSouth [2][25] =
 {
-	{L"JKLPQRSTUXYZABCFGHJKLPQR" },
-	{L"ABCDEFGHJKLMNPQRSTUVWXYZ" }
+    {L"JKLPQRSTUXYZABCFGHJKLPQR" },
+    {L"ABCDEFGHJKLMNPQRSTUVWXYZ" }
 };
 const wchar_t CCoordinateSystemMgrs::MgrsSeriesPolarNorth [2][15] =
 {
-	{L"RSTUXYZABCFGHJ" },
-	{L"ABCDEFGHJKLMNP" }
+    {L"RSTUXYZABCFGHJ" },
+    {L"ABCDEFGHJKLMNP" }
 };
 const wchar_t CCoordinateSystemMgrs::MgrsGridZoneDesignation [25] = L"ABCDEFGHJKLMNPQRSTUVWXYZ";
 
@@ -376,7 +376,7 @@
 {
     // Save the boundary.
     m_GridBoundary = SAFE_ADDREF (pGridBoundary);
-    
+
     // Create a CCoordinateSystemOneGrid which is appropriate for generating
     // MGRS graticule requests.
     m_ZoneCollection = FrameBoundaryToZones (m_GridBoundary,m_pCsTarget,m_bUseFrameDatum);
@@ -416,7 +416,7 @@
         // Determine the grid type.
         unitType = specification->GetUnitType();
         specIsGrid = (unitType ==  MgCoordinateSystemUnitType::Linear);
-        
+
         // Process each zone in our zone collection.  Originally, we thought
         // we could just call the GetGridLines function of the OneGrid
         // base class, but there are just too many special cases to deal with.
@@ -683,7 +683,7 @@
     }
     INT64 availableMemory = GetAvailableMemory();
     m_GridTickMemoryThreshold = (availableMemory > m_GridTickExceptionLevel) ? availableMemory - m_GridTickExceptionLevel : 0L;
-    
+
     if (m_ZoneCollection != 0)
     {
         INT32 index;
@@ -964,7 +964,7 @@
     // You could also describe this as object as "That portion of the
     // viewport which is included in the specific UTM zone we are
     // constructing an object for".
-    
+
     // Maintenance Note: In extreme cases, the use of rectangular viewports
     // to model a spherical world can lead to the consideration of a zone which
     // does not intersect the viewport.  In such cases, the Intersection polygon
@@ -1244,7 +1244,7 @@
     INT32 iEasting, iNorthing;
     INT32 eastIndex, northIndex;
     INT32 seriesIndex;
-    wchar_t squareDesignation [4]; 
+    wchar_t squareDesignation [4];
 
     squareDesignation [0] = L'?';
     squareDesignation [1] = L'?';
@@ -1368,7 +1368,7 @@
 wchar_t CCoordinateSystemMgrs::GridZoneDesignationLetter (INT32 index)
 {
     wchar_t designationLetter;
-    
+
     if (index >= 0 && index < 24)
     {
         designationLetter = MgrsGridZoneDesignation [index];
@@ -1477,7 +1477,7 @@
 
     bool canDoPoles (false);
     INT32 index;
-    
+
     INT32 prjCode = frameCRS->GetProjectionCode ();
     for (index = 0;polarCapable [index] != MgCoordinateSystemProjectionCode::Unknown;index += 1)
     {

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysMgrsMajorRegion.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysMgrsMajorRegion.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysMgrsMajorRegion.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -97,7 +97,7 @@
             }
         }
         else if (bandIndex == 19)
-        {        
+        {
             if (m_UtmZoneNbr == 31)
             {
                 m_WestLng = m_CentralMeridian - 3.0;
@@ -209,7 +209,7 @@
     else if (minLat > 84.0)
     {
         // The southern limit is in the north UPS regions (i.e. YZ).
-        m_NorthPolar = true;   
+        m_NorthPolar = true;
         intMinLat = 84;
         southernBandIndex = 22;
     }

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysMgrsZone.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysMgrsZone.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysMgrsZone.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -97,7 +97,7 @@
     double lngMin, lngMax;
     double latMin,latMax;
     STRING designation;
-   
+
     Ptr<MgCoordinateXY> fromPoint;
     Ptr<MgCoordinateXY> toPoint;
     Ptr<MgCoordinateSystem> llCRS;
@@ -131,7 +131,7 @@
         // terms of geographic coordinates.  So, we extract the extents of this
         // grid in geographic coordinate form, and work from there.
         GetGeographicExtents (lngMin,lngMax,latMin,latMax);
-        
+
         // MajorRegions do not do their own memory checks.  They do all their allocation
         // in their ctor and it is estimated that the largest potential collection is about
         // 40Mb.  The first following call to lineCollection->Add() will check, so it would
@@ -320,7 +320,7 @@
                 curvePrecision = 1.0;
                 // Estimate the number of minor regions.
                 GetGridExtents (eastMin,eastMax,northMin,northMax,curvePrecision);
- 
+
                 delta = fabs (fmod (eastMin,100000.0));
                 beginEast = static_cast<INT32>(eastMin - ((eastMin >= 0.0) ? delta : (100000.0 - delta)));
                 delta = fabs (fmod (eastMax,100000.0));
@@ -423,7 +423,7 @@
     MG_TRY ()
         southwest = new MgCoordinateXY ();
         northeast = new MgCoordinateXY ();
- 
+
         // To be are successful, we'll need a Transform which will convert
         // 'LL' to the frame coordinate system.
         llCRS = csFactory.CreateFromCode (L"LL");
@@ -434,7 +434,7 @@
         // terms of geographic coordinates.  So, we extract the extents of this
         // grid in geographic coordinate form, and work from there.
         GetGeographicExtents (lngMin,lngMax,latMin,latMax);
-        
+
         mjrRegionCollection = new CCoordinateSystemMgrsMajorRegionCollection (m_UtmZone,latMin,latMax);
         if (mjrRegionCollection != 0)
         {

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysOneGrid.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysOneGrid.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysOneGrid.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -43,8 +43,8 @@
 const INT32 CCoordinateSystemOneGrid::MaxCurvePoints = 511;
 
 CCoordinateSystemOneGrid::CCoordinateSystemOneGrid (INT64 gridLineMemoryThreshold,
-                                                    INT64 gridTickMemoryThreshold) 
-                                                        : 
+                                                    INT64 gridTickMemoryThreshold)
+                                                        :
                                                         MgGuardDisposable        (),
                                                         m_GridFrameCrsSame       (false),
                                                         m_UserID                 (0),
@@ -124,7 +124,7 @@
     INT32 projectionCode;
 
     projectionCode = m_GridCRS->GetProjectionCode ();
-    isGeographic = (projectionCode == MgCoordinateSystemProjectionCode::LL);    
+    isGeographic = (projectionCode == MgCoordinateSystemProjectionCode::LL);
     return isGeographic;
 }
 INT32 CCoordinateSystemOneGrid::GetUserID (void)
@@ -190,7 +190,7 @@
         // grid coordinates.  Doing this here _should_ elimiate the need to
         // arbitrarily expand the grid boundary.
         m_GridBoundary->GetBoundaryExtents (eastMin,eastMax,northMin,northMax);
-        
+
         // Adjust so the the grid limits are exact values with regard to the
         // specified increments.  Do this in an expansive way so the the grid
         // limits always get larger, never smaller.
@@ -203,7 +203,7 @@
         eastMin -= (eastMin >= 0.0) ? delta : (increment - delta);
         delta = fabs(fmod (eastMax,increment));
         eastMax += (eastMax >= 0.0) ? (increment - delta) : delta;
- 
+
         increment = mySpecPtr->GetNorthingIncrement(gridCrsUnitCode);
         delta = fabs(fmod (northMin,increment));
         northMin -= (northMin >= 0.0) ? delta : (increment - delta);
@@ -447,13 +447,13 @@
     // each line based on the coordinate systems involved.
     if (m_GridFrameCrsSame)
     {
-        lineSize = sizeof (CCoordinateSystemGridLine) + sizeof (MgLineStringCollection) + 
+        lineSize = sizeof (CCoordinateSystemGridLine) + sizeof (MgLineStringCollection) +
                                                         sizeof (MgLineString) +
                                                         kMgSizeOfCoordinateXY * 2;
     }
     else
     {
-        lineSize = sizeof (CCoordinateSystemGridLine) + sizeof (MgLineStringCollection) + 
+        lineSize = sizeof (CCoordinateSystemGridLine) + sizeof (MgLineStringCollection) +
                                                         sizeof (MgLineString) * 2 +
                                                         kMgSizeOfCoordinateXY * 511;
     }
@@ -472,14 +472,14 @@
 
         // Compute the range of the grid line generation.
         m_GridBoundary->GetBoundaryExtents (eastMin,eastMax,northMin,northMax);
-        
+
         // Expand the range to include all grid values at the extents.
         increment = mySpecPtr->GetEastingIncrement(gridCrsUnitCode);
         delta = fabs(fmod (eastMin,increment));
         eastMin -= (eastMin >= 0.0) ? delta : (increment - delta);
         delta = fabs(fmod (eastMax,increment));
         eastMax += (eastMax >= 0.0) ? (increment - delta) : delta;
- 
+
         increment = mySpecPtr->GetNorthingIncrement(gridCrsUnitCode);
         delta = fabs(fmod (northMin,increment));
         northMin -= (northMin >= 0.0) ? delta : (increment - delta);

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -1199,7 +1199,7 @@
         delete curPtr;
         curPtr = nxtPtr;
     }
-    
+
     MG_THROW ()
 
     return lineString.Detach ();
@@ -1250,7 +1250,7 @@
     Ptr<MgCoordinate> trgTo;
 
     status = -1;        // Until we know different.
-    
+
     // We need copies of these pointers so we can swap then as necessary.
     srcFrom = from;
     srcTo = to;
@@ -1351,7 +1351,7 @@
                 // 'position'.  As we zero in on the desired point, we will be moving
                 // 'ratio' up and down.  The point here being, as long as ratio is between
                 // zero and one, we know that it represents a point which is precisely on
-                // the underlying line, which in this case is the provided line in the 
+                // the underlying line, which in this case is the provided line in the
                 // source coordinate system.  Also, the ratio approach is unitless, thus
                 // this makes it easier to determine when to terminate the iterative loop.
                 // Currently, we use 1 part in a million.
@@ -1370,11 +1370,11 @@
                     // this function is present in this object.  It was made private as to
                     // do otherwise would change the public API, a change which was not
                     // approved as part of the RFC.
-                    
+
                     // Convert the proposed 'position' point back to the coordinates of
                     // the target system (i.e. of the ordinate value argument).
                     Transform (&xx,&yy);
-                    
+
                     // Make an estimate as to how much, and what direction, we need to
                     // move 'ratio' to achieve the desired result.
                     if (orientation == MgCoordinateSystemGridOrientation::EastWest)
@@ -1568,11 +1568,11 @@
     int st;
     double xy [3];
     double ll [3];
-    
+
     xy [0] = xx;
     xy [1] = yy;
     xy [2] = 0.0;
-    
+
     st = CS_cs2ll (&m_dst,ll,xy);
     if (st >= 0)
     {

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysUtil.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysUtil.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysUtil.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -684,13 +684,13 @@
 INT64 GetAvailableMemory()
 {
 #ifdef _WIN32
-    // Size of available memory in bytes, with an additional 
+    // Size of available memory in bytes, with an additional
     // 200Mb subtracted to take into account heap fragmentation,
-    // and a 100Mb buffer for smaller allocations that may happen in 
+    // and a 100Mb buffer for smaller allocations that may happen in
     // between checks.
     MEMORYSTATUSEX  statex;
     statex.dwLength = sizeof (statex);
-    INT64 maxAvailable = 0L;  
+    INT64 maxAvailable = 0L;
     if(GlobalMemoryStatusEx (&statex)) {
         maxAvailable = min(statex.ullAvailPhys + statex.ullAvailPageFile, statex.ullAvailVirtual);
         maxAvailable = (maxAvailable > 300000000L) ? maxAvailable - 300000000L : 0L;

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysUtil.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysUtil.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysUtil.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -205,9 +205,9 @@
 };
 bool ValidateFile(
     const wchar_t *kpFile, //the file name to validate
-    bool bExists,		//if true, function fails if file doesn't exist
-    bool bIsDir,		//if true, function fails if file isn't a dir
-    bool bCanWrite,		//if true, function fails if file isn't writable
+    bool bExists,       //if true, function fails if file doesn't exist
+    bool bIsDir,        //if true, function fails if file isn't a dir
+    bool bCanWrite,     //if true, function fails if file isn't writable
     EFileValidity *pReason = NULL); //if not NULL store result code
 
 bool IsValidDictionaryName(CREFSTRING sName);

Modified: trunk/MgDev/Common/CoordinateSystem/namestruct.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/namestruct.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/CoordinateSystem/namestruct.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -20,10 +20,10 @@
 // Several places in the public API code require working with STL sets, lists, or
 // maps of strings, wherein the strings have two important properties:
 //
-//	1.	They're fixed-length (can't be over a certain fixed size)
+//  1.  They're fixed-length (can't be over a certain fixed size)
 //
-//	2.	They need to be sorted in a particular way (alphabetically,
-//		case-insensitive.
+//  2.  They need to be sorted in a particular way (alphabetically,
+//      case-insensitive.
 //
 // For this reason, instead of trying to work with char *'s that are
 // dynamically allocated and freed, it's much more convenient to work
@@ -44,7 +44,7 @@
 
 #include <list>
 #include <map>
-#include "cs_map.h"	//for cs_KEYNM_DEF
+#include "cs_map.h" //for cs_KEYNM_DEF
 
 //Disable silly warning that comes when we use template stuff
 #pragma warning(disable: 4786)

Modified: trunk/MgDev/Common/Foundation/Makefile.am
===================================================================
--- trunk/MgDev/Common/Foundation/Makefile.am	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Foundation/Makefile.am	2010-01-09 08:30:45 UTC (rev 4507)
@@ -238,9 +238,9 @@
   -lMgMdfParser \
   -lMgMdfModel \
   -lxerces-c
-  
+
 libMgFoundation_la_LDFLAGS = -version-info 7:0:0 \
   -L../../Oem/ACE/ACE_wrappers/ace \
   -L../../Oem/dbxml-2.3.10/install/lib \
   -L../MdfParser \
-  -L../MdfModel 
+  -L../MdfModel

Modified: trunk/MgDev/Common/Foundation/System/FileUtil.cpp
===================================================================
--- trunk/MgDev/Common/Foundation/System/FileUtil.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Foundation/System/FileUtil.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -1048,7 +1048,7 @@
     STRING tempPathname;
 
     MG_TRY()
-    
+
     tempPathname = GetTempPath();
 
     STRING uuid;

Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -566,7 +566,7 @@
 MgCoordinateSystemGridSpecification* MgCoordinateSystemFactory::GridSpecification ()
 {
     MgCoordinateSystemGridSpecification* gridSpecification (0);
-    
+
     gridSpecification = new CCoordinateSystemGridSpecification ();
     return gridSpecification;
 }
@@ -652,8 +652,8 @@
 // nLetteringScheme is one of the values defined inside MgCoordinateSystemMgrsLetteringScheme
 //
 MgCoordinateSystemMgrs* MgCoordinateSystemFactory::GetMgrs(
-    double dEquatorialRadius, 
-    double dEccentricity, 
+    double dEquatorialRadius,
+    double dEccentricity,
     INT8 nLetteringScheme,
     bool bSetExceptionsOn)
 {
@@ -682,7 +682,7 @@
 // nLetteringScheme is one of the values defined inside MgCoordinateSystemMgrsLetteringScheme
 //
 MgCoordinateSystemMgrs* MgCoordinateSystemFactory::GetMgrsEllipsoid(
-    CREFSTRING sEllipsoidCode, 
+    CREFSTRING sEllipsoidCode,
     INT8 nLetteringScheme,
     bool bSetExceptionsOn)
 {
@@ -711,7 +711,7 @@
 // nLetteringScheme is one of the values defined inside
 // MgCoordinateSystemMgrsLetteringScheme
 //
-MgCoordinateSystemMgrs* MgCoordinateSystemFactory::GetMgrsDatum(CREFSTRING sDatumCode, 
+MgCoordinateSystemMgrs* MgCoordinateSystemFactory::GetMgrsDatum(CREFSTRING sDatumCode,
                                                                 INT8 nLetteringScheme,
                                                                 bool bSetExceptionsOn)
 {

Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -293,7 +293,7 @@
     /// </remarks>
     virtual MgCoordinateSystemGridSpecification* GridSpecification (INT32 gridType,
                                                                     INT32 gridLevel);
-                                                                   
+
     // Grids and Graticules -- Generic
     ///////////////////////////////////////////////////////////////////////////
     /// <summary>

Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGrids.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGrids.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGrids.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -64,7 +64,7 @@
 /// <c>MgCoordinateSystemFactory</c> object.<p>
 /// Note that all values are provided in the units specified within the object.
 /// The units used in this object do <b>not</b> need to be the same as any
-/// coordinate system involved in the generation of a grid, although the 
+/// coordinate system involved in the generation of a grid, although the
 /// <b>type</b> of unit must be consistent with the type of grid being drawn.
 /// That is, specifying a Angular unit type when drawing a UTM grid will cause
 /// an exception at the time the request for (say) grid lines is issued.
@@ -85,7 +85,7 @@
     /// start at one (the base) yielding grid lines at 1, 3, 5, 7, etc.
     /// </remarks>
     virtual double GetEastingBase (void)=0;
-    
+
     ///////////////////////////////////////////////////////////////////////////
     /// <summary>
     /// Gets the northing base value.
@@ -239,10 +239,10 @@
     /// The value returned is one of the values defined in the
     /// MgCoordinateSystemUnitCode object and essentially specifies the unit in
     /// which the base, increment (line and tick), and curve precision values
-    /// are specified. 
+    /// are specified.
     ///
     virtual INT32 GetUnitCode(void)=0;
-    
+
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
     /// Determines if two MgCoordinateSystemGridSpecification objects are the
@@ -408,7 +408,7 @@
     ///
     /// \param unitCode (int)
     /// One of the integer values defined in the MgCoordinateSystemUnitCode
-    /// object which indicates the units used to define the grid parameters. 
+    /// object which indicates the units used to define the grid parameters.
     ///
     /// \param unitType (int)
     /// One of the integer values defined in the MgCoordinateSystemUnitType
@@ -448,7 +448,7 @@
     /// \remarks
     /// Please note the term desired in this description.  The generation of a
     /// complex curve approximation is also controlled by a variable usually
-    /// called the MaximumCurvePoints.  Thus, if this criteria is exceeded in 
+    /// called the MaximumCurvePoints.  Thus, if this criteria is exceeded in
     /// the curve generation process, the curve precision can and will often be
     /// less than that requested.  This provision is implemented to reduce the
     /// probability of a runaway grid which consumes the entire machine.

Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemMgrs.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemMgrs.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemMgrs.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -54,7 +54,7 @@
     /// /returns
     /// The MGRs representation for the given point.
     virtual STRING ConvertFromLonLat(double dLongitude, double dLatitude, INT32 nPrecision)=0;
-    
+
     ///////////////////////////////////////////////////////////////////////////
     /// /brief
     /// Converts a geographic coordinate to MGRS string form.

Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridLevel.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridLevel.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridLevel.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -33,8 +33,8 @@
     static const INT32 Mgrs1Km     =  5;
     static const INT32 Mgrs100m    =  6;
     static const INT32 Mgrs10m     =  7;
-    static const INT32 Mgrs1m      =  8;  
-    static const INT32 MgrsUnknown = 99;  
+    static const INT32 Mgrs1m      =  8;
+    static const INT32 MgrsUnknown = 99;
 };
 
 #endif //_MGCOORDINATESYSTEMMGRSGRIDLEVEL_H_

Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -552,7 +552,7 @@
     /// Nothing.
     ///
     virtual void TransformM(double x[], double y[], double z[], double m[], int arraySize)=0;
-    
+
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
     /// Give a line segement in coordinates of the source system via the the

Modified: trunk/MgDev/Common/Geometry/CoordinateSystemMgrs.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystemMgrs.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Geometry/CoordinateSystemMgrs.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -29,60 +29,60 @@
 ///////////////////////////////////////////////////////////////////////////////
 // New stuff for Grid/Graticule generally.
 enum EmgGridLineType { lnDirNone = 0,
-					   lnDirEastWest,
-					   lnDirNorthSouth,
-					   lnDirUnknown
-					 };
+                       lnDirEastWest,
+                       lnDirNorthSouth,
+                       lnDirUnknown
+                     };
 
 enum EmgGridLineTerm { lnTrmNone = 0,
-					   lnTrmEast,
-					   lnTrmWest,
-					   lnTrmNorth,
-					   lnTrmSouth,
-					   lnTrmInternal,
-					   lnTrmUnknown
-					 };
+                       lnTrmEast,
+                       lnTrmWest,
+                       lnTrmNorth,
+                       lnTrmSouth,
+                       lnTrmInternal,
+                       lnTrmUnknown
+                     };
 
 class MgGridCoordinateCollection : public MgCoordinateCollection
 {
 public:
-	MgGridCoordinateCollection (EmgGridLineType lnDir,double isoValue,double chord = 0.0);
-	
-	MgGridCoordinateCollection (const MgGridCoordinateCollection& rhs);		//???//
-	MgGridCoordinateCollection operator= (const MgGridCoordinateCollection& rhs);	//???//
+    MgGridCoordinateCollection (EmgGridLineType lnDir,double isoValue,double chord = 0.0);
 
-	EmgGridLineType GetLineType (void);
-	double GetIsoValue (void) const;
-	double GetChord (void) const;
-	EmgGridLineTerm FirstPoint;
-	EmgGridLineTerm LastPoint;
+    MgGridCoordinateCollection (const MgGridCoordinateCollection& rhs);     //???//
+    MgGridCoordinateCollection operator= (const MgGridCoordinateCollection& rhs);   //???//
 
+    EmgGridLineType GetLineType (void);
+    double GetIsoValue (void) const;
+    double GetChord (void) const;
+    EmgGridLineTerm FirstPoint;
+    EmgGridLineTerm LastPoint;
+
 private:
-	EmgGridLineType LineType;		// Essentially indicates if the IsoValue is an
-									// easting/longitude or a northing/latitude
-	double IsoValue;				// value represented by the line
-	double ChordValue;				// an indication of the accuracy of representation
-									// not really used, but will be available at
-									// contsruction time and cannot reconstructed.
+    EmgGridLineType LineType;       // Essentially indicates if the IsoValue is an
+                                    // easting/longitude or a northing/latitude
+    double IsoValue;                // value represented by the line
+    double ChordValue;              // an indication of the accuracy of representation
+                                    // not really used, but will be available at
+                                    // contsruction time and cannot reconstructed.
 };
 
 class MgMgrsCoordinateCollection : public MgGridCoordinateCOllection
 {
-	MgMgrsCoordinateCollection (INT32 utmZone,wchar_t quadEast,wchar_t quadWest);
+    MgMgrsCoordinateCollection (INT32 utmZone,wchar_t quadEast,wchar_t quadWest);
 
-	INT32 GetUtmZone (void);
-	STRING GetQuadDesignation (void);
-	INT32 GetMGRSLabelValue (void);
+    INT32 GetUtmZone (void);
+    STRING GetQuadDesignation (void);
+    INT32 GetMGRSLabelValue (void);
 
 private:
-	INT32 UtmZone;					// 0 = invalid,
-									// > 0 means northern hemisphere
-									// < 0 means southern hemisphere
-									// value of 61 indicates polar region
-	wchar_t QuadDesignation [2];	// Easting portion of the Quad designation
-	wchar_t QuadNorth;				// Northing portion of the Quad Designation
-	double QuadBaseEasting;			// The base UTM easting value of the quad.
-	double QuadBaseNorthing;		// The base UTM northing value of the quad.
+    INT32 UtmZone;                  // 0 = invalid,
+                                    // > 0 means northern hemisphere
+                                    // < 0 means southern hemisphere
+                                    // value of 61 indicates polar region
+    wchar_t QuadDesignation [2];    // Easting portion of the Quad designation
+    wchar_t QuadNorth;              // Northing portion of the Quad Designation
+    double QuadBaseEasting;         // The base UTM easting value of the quad.
+    double QuadBaseNorthing;        // The base UTM northing value of the quad.
 };
 
 //
@@ -108,15 +108,15 @@
 class MgCoordinateSystemFactory : public MgGuardDisposable
 {
 ...
-	virtual MgCoordinateSystemMgrs* GetMgrs(
+    virtual MgCoordinateSystemMgrs* GetMgrs(
         CREFSTRING sTargetCsCode,           //system used for input and output coordinates
-        bool bUseTargetDatum,               //true to have the MGRS use the datum of pTargetCs. false to use WGS84 
+        bool bUseTargetDatum,               //true to have the MGRS use the datum of pTargetCs. false to use WGS84
         int nLetteringScheme,               //a value from MgCoordinateSystemMgrsLetteringScheme
         bool bSetExceptionsOn);             //true to repport errors as MgExceptions. false to use MgCoordinateSystemMgrs::GetLastError
 
-	virtual MgCoordinateSystemMgrs* GetMgrs(
+    virtual MgCoordinateSystemMgrs* GetMgrs(
         MgCoordinateSystem *pTargetCs,      //system used for input and output coordinates
-        bool bUseTargetDatum,               //true to have the MGRS use the datum of pTargetCs. false to use WGS84 
+        bool bUseTargetDatum,               //true to have the MGRS use the datum of pTargetCs. false to use WGS84
         int nLetteringScheme,               //a value from MgCoordinateSystemMgrsLetteringScheme
         bool bSetExceptionsOn);             //true to repport errors as MgExceptions. false to use MgCoordinateSystemMgrs::GetLastError
 
@@ -282,7 +282,7 @@
     //returns a list of MgCoordinateSystemMgrsDoubleLabel for other MgCoordinateSystemMgrsPrecision values
     virtual MgCoordinateSystemMgrsLabelCollection* GetGridRightLabels(
         const MgCoordinateSystemBoundary& extents,                          //extents of the area of interest defined in the MGRS coordinate system
-        INT8 nMgrsPrecision); 
+        INT8 nMgrsPrecision);
 
     //precision of the grid to be labeled, a value from MgCoordinateSystemMgrsPrecision
     //get all the grid line labels that can positioned on the outside bottom of a given area
@@ -291,7 +291,7 @@
     //returns a list of MgCoordinateSystemMgrsDoubleLabel for other MgCoordinateSystemMgrsPrecision values
     virtual MgCoordinateSystemMgrsLabelCollection* GetGridBottomLabels(
         const MgCoordinateSystemBoundary& extents,                          //extents of the area of interest defined in the MGRS coordinate system
-        INT8 nMgrsPrecision); 
+        INT8 nMgrsPrecision);
 
     //precision of the grid to be labeled, a value from MgCoordinateSystemMgrsPrecision
     //get all the grid line labels that can positioned on the outside left of a given area

Modified: trunk/MgDev/Common/Geometry/GeometryConsoleTest/GeometryConsoleTest.cpp
===================================================================
--- trunk/MgDev/Common/Geometry/GeometryConsoleTest/GeometryConsoleTest.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Geometry/GeometryConsoleTest/GeometryConsoleTest.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -20,7 +20,7 @@
     INT32 regionCount;
     INT32 gridLineCount;
     INT32 lineSegmentCount;
-    
+
     double xx;
     double yy;
     double uu;
@@ -82,10 +82,10 @@
             coordItr->Release ();
             pLineString->Release ();
         }
-        pGridLine->Release ();        
+        pGridLine->Release ();
     }
     pGridLines->Release ();
-    
+
     pGridTicks = pGenericGrid->GetGridTicks (pGridSpecification);
     tickCount = pGridTicks->GetCount ();
     for (index4 = 0;index4 < tickCount;index4 += 1)
@@ -103,7 +103,7 @@
         pCoordinate->Release ();
         pGridTick->Release ();
     }
-    pGridTicks->Release ();    
+    pGridTicks->Release ();
 
     pGenericGrid->Release ();
     pGridSpecification->Release ();

Modified: trunk/MgDev/Common/Geometry/GeometryConsoleTest/targetver.h
===================================================================
--- trunk/MgDev/Common/Geometry/GeometryConsoleTest/targetver.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Geometry/GeometryConsoleTest/targetver.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -1,8 +1,8 @@
 #pragma once
 
 // The following macros define the minimum required platform.  The minimum required platform
-// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run 
-// your application.  The macros work by enabling all features available on platform versions up to and 
+// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run
+// your application.  The macros work by enabling all features available on platform versions up to and
 // including the version specified.
 
 // Modify the following defines if you have to target a platform prior to the ones specified below.

Modified: trunk/MgDev/Common/Geometry/Spatial/MathUtility.cpp
===================================================================
--- trunk/MgDev/Common/Geometry/Spatial/MathUtility.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Geometry/Spatial/MathUtility.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -214,39 +214,39 @@
 
 bool MgMathUtility::DblCmp (double first,double second)
 {
-	int exp1, exp2;
-	int deltaExp;
-	double mant1,mant2;
+    int exp1, exp2;
+    int deltaExp;
+    double mant1,mant2;
 
-	mant1 = frexp (first ,&exp1);
-	mant2 = frexp (second,&exp2);
-	deltaExp = exp1 - exp2;
-	if (abs (deltaExp) >= 2) return false;
+    mant1 = frexp (first ,&exp1);
+    mant2 = frexp (second,&exp2);
+    deltaExp = exp1 - exp2;
+    if (abs (deltaExp) >= 2) return false;
 
-	// Need to deal with the case where the difference between the exponents
-	// is +/-1.  This is necessary as the two values may be infinitesimally
-	// greater and less than an even true binary value like 0.5.  In this
-	// case, they would be equal, but the exponents would not be the same.
-	if (deltaExp == 1)
-	{
-		// exp of first is bigger than exp of second.   Adjust exp2 and mant2
-		// so that they still represent the same value, but exp2 is now the
-		// same as exp1.  Note, this de-normalizes the numbers,  but that
-		// does not affect the comparison result in any way.
-		exp2 += 1;
-		mant2 *= 0.5;
-	}
-	else if (deltaExp == -1)
-	{
-		exp1 += 1;
-		mant1 *= 0.5;
-	}
+    // Need to deal with the case where the difference between the exponents
+    // is +/-1.  This is necessary as the two values may be infinitesimally
+    // greater and less than an even true binary value like 0.5.  In this
+    // case, they would be equal, but the exponents would not be the same.
+    if (deltaExp == 1)
+    {
+        // exp of first is bigger than exp of second.   Adjust exp2 and mant2
+        // so that they still represent the same value, but exp2 is now the
+        // same as exp1.  Note, this de-normalizes the numbers,  but that
+        // does not affect the comparison result in any way.
+        exp2 += 1;
+        mant2 *= 0.5;
+    }
+    else if (deltaExp == -1)
+    {
+        exp1 += 1;
+        mant1 *= 0.5;
+    }
 
-	// Now, if the exponents are not equal, obviously the original values
-	// are not equal; not even close.
-	if (exp1 != exp2) return false;
+    // Now, if the exponents are not equal, obviously the original values
+    // are not equal; not even close.
+    if (exp1 != exp2) return false;
 
-	// Since the exponents are equal, then we can simply compare the mantissas.
-	// We ignore any difference in the last few bits.
-	return (fabs (mant1 - mant2) < 5.0E-13);
+    // Since the exponents are equal, then we can simply compare the mantissas.
+    // We ignore any difference in the last few bits.
+    return (fabs (mant1 - mant2) < 5.0E-13);
 }

Modified: trunk/MgDev/Common/Geometry/Spatial/MathUtility.h
===================================================================
--- trunk/MgDev/Common/Geometry/Spatial/MathUtility.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Geometry/Spatial/MathUtility.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -92,7 +92,7 @@
     /// value is also a (quiet) NaN.
     static double LinearInterpolate(double start, double end, double proportion);
 
-    /////////////////////////////////////////////////////////////////////////// 
+    ///////////////////////////////////////////////////////////////////////////
     /// <summary>
     /// Reliably compares two doubles, providing that neither of the two values
     /// is a hard zero, ignoring differences in the least significant bits of

Modified: trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp
===================================================================
--- trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -518,7 +518,7 @@
 //////////////////////////////////////////////
 ///<summary>
 /// Calculates the two dimensional intersection of two line segments.
-/// 
+///
 ///</summary>
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -592,7 +592,7 @@
             {
                 // X decreases from the 'from' point to the 'to' point.
                 if ((result->GetX() <= seg1From->GetX() || preciseFrom) &&
-                    (result->GetX() >= seg1To->GetX()   || preciseTo)) 
+                    (result->GetX() >= seg1To->GetX()   || preciseTo))
                 {
                     status |= 1;
                 }
@@ -720,11 +720,11 @@
     Ptr<MgCoordinate> intersection;
     Ptr<MgCoordinate> polyFrom;
     Ptr<MgCoordinate> polyTo;
-    
+
     CHECKNULL(polyItr, L"MgSpatialUtility.PolySegIntersection")
     CHECKNULL(segFrom, L"MgSpatialUtility.PolySegIntersection")
     CHECKNULL(segTo,   L"MgSpatialUtility.PolySegIntersection")
-  
+
     // Create the return object.  Quite often it gets returned empty, but we
     // will always return a "new" object (i.e. refCount == 1).  Create a work
     // point we can use.
@@ -743,7 +743,7 @@
         polyFrom = polyTo;
         polyTo = polyItr->GetCurrent ();
         status = SegmentIntersection (intersection,polyFrom,polyTo,segFrom,segTo);
-        
+
         // If the intersection is precisely on the 'From' point of the polygon segment,
         // we're not interested.  It will show up again when that point becomes a
         // 'To' point on the polygon.
@@ -797,14 +797,14 @@
         // insert the value into the collection such that when we are
         // done, the points represent the same disrection as the original
         // line segment.
-        
+
         // Compute the distance from the basePoint to the newPoint.  To
         // keep performance up we'll use the square of the distance
         // rather than the distance itself;
         deltaX = newPoint->GetX () - basePoint->GetX ();
         deltaY = newPoint->GetY () - basePoint->GetY ();
         newDistance = /*sqrt*/ (deltaX * deltaX + deltaY * deltaY);
-        
+
         // Loop through all points in the collection and determine the index
         // value of the first point whose distance from the base point is
         // greater than the distance for the newPoint.
@@ -868,7 +868,7 @@
     // If the number of intersections is odd, the query point is inside.
     // Otherwise it is outside. (Zero is an even number, isn't it?)
     isInside = ((count & 1) != 0);
-    
+
     return isInside;
 }
 
@@ -899,12 +899,12 @@
     lineItr->Reset ();
     lineItr->MoveNext ();
     lineTo = lineItr->GetCurrent ();
-    
+
     // We need to know in what state we are starting in.  lineTo currently
     // has the coordinates of the first point, which will become the
     // lineFrom point once the main loop gets started.
     inside = PointIsInPolygon (polyItr,lineTo);
-    
+
     // If we are starting inside the polgon, we push the first point
     // onto the current point collection.
     if (inside)
@@ -916,7 +916,7 @@
     {
         lineFrom = lineTo;
         lineTo = lineItr->GetCurrent ();
-        
+
         // Intersect this segment with the polygon.
         Ptr<MgCoordinateCollection> segCollection;
         segCollection = PolySegIntersection (polyItr,lineFrom,lineTo);

Modified: trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.h
===================================================================
--- trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -272,7 +272,7 @@
     /// </remarks>
     static MgLineStringCollection* ClipStringToPolygon (MgCoordinateIterator* polyItr,
                                                         MgCoordinateIterator* lineItr);
-                                                                                            
+
 protected:
 
     MgSpatialUtility() {};

Modified: trunk/MgDev/Common/MapGuideCommon/Makefile.am
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Makefile.am	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MapGuideCommon/Makefile.am	2010-01-09 08:30:45 UTC (rev 4507)
@@ -278,5 +278,4 @@
   -L../Geometry \
   -L../Security \
   -L../MdfParser \
-  -L../MdfModel 
-  
+  -L../MdfModel

Modified: trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -283,7 +283,7 @@
     std::map<STRING, STRING> layerContentPair;
     if(layerIds->GetCount() != 0)
     {
-        Ptr<MgStringCollection> layerContents = m_resourceService->GetResourceContents(layerIds, NULL);        
+        Ptr<MgStringCollection> layerContents = m_resourceService->GetResourceContents(layerIds, NULL);
         for(int i = 0; i < layerIds->GetCount(); i ++)
         {
             layerContentPair.insert(std::pair<STRING, STRING>(layerIds->GetItem(i), layerContents->GetItem(i)));
@@ -509,7 +509,7 @@
     }
 
     Ptr<MgResourceIdentifier> resId = new MgResourceIdentifier(L"Session:" + sessionId + L"//" + mapName + L"." + MgResourceType::Map);
-    
+
     MgResource::Open(m_resourceService, resId);
     m_name = mapName;
 

Modified: trunk/MgDev/Common/MapGuideCommon/Resources/mapguide_en.res
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Resources/mapguide_en.res	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MapGuideCommon/Resources/mapguide_en.res	2010-01-09 08:30:45 UTC (rev 4507)
@@ -234,7 +234,7 @@
 MgFormatAllExceptionStackTrace                        = - %1(%2) line %3 file %4
 MgFormatInnerExceptionMessage                         = %1
 MgGeometryEmpty                                       = The geometry cannot be empty.
-MgGeometryPropertyEmpty                               = The geometry property cannot be empty. 
+MgGeometryPropertyEmpty                               = The geometry property cannot be empty.
 MgGroupAndRoleNotEmpty                                = Both the group and role are not empty.
 MgHeaderDocumentNotEmpty                              = The header document is not empty.
 MgInvalidAgfText                                      = The AGF text is invalid because it failed to parse into a valid geometry object.
@@ -292,7 +292,7 @@
 MgMissingSrs                                          = No coordinate system specified.
 MgNameNotFound                                        = The name was not found.
 MgNoDataFromRenderer                                  = No data from renderer.
-MgPropertyValuesEmpty                                 = The property values cannot be empty. 
+MgPropertyValuesEmpty                                 = The property values cannot be empty.
 MgReaderIdNotFound                                    = The reader ID was not found.
 MgRepositoryAlreadyOpened                             = The repository is already opened by another process (e.g. If you are running the server interactively as an application from the command line, are you also running the server as a service?).
 MgRepositoryVersionMismatch                           = The repository version '%1' does not match the current version '%2'. Upgrade is required. Please refer to documentation for details.
@@ -306,7 +306,7 @@
 MgSiteServerIpMustNotBeLocalHost                      = The site server IP address must not be a local host.
 MgSqlReaderIdNotFound                                 = The SQL reader ID was not found.
 MgStringContainsReservedCharacters                    = The string cannot contain reserved characters %1
-MgStringEmpty                                         = The string cannot be empty. 
+MgStringEmpty                                         = The string cannot be empty.
 MgStringTooLong                                       = The string is too long.
 MgTagFieldNotFound                                    = The tag contained no fields.
 MgUnableToLockTileFile                                = Unable to lock the tile file.

Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureReader.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureReader.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureReader.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -523,7 +523,7 @@
     ///
     BYTE_ARRAY_OUT GetGeometry(CREFSTRING propertyName, INT32& length);
 
-	//////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////
     /// \brief
     /// Gets the Geometry for the specified property. No conversion is
     /// performed, thus the property must be a of type Geometry or the result
@@ -551,7 +551,7 @@
     ///
     const wchar_t* GetString(CREFSTRING propertyName, INT32& length);
 
-	//////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////
     /// \brief
     /// Gets the string value of the specified property. No conversion is
     /// performed, thus the property must be a of type string or the result

Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -906,7 +906,7 @@
 //////////////////////////////////////////////////////////////////
 /// <summary>
 /// This method executes the SELECT SQL statement specified within a given transaction
-/// and returns a pointer to SqlDataReader instance. This instance can be used to 
+/// and returns a pointer to SqlDataReader instance. This instance can be used to
 /// retrieve column information and related values.
 ///
 /// NOTE:
@@ -975,7 +975,7 @@
 //////////////////////////////////////////////////////////////////
 /// <summary>
 /// This method executes the SELECT SQL statement specified within a given transaction
-/// and returns a pointer to SqlDataReader instance. This instance can be used to 
+/// and returns a pointer to SqlDataReader instance. This instance can be used to
 /// retrieve column information and related values.
 ///
 /// NOTE:
@@ -997,7 +997,7 @@
 /// The transaction object on which the sql statement will be executed.
 /// </param>
 /// <param name="fetchSize">Input
-/// The fetch size of query. This method returns all data of query if 
+/// The fetch size of query. This method returns all data of query if
 /// setting the fetch size to 0.
 /// </param>
 /// <returns>
@@ -1040,7 +1040,7 @@
 
     SetWarning(cmd.GetWarningObject());
 
-    MgSqlResult * pResult = (MgSqlResult *)cmd.GetReturnValue().val.m_obj; 
+    MgSqlResult * pResult = (MgSqlResult *)cmd.GetReturnValue().val.m_obj;
     if(params != NULL)
     {
         Ptr<MgParameterCollection> retParams = pResult->GetParameters();
@@ -1151,7 +1151,7 @@
 
     SetWarning(cmd.GetWarningObject());
 
-    MgSqlResult * pResult = (MgSqlResult *)cmd.GetReturnValue().val.m_obj; 
+    MgSqlResult * pResult = (MgSqlResult *)cmd.GetReturnValue().val.m_obj;
     if(params != NULL)
     {
         Ptr<MgParameterCollection> retParams = pResult->GetParameters();

Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -603,7 +603,7 @@
     ///
     /// \remarks
     /// If passing NULL for transaction, it will work the same as UpdateFeatures(resource, commands, false).
-    /// 
+    ///
     /// \param resource
     /// Input
     /// A resource identifier referring to connection string
@@ -781,7 +781,7 @@
     /// The MgTransaction instance on which the sql statement will be executed.
     /// \param fetchSize
     /// Input
-    /// The fetch size of query. This method returns all data 
+    /// The fetch size of query. This method returns all data
     /// of query if setting the fetch size to 0.
     ///
     /// \return
@@ -1143,7 +1143,7 @@
     // Commit the transaction specified by the transaction id.
     bool CommitTransaction(CREFSTRING transactionId);
 
-    // Rollback the transaction specified by the transaction id. 
+    // Rollback the transaction specified by the transaction id.
     bool RollbackTransaction(CREFSTRING transactionId);
 
 protected:

Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureTransaction.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureTransaction.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureTransaction.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -25,8 +25,8 @@
 /// \cond INTERNAL
 /////////////////////////////////////////////////////////////////
 /// <summary>
-/// MgProxyFeatureTransaction represents a transaction to be performed in 
-/// a DataStore. If the transaction is time out, commit or rollback a 
+/// MgProxyFeatureTransaction represents a transaction to be performed in
+/// a DataStore. If the transaction is time out, commit or rollback a
 /// transaction will result in one exception MgFeatureServiceException thrown.
 /// </summary>
 class MG_MAPGUIDE_API  MgProxyFeatureTransaction : public MgTransaction

Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyResourceService.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyResourceService.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyResourceService.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -541,8 +541,8 @@
     /// \param preProcessTags
     /// Pre-processing to apply to resource before returning content.
     /// If this parameter is NULL, it means no pre-processing.
-    /// If this parameter is not NULL, it must be a collection of pre-processing types, and it should be 
-    /// one to one matching the collection of parameter resources. 
+    /// If this parameter is not NULL, it must be a collection of pre-processing types, and it should be
+    /// one to one matching the collection of parameter resources.
     /// See MgResourcePreProcessingType for a list of supported pre-processing tags.
     ///
     /// \return

Modified: trunk/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -106,8 +106,8 @@
         int err = ACE_OS::last_error();
         MG_UNUSED_ARG(err);
 
-        // We failed to connect so we must clean this up differently then just relying on the 
-        // desturctor because the Disconnect() method called by the destructor will try and 
+        // We failed to connect so we must clean this up differently then just relying on the
+        // desturctor because the Disconnect() method called by the destructor will try and
         // send a control packet which we don't want.
         mServer->close_writer();
         mServer->close_reader();

Modified: trunk/MgDev/Common/MapGuideCommon/Services/SiteManager.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/SiteManager.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MapGuideCommon/Services/SiteManager.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -327,7 +327,7 @@
                 length - MgSiteInfo::HexStringLength, MgSiteInfo::HexStringLength);
             Ptr<MgSiteInfo> siteInfo = GetSiteInfo(siteHexString);
 
-			if ((NULL != siteInfo.p) && (MgSiteInfo::Ok == siteInfo->GetStatus()))
+            if ((NULL != siteInfo.p) && (MgSiteInfo::Ok == siteInfo->GetStatus()))
             {
                 connProps = GetConnectionProperties(userInfo, siteInfo, portType);
             }
@@ -560,7 +560,7 @@
 {
     // Need a thread manager
     ACE_Thread_Manager* manager = ACE_Thread_Manager::instance();
-    
+
     // Create the background thread
     manager->spawn(ACE_THR_FUNC(CheckServers), &m_threadData);
 }

Modified: trunk/MgDev/Common/MapGuideCommon/Services/SqlResult.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/SqlResult.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MapGuideCommon/Services/SqlResult.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -62,7 +62,7 @@
         delete this;
     }
 
-    
+
     void Deserialize(MgStream* stream);
     void Serialize(MgStream* stream);
 

Modified: trunk/MgDev/Common/MapGuideCommon/System/UserInformation.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/System/UserInformation.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MapGuideCommon/System/UserInformation.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -79,7 +79,7 @@
 /// <summary>
 /// Copy constructor.
 /// </summary>
-MgUserInformation::MgUserInformation(const MgUserInformation& userInfo) 
+MgUserInformation::MgUserInformation(const MgUserInformation& userInfo)
 {
     *this = userInfo;
 }
@@ -99,7 +99,7 @@
 /// <summary>
 /// Assignment operator.
 /// </summary>
-MgUserInformation& MgUserInformation::operator=(const MgUserInformation& userInfo) 
+MgUserInformation& MgUserInformation::operator=(const MgUserInformation& userInfo)
 {
     if (&userInfo != this)
     {

Modified: trunk/MgDev/Common/MdfModel/PrintLayout/DataConfiguration.h
===================================================================
--- trunk/MgDev/Common/MdfModel/PrintLayout/DataConfiguration.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MdfModel/PrintLayout/DataConfiguration.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -69,7 +69,7 @@
 
 inline const MdfString& DataConfiguration::GetFeatureClass() const
 {
-    return m_featureClass;                              
+    return m_featureClass;
 }
 
 inline const MdfString& DataConfiguration::GetGeometry() const

Modified: trunk/MgDev/Common/MdfModel/PrintLayout/PrintLayoutElement.h
===================================================================
--- trunk/MgDev/Common/MdfModel/PrintLayout/PrintLayoutElement.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MdfModel/PrintLayout/PrintLayoutElement.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -76,7 +76,7 @@
     double m_width;
     double m_height;
     double m_rotation;
-    MdfString m_units;  
+    MdfString m_units;
     bool m_isVisible;
     double m_opacity;
     StringObjectCollection m_references;

Modified: trunk/MgDev/Common/MdfModel/PrintLayout/PropertyMapping.h
===================================================================
--- trunk/MgDev/Common/MdfModel/PrintLayout/PropertyMapping.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MdfModel/PrintLayout/PropertyMapping.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -61,7 +61,7 @@
 // Inline Methods
 inline const MdfString& PropertyMapping::GetTargetProperty() const
 {
-    return m_targetProperty;                              
+    return m_targetProperty;
 }
 
 inline const MdfString& PropertyMapping::GetSourceProperty() const

Modified: trunk/MgDev/Common/MdfParser/Common/IOExtent3D.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/Common/IOExtent3D.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MdfParser/Common/IOExtent3D.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -48,7 +48,7 @@
     case eExtent:
         m_startElemName = name;
         break;
-    
+
     case eMin:
         {
             IOPoint3D* IO = new IOPoint3D(m_extent->GetMinimumPoint(), m_version);
@@ -56,7 +56,7 @@
             IO->StartElement(name, handlerStack);
         }
         break;
-    
+
     case eMax:
         {
             IOPoint3D* IO = new IOPoint3D(m_extent->GetMaximumPoint(), m_version);

Modified: trunk/MgDev/Common/MdfParser/Common/IOStringObjectCollection.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/Common/IOStringObjectCollection.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MdfParser/Common/IOStringObjectCollection.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -36,7 +36,7 @@
 void IOStringObjectCollection::StartElement(const wchar_t* name, HandlerStack* handlerStack)
 {
     m_currElemName = name;
-    
+
     if (m_currElemName == m_colName)
     {
         m_startElemName = name;

Modified: trunk/MgDev/Common/MdfParser/PrintLayout/IOMapView.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/PrintLayout/IOMapView.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MdfParser/PrintLayout/IOMapView.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -54,7 +54,7 @@
     case eMapView:
         m_startElemName = name;
         break;
-    
+
     case eCenter:
         {
             IOPoint3D* IO = new IOPoint3D(m_mapView->GetCenter(), m_version);
@@ -62,7 +62,7 @@
             IO->StartElement(name, handlerStack);
         }
         break;
-    
+
     case eViewDirection:
         {
             IOVector3D* IO = new IOVector3D(m_mapView->GetViewDirection(), m_version);
@@ -70,7 +70,7 @@
             IO->StartElement(name, handlerStack);
         }
         break;
-    
+
     case eExtendedData1:
         m_procExtData = true;
         break;

Modified: trunk/MgDev/Common/MdfParser/PrintLayout/IOMapViewportDefinition.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/PrintLayout/IOMapViewportDefinition.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MdfParser/PrintLayout/IOMapViewportDefinition.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -66,7 +66,7 @@
             IO->StartElement(name, handlerStack);
         }
         break;
-    
+
     case eMapView:
         {
             IOMapView* IO = new IOMapView(GetMapViewportDefinition()->GetMapView(), m_version);
@@ -74,7 +74,7 @@
             IO->StartElement(name, handlerStack);
         }
         break;
-    
+
     case eMapName:
     case eLocked:
     case eOn:

Modified: trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutDefinition.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutDefinition.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutDefinition.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -62,7 +62,7 @@
     case ePrintLayoutDefinition:
         m_startElemName = name;
         break;
-    
+
     case eExtent:
         {
             IOExtent3D* IO = new IOExtent3D(m_layoutDef->GetExtent(), m_version);
@@ -70,7 +70,7 @@
             IO->StartElement(name, handlerStack);
         }
         break;
-    
+
     case eElements:
         {
             IOPrintLayoutElementCollection* IO = new IOPrintLayoutElementCollection(m_layoutDef->GetElements(), m_version);
@@ -78,7 +78,7 @@
             IO->StartElement(name, handlerStack);
         }
         break;
-    
+
     case ePaperSize:
         {
             IOSize2D* IO = new IOSize2D(m_layoutDef->GetPaperSize(), m_version);
@@ -86,7 +86,7 @@
             IO->StartElement(name, handlerStack);
         }
         break;
-    
+
     case ePaperMargin:
         {
             IOThickness* IO = new IOThickness(m_layoutDef->GetPaperMargin(), m_version);
@@ -94,7 +94,7 @@
             IO->StartElement(name, handlerStack);
         }
         break;
-    
+
     case eBackgroundColor:
         {
             IOColor* IO = new IOColor(m_layoutDef->GetBackgroundColor(), m_version);
@@ -102,7 +102,7 @@
             IO->StartElement(name, handlerStack);
         }
         break;
-    
+
     case eExtendedData1:
         m_procExtData = true;
         break;

Modified: trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementCollection.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementCollection.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementCollection.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -72,7 +72,7 @@
             IO->StartElement(name, handlerStack);
         }
         break;
-    
+
     case eReferences:
         {
             IOStringObjectCollection* IO = new IOStringObjectCollection(m_currElem->GetReferences(), m_version, sReferences, sName);
@@ -80,7 +80,7 @@
             IO->StartElement(name, handlerStack);
         }
         break;
-    
+
     case eExtendedData1:
         m_procExtData = true;
         break;
@@ -207,7 +207,7 @@
 
         // Property: References
         IOStringObjectCollection::Write(fd, layoutElem->GetReferences(), version, sReferences, sName);
-    
+
         // Write any unknown XML / extended data
         IOUnknown::Write(fd, layoutElem->GetUnknownXml(), version);
 

Modified: trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementDefinition.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementDefinition.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementDefinition.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -61,7 +61,7 @@
             IO->StartElement(name, handlerStack);
         }
         break;
-    
+
     case eData:
         {
             IODataConfiguration* IO = new IODataConfiguration(m_layoutElemDef->GetDataConfiguration(), m_version);

Modified: trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementStyle.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementStyle.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementStyle.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -52,7 +52,7 @@
     case eNorthArrowStyle:
         m_startElemName = name;
         break;
-    
+
     case eExtendedData1:
         m_procExtData = true;
         break;

Modified: trunk/MgDev/Common/PlatformBase/Exception/FdoException.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/Exception/FdoException.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Exception/FdoException.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -40,7 +40,7 @@
     INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
     CREFSTRING whyMessageId, MgStringCollection* whyArguments, INT64 nativeErrorCode) throw() :
     MgThirdPartyException(methodName, lineNumber, fileName,
-        whatArguments, whyMessageId, whyArguments), 
+        whatArguments, whyMessageId, whyArguments),
     m_nativeErrorCode(nativeErrorCode)
 {
 }

Modified: trunk/MgDev/Common/PlatformBase/Makefile.am
===================================================================
--- trunk/MgDev/Common/PlatformBase/Makefile.am	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Makefile.am	2010-01-09 08:30:45 UTC (rev 4507)
@@ -258,7 +258,7 @@
   -lMgMdfModel \
   -lMgMdfParser \
   -lMgFoundation \
-  -lMgGeometry 
+  -lMgGeometry
 
 libMgPlatformBase_la_LDFLAGS = -version-info 7:0:0 \
   -L../../Oem/ACE/ACE_wrappers/ace \
@@ -267,4 +267,3 @@
   -L../../Common/CoordinateSystem \
   -L../MdfParser \
   -L../MdfModel
-  

Modified: trunk/MgDev/Common/PlatformBase/MapLayer/LayerBase.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/MapLayer/LayerBase.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/MapLayer/LayerBase.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -571,7 +571,7 @@
     Ptr<MgByteReader> reader = svcResource->GetResourceContent(resId, L"");
     Ptr<MgByteSink> sink = new MgByteSink(reader);
     Ptr<MgByte> bytes = sink->ToBuffer();
- 
+
     assert(bytes->GetLength() > 0);
 
     MdfParser::SAX2Parser parser;

Modified: trunk/MgDev/Common/PlatformBase/Services/FeatureDefs.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/FeatureDefs.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/FeatureDefs.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -74,7 +74,7 @@
     static const int UpdateFeaturesWithTransaction_Id     = 0x1111ED2B;
     static const int ExecuteSqlNonQueryWithTransaction_Id = 0x1111ED2C;
     static const int ExecuteSqlQueryWithTransaction_Id    = 0x1111ED2D;
-    
+
 };
 /// \endcond
 

Modified: trunk/MgDev/Common/PlatformBase/Services/FeatureQueryOptions.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/FeatureQueryOptions.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/FeatureQueryOptions.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -208,12 +208,12 @@
 
 //////////////////////////////////////////////////////////////////////////////
 /// <summary>
-/// For queries that return a large number of objects 
+/// For queries that return a large number of objects
 /// some feature sources support improving performance by setting
 /// fetch size in order to reduce the number of database server
-/// round trips required to satisfy the selection criteria. 
+/// round trips required to satisfy the selection criteria.
 /// Providers that do not use a fetch size will ignore the fetch
-/// size parameter.  This does not affect the actual results of 
+/// size parameter.  This does not affect the actual results of
 /// queries as it is a performance tuning parameter.
 /// </summary>
 /// <param name="fetchSize">

Modified: trunk/MgDev/Common/PlatformBase/Services/FeatureQueryOptions.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/FeatureQueryOptions.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/FeatureQueryOptions.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -484,12 +484,12 @@
 
     //////////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// For queries that return a large number of objects 
+    /// For queries that return a large number of objects
     /// some feature sources support improving performance by setting
     /// fetch size in order to reduce the number of database server
-    /// round trips required to satisfy the selection criteria. 
+    /// round trips required to satisfy the selection criteria.
     /// Providers that do not use a fetch size will ignore the fetch
-    /// size parameter. This does not affect the actual results of 
+    /// size parameter. This does not affect the actual results of
     /// queries as it is a performance tuning parameter.
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->

Modified: trunk/MgDev/Common/PlatformBase/Services/FeatureReader.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/FeatureReader.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/FeatureReader.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -338,7 +338,7 @@
     ///
     virtual MgFeatureReader* GetFeatureObject(CREFSTRING propertyName) = 0;
 
-	///////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////
     /// \brief
     /// Use this method to obtain the values of the properties
     /// belonging to an object contained in the feature class
@@ -392,7 +392,7 @@
     ///
     virtual BYTE_ARRAY_OUT GetGeometry(CREFSTRING propertyName, INT32& length) = 0;
 
-	//////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////
     /// \brief
     /// Gets the Geometry for the specified property. No conversion is
     /// performed, thus the property must be a of type Geometry or the result

Modified: trunk/MgDev/Common/PlatformBase/Services/FeatureService.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/FeatureService.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/FeatureService.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -846,7 +846,7 @@
     /// \brief
     /// Executes the MgDeleteFeatures, MgInsertFeatures,
     /// MgUpdateFeatures, MgLockFeatures or MgUnlockFeatures commands
-    /// contained in the given MgFeatureCommandCollection object within 
+    /// contained in the given MgFeatureCommandCollection object within
     /// the given transaction.
     ///
     /// \remarks
@@ -1062,7 +1062,7 @@
     /// \param parameters (MgParameterCollection)
     /// Parameters binded to the SQL statement.
     /// \param transaction (MgTransaction)
-    /// The MgTransaction instance on which the sql 
+    /// The MgTransaction instance on which the sql
     /// statement will be executed.
     ///
     /// \return
@@ -1144,7 +1144,7 @@
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
     /// \brief
-    /// Executes SQL statements NOT including SELECT statements 
+    /// Executes SQL statements NOT including SELECT statements
     /// within the given transaction.
     ///
     /// \remarks
@@ -1171,7 +1171,7 @@
     /// \param parameters (MgParameterCollection)
     /// Parameters binded to the SQL statement.
     /// \param transaction (MgTransaction)
-    /// The MgTransaction instance on which the sql 
+    /// The MgTransaction instance on which the sql
     /// statement will be executed.
     ///
     /// \return
@@ -1423,10 +1423,10 @@
     ///
     /// \remarks
     /// MgFeatureSourceParams is an abstract class. Currently there
-    /// are two concrete classes MgFileFeatureSourceParams and 
-    /// MgCreateSdfParams and SDF, SHP and SQLite feature source can 
-    /// be created only. If no well-know text format coordinate 
-    /// system is specified in argument sourceParams, this method 
+    /// are two concrete classes MgFileFeatureSourceParams and
+    /// MgCreateSdfParams and SDF, SHP and SQLite feature source can
+    /// be created only. If no well-know text format coordinate
+    /// system is specified in argument sourceParams, this method
     /// will not create spatial context for the feature source. For
     /// SHP feature source, a feature class must be specified.
     /// Otherwise, an MgInvalidArgumentException will be thrown.
@@ -1604,17 +1604,17 @@
     // Commit the transaction specified by the transaction id.
     virtual bool CommitTransaction(CREFSTRING transactionId) = 0;
 
-    // Rollback the transaction specified by the transaction id. 
+    // Rollback the transaction specified by the transaction id.
     virtual bool RollbackTransaction(CREFSTRING transactionId) = 0;
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
     /// \brief
     /// Executes the SQL SELECT statement on the specified feature
-    /// source within the given transaction. For queries that return 
-    /// a large number of objects some feature sources support 
+    /// source within the given transaction. For queries that return
+    /// a large number of objects some feature sources support
     /// improving performance by setting fetch size in order to reduce
-    /// the number of database server round trips required to satisfy 
-    /// the selection criteria. Providers that do not use a fetch size 
+    /// the number of database server round trips required to satisfy
+    /// the selection criteria. Providers that do not use a fetch size
     /// will ignore the fetch size parameter.
     ///
     /// \remarks
@@ -1640,10 +1640,10 @@
     /// \param parameters (MgParameterCollection)
     /// Parameters binded to the SQL statement.
     /// \param transaction (MgTransaction)
-    /// The MgTransaction instance on which the sql 
+    /// The MgTransaction instance on which the sql
     /// statement will be executed.
     /// \param fetchSize (int)
-    /// The fetch size of query. This method returns all data 
+    /// The fetch size of query. This method returns all data
     /// of query if setting the fetch size to 0.
     ///
     /// \return

Modified: trunk/MgDev/Common/PlatformBase/Services/Parameter.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/Parameter.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/Parameter.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -29,7 +29,7 @@
 /// name, value, and direction.
 /// </summary>
 /// <param name="prop">
-/// An MgNullableProperty instance which contains 
+/// An MgNullableProperty instance which contains
 /// the name and value of the parameter.
 /// </param>
 /// <param name="direction">
@@ -48,7 +48,7 @@
 /// is input.
 /// </summary>
 /// <param name="prop">
-/// An MgNullableProperty instance which contains 
+/// An MgNullableProperty instance which contains
 /// the name and value of the parameter.
 /// </param>
 MgParameter::MgParameter(MgNullableProperty* prop)
@@ -175,7 +175,7 @@
 /// Gets the name and value of the parameter.
 /// </summary>
 /// <returns>
-/// Returns an MgNullableProperty instance which contains 
+/// Returns an MgNullableProperty instance which contains
 /// the name and value of the parameter.
 /// </returns>
 MgNullableProperty* MgParameter::GetProperty()
@@ -189,7 +189,7 @@
 /// Sets the name and value of the parameter.
 /// </summary>
 /// <param name="value">
-/// Input an MgNullableProperty instance which contains 
+/// Input an MgNullableProperty instance which contains
 /// the name and value of the parameter.
 /// </param>
 /// <returns>

Modified: trunk/MgDev/Common/PlatformBase/Services/Parameter.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/Parameter.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/Parameter.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -52,7 +52,7 @@
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \param name (MgNullableProperty)
-    /// An MgNullableProperty instance which contains 
+    /// An MgNullableProperty instance which contains
     /// the name and value of the parameter.
     ///
     MgParameter(MgNullableProperty* prop);
@@ -74,7 +74,7 @@
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \param name (MgNullableProperty)
-    /// An MgNullableProperty instance which contains 
+    /// An MgNullableProperty instance which contains
     /// the name and value of the parameter.
     /// \param value (int)
     /// The function direction of the parameter value.
@@ -95,14 +95,14 @@
     /// \htmlinclude PHPSyntaxTop.html
     /// void SetProperty(MgNullableProperty prop);
     /// \htmlinclude SyntaxBottom.html
-    /// 
-    /// \param value 
-    /// Input an MgNullableProperty instance which contains 
+    ///
+    /// \param value
+    /// Input an MgNullableProperty instance which contains
     /// the name and value of the parameter.
-    /// 
+    ///
     /// \return
     /// Returns nothing
-    /// 
+    ///
     void SetProperty(MgNullableProperty* prop);
 
     ///////////////////////////////////////////////////////////////////
@@ -119,11 +119,11 @@
     /// \htmlinclude PHPSyntaxTop.html
     /// MgNullableProperty GetProperty();
     /// \htmlinclude SyntaxBottom.html
-    /// 
+    ///
     /// \return
-    /// Returns an MgNullableProperty instance which contains 
+    /// Returns an MgNullableProperty instance which contains
     /// the name and value of the parameter.
-    /// 
+    ///
     MgNullableProperty* GetProperty();
 
     ///////////////////////////////////////////////////////////////////
@@ -141,13 +141,13 @@
     /// \htmlinclude PHPSyntaxTop.html
     /// void SetDirection(int value);
     /// \htmlinclude SyntaxBottom.html
-    /// 
-    /// \param value 
+    ///
+    /// \param value
     /// Input the direction value.
-    /// 
+    ///
     /// \return
     /// Returns nothing.
-    /// 
+    ///
     void SetDirection(INT32 value);
 
     ///////////////////////////////////////////////////////////////////
@@ -165,10 +165,10 @@
     /// \htmlinclude PHPSyntaxTop.html
     /// int GetDirection();
     /// \htmlinclude SyntaxBottom.html
-    /// 
+    ///
     /// \return
     /// Returns the direction value defined in MgParameterDirection.
-    /// 
+    ///
     INT32 GetDirection();
 
     //////////////////////////////////////////////////////////////////

Modified: trunk/MgDev/Common/PlatformBase/Services/ParameterCollection.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/ParameterCollection.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/ParameterCollection.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -31,8 +31,8 @@
 /// All parameters contained in an instance of a parameter
 /// collection are objects whose base class is MgParameter.
 /// A call to a parameter object's GetType() method returns one
-/// of the integer constants defined in class MgPropertyType. 
-/// This collection does not allow duplicate key names. 
+/// of the integer constants defined in class MgPropertyType.
+/// This collection does not allow duplicate key names.
 ///
 /// \note
 /// Collections are <i>not</i> thread safe and ordered in the sequence of add operation.
@@ -45,7 +45,7 @@
 PUBLISHED_API:
     //////////////////////////////////////////////////////////
     /// \brief
-    /// Constructs a MgParameterCollection. 
+    /// Constructs a MgParameterCollection.
     /// The collection is initially empty.
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->

Modified: trunk/MgDev/Common/PlatformBase/Services/ParameterDirection.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/ParameterDirection.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/ParameterDirection.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -24,8 +24,8 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// The MgParameterDirection defines integer constants used to signify the 
-/// direction in which a parameter value will be used within the context of a 
+/// The MgParameterDirection defines integer constants used to signify the
+/// direction in which a parameter value will be used within the context of a
 /// FDO Command.
 class MG_FOUNDATION_API MgParameterDirection
 {

Modified: trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/MapViewportBase.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/MapViewportBase.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/MapViewportBase.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -163,7 +163,7 @@
             throw new MgInvalidResourceTypeException(L"MgMapViewportBase.PopulateFromResource",
                 __LINE__, __WFILE__, NULL, L"", NULL);
         }
-        
+
         m_isOn = mapViewport->GetIsOn();
         m_isLocked = mapViewport->GetIsLocked();
         m_mapName = mapViewport->GetMapName();

Modified: trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutBase.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutBase.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutBase.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -173,7 +173,7 @@
     stream->WriteString(m_mediaName);
     stream->WriteString(m_deviceName);
     stream->WriteString(m_orientation);
-    
+
     stream->WriteObject(m_backgroundColor);
     stream->WriteObject(m_paperSize);
     stream->WriteObject(m_paperMargin);
@@ -222,7 +222,7 @@
 ///
 void MgPrintLayoutBase::ForceRefresh(MgResourceService* resourceService)
 {
-    if (NULL != m_resId.p) 
+    if (NULL != m_resId.p)
     {
         this->Open(resourceService, m_resId);
     }
@@ -244,7 +244,7 @@
     MdfParser::SAX2Parser parser;
     parser.ParseString(strXml.c_str(), strXml.length());
 
-    if (!parser.GetSucceeded()) 
+    if (!parser.GetSucceeded())
     {
         STRING errorMsg = parser.GetErrorMessage();
         MgStringCollection arguments;
@@ -336,7 +336,7 @@
 
         Ptr<MgCoordinateXYZ> lowerLeft  = new MgCoordinateXYZ(minPt->GetX(), minPt->GetY(), minPt->GetZ());
         Ptr<MgCoordinateXYZ> upperRight = new MgCoordinateXYZ(maxPt->GetX(), maxPt->GetY(), maxPt->GetZ());
-    
+
         m_extent = new MgEnvelope(lowerLeft, upperRight);
     }
 }

Modified: trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -327,7 +327,7 @@
 {
     return SAFE_ADDREF(m_references.p);
 }
-    
+
 ///////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Sets the references.
@@ -336,7 +336,7 @@
 {
     m_references = SAFE_ADDREF(references);
 }
-    
+
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Gets the description.
@@ -345,7 +345,7 @@
 {
     return m_description;
 }
-    
+
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
 /// Gets the fully qualified feature class from which to retrieve data.
@@ -411,7 +411,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Gets the property mappings between feature class properties and print layout 
+/// Gets the property mappings between feature class properties and print layout
 /// element properties.
 ///
 MgPropertyMappingCollection* MgPrintLayoutElementBase::GetPropertyMappings()
@@ -432,7 +432,7 @@
     MdfParser::SAX2Parser parser;
     parser.ParseString(strXml.c_str(), strXml.length());
 
-    if (!parser.GetSucceeded()) 
+    if (!parser.GetSucceeded())
     {
         STRING errorMsg = parser.GetErrorMessage();
         MgStringCollection arguments;
@@ -469,7 +469,7 @@
     if (NULL != elementDef)
     {
         STRING resourceId;
-        
+
         m_type = elementDef->GetType();
         m_description = elementDef->GetDescription();
 
@@ -505,7 +505,7 @@
                     }
                 }
             }
-        }        
+        }
 
         StylizationConfiguration* stylizationConf = elementDef->GetStylizationConfiguration();
         if (NULL != stylizationConf)
@@ -519,7 +519,7 @@
             {
                 m_stylization = new MgResourceIdentifier(resourceId);
             }
-        }        
+        }
 
         resourceId = elementDef->GetResourceId();
         if (resourceId.empty())

Modified: trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -36,7 +36,7 @@
     DECLARE_CLASSNAME(MgPrintLayoutElementBase)
 
 INTERNAL_API:
-    
+
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
     /// Constructs an MgPrintLayoutElementBase object.
@@ -138,7 +138,7 @@
     /// Gets the units.
     ///
     virtual STRING GetUnits();
-    
+
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
     /// Sets the units.
@@ -174,19 +174,19 @@
     /// Gets the references.
     ///
     virtual MgStringCollection* GetReferences();
-    
+
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
     /// Sets the references.
     ///
     virtual void SetReferences(MgStringCollection* references);
-    
+
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
     /// Gets the description of this element
     ///
     virtual STRING GetDescription();
-    
+
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
     /// Gets the resource ID of this element's element style resource
@@ -212,14 +212,14 @@
     /// feature data
     ///
     virtual MgResourceIdentifier* GetFeatureSource();
-    
+
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
     /// Gets the fully qualified feature class name used to retrieve feature
     /// data for this element
     ///
     virtual STRING GetFeatureClass();
-    
+
     ///////////////////////////////////////////////////////////////////////////
     /// \brief
     /// Gets the geometry property to use to retrieve features from the feature

Modified: trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -67,7 +67,7 @@
 {
     assert(NULL != resourceService && !resourceXml.empty());
     Ptr<MgPrintLayoutElementBase> printLayoutElement;
-    
+
     // Parse the resource XML.
     string strXml = MgUtil::WideCharToMultiByte(resourceXml);
     MdfParser::SAX2Parser parser;

Modified: trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -130,7 +130,7 @@
     ///
     virtual void Dispose();
 
-    virtual MgPrintLayoutBase* RealizePrintLayout(MgResourceService* resourceService, 
+    virtual MgPrintLayoutBase* RealizePrintLayout(MgResourceService* resourceService,
         CREFSTRING resourceXml) = 0;
 
     virtual MgPrintLayoutElementBase* RealizePrintLayoutElement(MgResourceService* resourceService,

Modified: trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PropertyMapping.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PropertyMapping.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/PrintLayoutService/PropertyMapping.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -68,7 +68,7 @@
     /// \brief
     /// Gets the target property in this class.
     ///
-    STRING GetTargetProperty();  
+    STRING GetTargetProperty();
 
 INTERNAL_API:
 

Modified: trunk/MgDev/Common/PlatformBase/Services/RasterPropertyDefinition.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/RasterPropertyDefinition.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/RasterPropertyDefinition.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -268,7 +268,7 @@
     /// Returns nothing.
     ///
     void SetDefaultImageYSize (INT32 size);
-    
+
     //////////////////////////////////////////////////////////////////////////////
     /// \brief
     /// Sets a Spatial Context association for this raster

Modified: trunk/MgDev/Common/PlatformBase/Services/ResourceService.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/ResourceService.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/PlatformBase/Services/ResourceService.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -999,8 +999,8 @@
     /// \param preProcessTags
     /// Pre-processing to apply to resource before returning content.
     /// If this parameter is NULL, it means no pre-processing.
-    /// If this parameter is not NULL, it must be a collection of pre-processing types, and it should be 
-    /// one to one matching the collection of parameter resources. 
+    /// If this parameter is not NULL, it must be a collection of pre-processing types, and it should be
+    /// one to one matching the collection of parameter resources.
     /// See MgResourcePreProcessingType for a list of supported pre-processing tags.
     ///
     /// \return

Modified: trunk/MgDev/Common/Renderers/AGGImageIO.cpp
===================================================================
--- trunk/MgDev/Common/Renderers/AGGImageIO.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Renderers/AGGImageIO.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -928,11 +928,11 @@
 
 
 ////////////////////////////////////////////////////////////////////////////////////////
-// convert imagebuffer src into the desired format using the provided baseColorPalette for 8bit 
+// convert imagebuffer src into the desired format using the provided baseColorPalette for 8bit
 // (the baseColorPalette is a default parameter NULL)
 RS_ByteData* AGGImageIO::Save(const RS_String& format,
                   unsigned int* src, int src_width, int src_height,
-                  int dst_width, int dst_height, RS_Color& bgColor, 
+                  int dst_width, int dst_height, RS_Color& bgColor,
                   RS_ColorVector* baseColorPalette)
 {
     bool drop_alpha = bgColor.alpha() == 255;
@@ -1028,7 +1028,7 @@
 
             // convert to 256 color paletted image for PNG8, GIF
             gdImagePtr gdImgPalette = NULL;
-            if (format == L"GIF" || format == L"PNG8") 
+            if (format == L"GIF" || format == L"PNG8")
             {
                 /// skip color quantization if no palette given or empty
                 if (baseColorPalette && !baseColorPalette->empty() && s_bUseColorMap) // memory based switch

Modified: trunk/MgDev/Common/Schema/ApplicationDefinition-1.0.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/ApplicationDefinition-1.0.0.xsd	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Schema/ApplicationDefinition-1.0.0.xsd	2010-01-09 08:30:45 UTC (rev 4507)
@@ -34,7 +34,7 @@
       <xs:element name="CenterY" type="xs:double"/>
       <xs:element name="Scale" type="xs:double"/>
     </xs:sequence>
-  </xs:complexType>  
+  </xs:complexType>
   <xs:complexType name="MapType">
     <xs:sequence>
       <xs:element name="Type" type="xs:string" />

Modified: trunk/MgDev/Common/Schema/FdoProviderCapabilities-1.0.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/FdoProviderCapabilities-1.0.0.xsd	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Schema/FdoProviderCapabilities-1.0.0.xsd	2010-01-09 08:30:45 UTC (rev 4507)
@@ -116,7 +116,7 @@
                 <xs:sequence>
                   <xs:element name="Name" maxOccurs="unbounded">
                     <xs:annotation>
-                      <xs:documentation>Following is the possible list of commands 
+                      <xs:documentation>Following is the possible list of commands
                         Select,Insert,Delete,Update,DescribeSchema,ApplySchema,DestroySchema,ActivateSpatialContext,CreateSpatialContext,DestroySpatialContext,GetSpatialContexts,
                         CreateMeasureUnit,DestroyMeasureUnit,GetMeasureUnits,SQLCommand,AcquireLock,GetLockInfo,GetLockedObjects,GetLockOwners,ReleaseLock,
                         ActivateLongTransaction,CommitLongTransaction,CreateLongTransaction,GetLongTransactions,FreezeLongTransaction,RollbackLongTransaction,

Modified: trunk/MgDev/Common/Schema/FdoProviderCapabilities-1.1.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/FdoProviderCapabilities-1.1.0.xsd	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Common/Schema/FdoProviderCapabilities-1.1.0.xsd	2010-01-09 08:30:45 UTC (rev 4507)
@@ -135,7 +135,7 @@
                   </xs:sequence>
                 </xs:complexType>
              </xs:element>
-            <xs:element name="SupportsSchemaModification" type="xs:boolean"/>          
+            <xs:element name="SupportsSchemaModification" type="xs:boolean"/>
           </xs:sequence>
         </xs:complexType>
       </xs:element>
@@ -348,7 +348,7 @@
                           </xs:simpleType>
                         </xs:element>
                         <xs:element name="IsAggregate" type="xs:boolean"/>
-                        <xs:element name="IsSupportsVariableArgumentsList" type="xs:boolean" minOccurs="0"/>                        
+                        <xs:element name="IsSupportsVariableArgumentsList" type="xs:boolean" minOccurs="0"/>
                         <xs:element name="SignatureDefinitionCollection" minOccurs="0">
                           <xs:complexType>
                             <xs:sequence>
@@ -391,11 +391,11 @@
                                         </xs:restriction>
                                       </xs:simpleType>
                                     </xs:element>
-                                    <xs:element name="ArgumentDefinitionList" minOccurs="0">     
+                                    <xs:element name="ArgumentDefinitionList" minOccurs="0">
                                         <xs:complexType>
                                           <xs:sequence>
                                             <xs:element name="Name" type="xs:string"/>
-                                            <xs:element name="Description" type="xs:string" minOccurs="0"/>                                            
+                                            <xs:element name="Description" type="xs:string" minOccurs="0"/>
                                             <xs:element name="ArgumentDefinition" maxOccurs="unbounded">
                                               <xs:complexType>
                                               <xs:sequence>
@@ -442,7 +442,7 @@
                                                     <xs:sequence>
                                                       <xs:element name="Value" type="xs:string" maxOccurs="unbounded">
                                                       </xs:element>
-                                                    </xs:sequence> 
+                                                    </xs:sequence>
                                                   </xs:complexType>
                                                 </xs:element>
                                               </xs:sequence>
@@ -483,13 +483,13 @@
                                                     <xs:enumeration value="UniqueID"/>
                                                   </xs:restriction>
                                                 </xs:simpleType>
-                                            </xs:element>                                            
+                                            </xs:element>
                                           </xs:sequence>
                                         </xs:complexType>
                                        </xs:element>
-                                  </xs:sequence>  
+                                  </xs:sequence>
                                 </xs:complexType>
-                              </xs:element>  
+                              </xs:element>
                             </xs:sequence>
                           </xs:complexType>
                         </xs:element>

Modified: trunk/MgDev/Server/RepositoryAdmin/license.txt
===================================================================
--- trunk/MgDev/Server/RepositoryAdmin/license.txt	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/RepositoryAdmin/license.txt	2010-01-09 08:30:45 UTC (rev 4507)
@@ -1,7 +1,7 @@
--------------------------------------------------------------------- 
+--------------------------------------------------------------------
                   The PHP License, Version 3.0
 Copyright (c) 1999 - 2003 The PHP Group. All rights reserved.
--------------------------------------------------------------------- 
+--------------------------------------------------------------------
 
 Redistribution and use in source and binary forms, with or without
 modification, is permitted provided that the following conditions
@@ -9,22 +9,22 @@
 
   1. Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
- 
+
   2. Redistributions in binary form must reproduce the above copyright
      notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the
      distribution.
- 
+
   3. The name "PHP" must not be used to endorse or promote products
      derived from this software without prior written permission. For
      written permission, please contact group at php.net.
-  
+
   4. Products derived from this software may not be called "PHP", nor
      may "PHP" appear in their name, without prior written permission
      from group at php.net.  You may indicate that your software works in
      conjunction with PHP by saying "Foo for PHP" instead of calling
      it "PHP Foo" or "phpfoo"
- 
+
   5. The PHP Group may publish revised and/or new versions of the
      license from time to time. Each version will be given a
      distinguishing version number.
@@ -41,27 +41,27 @@
      "This product includes PHP, freely available from
      <http://www.php.net/>".
 
-THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
 ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
 PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
-DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
 
--------------------------------------------------------------------- 
+--------------------------------------------------------------------
 
 This software consists of voluntary contributions made by many
 individuals on behalf of the PHP Group.
 
 The PHP Group can be contacted via Email at group at php.net.
 
-For more information on the PHP Group and the PHP project, 
+For more information on the PHP Group and the PHP project,
 please see <http://www.php.net>.
 
 This product includes the Zend Engine, freely available at

Modified: trunk/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -654,7 +654,7 @@
                                 INT32 useLimit = providerInfo->GetUseLimit();
                                 if (useLimit == -1 || pFdoConnectionCacheEntry->nUseTotal <= useLimit)
                                 {
-                                    if((!pFdoConnectionCacheEntry->bInUse) || 
+                                    if((!pFdoConnectionCacheEntry->bInUse) ||
                                        (providerInfo->GetThreadModel() == FdoThreadCapability_PerCommandThreaded) ||
                                        (providerInfo->GetThreadModel() == FdoThreadCapability_MultiThreaded))
                                     {

Modified: trunk/MgDev/Server/src/Common/Manager/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/Makefile.am	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Common/Manager/Makefile.am	2010-01-09 08:30:45 UTC (rev 4507)
@@ -64,7 +64,6 @@
   UserInfo.cpp \
   WorkerThread.cpp \
   WorkerThreadData.cpp
-  
 
 noinst_HEADERS = $(include_SOURCES) \
   CacheManager.h \

Modified: trunk/MgDev/Server/src/Core/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Core/Makefile.am	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Core/Makefile.am	2010-01-09 08:30:45 UTC (rev 4507)
@@ -407,7 +407,7 @@
 	@echo 'export LD_LIBRARY_PATH=$(fdodir):"$$LD_LIBRARY_PATH"' >> ${prefix}/bin/mgserver.sh
 	@echo 'ulimit -s 1024' >> ${prefix}/bin/mgserver.sh
 	@echo 'pushd ${prefix}/bin' >> ${prefix}/bin/mgserver.sh
-	@cp -f ${prefix}/bin/mgserver.sh ${prefix}/bin/mgserverd.sh 
+	@cp -f ${prefix}/bin/mgserver.sh ${prefix}/bin/mgserverd.sh
 	@echo './mgserver run' >> ${prefix}/bin/mgserver.sh
 	@echo './mgserver daemon' >> ${prefix}/bin/mgserverd.sh
 	@echo 'popd' >> ${prefix}/bin/mgserver.sh

Modified: trunk/MgDev/Server/src/Core/serverconfig.ini
===================================================================
--- trunk/MgDev/Server/src/Core/serverconfig.ini	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Core/serverconfig.ini	2010-01-09 08:30:45 UTC (rev 4507)
@@ -253,12 +253,12 @@
 #                                       0 < Value <= 2147483647
 # JoinQueryBatchSize               Join query batch size
 #                                       1 < Value <= 10000
-# DataTransactionTimeout          Time duration in seconds for when an idle FDO 
-#                                  transaction is dropped 
-#                                       0 < Value <= 1800 
-# DataTransactionTimerInterval  Time interval in seconds for when the server 
-#                                  checks for idle FDO transactions 
-#                                       0 < Value <= 1800 
+# DataTransactionTimeout          Time duration in seconds for when an idle FDO
+#                                  transaction is dropped
+#                                       0 < Value <= 1800
+# DataTransactionTimerInterval  Time interval in seconds for when the server
+#                                  checks for idle FDO transactions
+#                                       0 < Value <= 1800
 # *****************************************************************************
 CacheSize                          = 100
 CacheTimeLimit                     = 86400
@@ -271,8 +271,8 @@
 DataConnectionTimeout              = 28800
 DataConnectionTimerInterval        = 3600
 JoinQueryBatchSize                 = 1000
-DataTransactionTimeout             = 360 
-DataTransactionTimerInterval       = 60 
+DataTransactionTimeout             = 360
+DataTransactionTimerInterval       = 60
 
 [MappingServiceProperties]
 # *****************************************************************************

Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFlatFdoReader.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFlatFdoReader.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFlatFdoReader.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -170,7 +170,7 @@
     if (index < m_names->GetCount() && index >= 0)
         return m_names->GetString(index);
 
-    return L""; // throw exception? 
+    return L""; // throw exception?
 }
 
 FdoInt32 CGwsFlatFdoReader::GetPropertyIndex(FdoString* propertyName)

Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsMultiSelectIterator.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsMultiSelectIterator.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsMultiSelectIterator.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -296,14 +296,14 @@
 
 FdoString * CGwsMultiSelectIterator::GetPropertyName(FdoInt32 index)
 {
-	CheckIterator ();
-	return m_iter->GetPropertyName(index);
+    CheckIterator ();
+    return m_iter->GetPropertyName(index);
 }
 
 FdoInt32 CGwsMultiSelectIterator::GetPropertyIndex(FdoString* propertyName)
 {
-	CheckIterator ();
-	return m_iter->GetPropertyIndex(propertyName);
+    CheckIterator ();
+    return m_iter->GetPropertyIndex(propertyName);
 }
 
 FdoString * CGwsMultiSelectIterator::GetString (FdoString * propname)

Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/Makefile.am	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/Makefile.am	2010-01-09 08:30:45 UTC (rev 4507)
@@ -69,7 +69,6 @@
   -I$(map_fdo_include)/ExpressionEngine \
   -I../Include \
   -I../GwsCommon/inc \
-  -I./inc 
+  -I./inc
 
 libMgGwsQueryEngine_la_LDFLAGS = -version-info 1:0:0
-

Modified: trunk/MgDev/Server/src/Gws/GwsResource/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsResource/Makefile.am	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Gws/GwsResource/Makefile.am	2010-01-09 08:30:45 UTC (rev 4507)
@@ -11,7 +11,6 @@
   GwsResource.h \
   GwsResourceLinux.h
 
-INCLUDES = -I../INCLUDE 
+INCLUDES = -I../INCLUDE
 
 libMgGwsResource_la_LDFLAGS = -version-info 1:0:0
-

Modified: trunk/MgDev/Server/src/Services/Feature/JoinFeatureReader.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/JoinFeatureReader.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/JoinFeatureReader.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -64,24 +64,24 @@
 
     /// \brief
     /// Gets the name of the property at the given ordinal position.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the position of the property.
-    /// 
+    ///
     /// \return
     /// Returns the property name
-    /// 
+    ///
     virtual FdoString* GetPropertyName(FdoInt32 index);
 
     /// \brief
     /// Gets the index of the property with the specified name.
-    /// 
-    /// \param propertyName 
+    ///
+    /// \param propertyName
     /// Input the property name.
-    /// 
+    ///
     /// \return
     /// Returns the property index
-    /// 
+    ///
     virtual FdoInt32 GetPropertyIndex(FdoString* propertyName);
 
     /// \brief
@@ -299,222 +299,222 @@
     ///
     virtual FdoIRaster* GetRaster(FdoString* propertyName);
 
-	/// \brief
-    /// Gets the geometry value of the property, at the specified index, 
-    /// as a byte array in FGF format. Because no conversion is performed, 
-    /// the property must be of Geometric type; otherwise, an exception is thrown. 
+    /// \brief
+    /// Gets the geometry value of the property, at the specified index,
+    /// as a byte array in FGF format. Because no conversion is performed,
+    /// the property must be of Geometric type; otherwise, an exception is thrown.
     /// This method is a language-specific performance optimization that returns a
     /// pointer to the array data, rather than to an object that encapsulates
     /// the array.  The array's memory area is only guaranteed to be valid
     /// until a call to ReadNext() or Close(), or the disposal of this reader
     /// object.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// \param count 
+    /// \param count
     /// Output the number of bytes in the array.
-    /// 
+    ///
     /// \return
     /// Returns a pointer to the byte array in FGF format.
-    /// 
+    ///
     virtual const FdoByte * GetGeometry(FdoInt32 index, FdoInt32* count);
 
     /// \brief
-    /// Gets the geometry value of the specified property, at the specified index, 
-    /// as a byte array in FGF format. Because no conversion is performed, the property 
+    /// Gets the geometry value of the specified property, at the specified index,
+    /// as a byte array in FGF format. Because no conversion is performed, the property
     /// must be of Geometric type; otherwise, an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the byte array in FGF format.
-    /// 
+    ///
     virtual FdoByteArray* GetGeometry(FdoInt32 index);
 
     /// \brief
     /// Gets a reference to an FdoIFeatureReader to read the data contained in
-    /// the object or object collection property defined at the specified index 
+    /// the object or object collection property defined at the specified index
     /// position. If the property is not an object property, an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the nested feature reader
-    /// 
+    ///
     virtual FdoIFeatureReader* GetFeatureObject(FdoInt32 index);
 
     /// \brief
-    /// Gets the Boolean value of the property specified at the index position. 
-    /// No conversion is performed, thus the property must be FdoDataType_Boolean 
+    /// Gets the Boolean value of the property specified at the index position.
+    /// No conversion is performed, thus the property must be FdoDataType_Boolean
     /// or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the Boolean value.
-    /// 
+    ///
     virtual FdoBoolean GetBoolean(FdoInt32 index);
 
     /// \brief
-    /// Gets the Byte value of the property specified at the index position. 
-    /// No conversion is performed, thus the property must be FdoDataType_Byte 
+    /// Gets the Byte value of the property specified at the index position.
+    /// No conversion is performed, thus the property must be FdoDataType_Byte
     /// or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the byte value.
-    /// 
+    ///
     virtual FdoByte GetByte(FdoInt32 index);
 
     /// \brief
-    /// Gets the date and time value of the of the property specified at 
-    /// the index position. No conversion is performed, thus the property 
+    /// Gets the date and time value of the of the property specified at
+    /// the index position. No conversion is performed, thus the property
     /// must be FdoDataType_DateTime or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the date and time value.
-    /// 
+    ///
     virtual FdoDateTime GetDateTime(FdoInt32 index);
 
     /// \brief
-    /// Gets the double-precision floating point value of the property specified at 
-    /// the index position. No conversion is performed, thus the property must be 
+    /// Gets the double-precision floating point value of the property specified at
+    /// the index position. No conversion is performed, thus the property must be
     /// FdoDataType_Double or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the double floating point value
-    /// 
+    ///
     virtual FdoDouble GetDouble(FdoInt32 index);
 
     /// \brief
-    /// Gets the 16-bit integer value of the property specified at 
-    /// the index position. No conversion is performed, thus the 
+    /// Gets the 16-bit integer value of the property specified at
+    /// the index position. No conversion is performed, thus the
     /// property must be FdoDataType_Int16 or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the FdoInt16 value.
-    /// 
+    ///
     virtual FdoInt16 GetInt16(FdoInt32 index);
 
     /// \brief
-    /// Gets the 32-bit integer value of the property specified at 
-    /// the index position. No conversion is performed, thus the 
+    /// Gets the 32-bit integer value of the property specified at
+    /// the index position. No conversion is performed, thus the
     /// property must be FdoDataType_Int32 or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the FdoInt32 value
-    /// 
+    ///
     virtual FdoInt32 GetInt32(FdoInt32 index);
 
     /// \brief
-    /// Gets the 64-bit integer value of the property specified at 
-    /// the index position. No conversion is performed, thus the 
+    /// Gets the 64-bit integer value of the property specified at
+    /// the index position. No conversion is performed, thus the
     /// property must be FdoDataType_Int64 or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the FdoInt64 value.
-    /// 
+    ///
     virtual FdoInt64 GetInt64(FdoInt32 index);
 
     /// \brief
-    /// Gets the Single floating point value of the property specified at 
-    /// the index position. No conversion is performed, thus the property 
+    /// Gets the Single floating point value of the property specified at
+    /// the index position. No conversion is performed, thus the property
     /// must be FdoDataType_Single or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the single value
-    /// 
+    ///
     virtual FdoFloat GetSingle(FdoInt32 index);
 
     /// \brief
     /// Gets the string value of the property specified at the index
     /// position. No conversion is performed, thus the property must
     /// be FdoDataType_String or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the string value
-    /// 
+    ///
     virtual FdoString* GetString(FdoInt32 index);
 
     /// \brief
     /// Gets a LOBValue pointer to the property specified at the index
     /// position. The LOB is fully read in and data available.
-    /// Because no conversion is performed, the property must be 
+    /// Because no conversion is performed, the property must be
     /// FdoDataType_BLOB or FdoDataType_CLOB etc. (a LOB type)
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the pointer to LOBValue
-    /// 
+    ///
     virtual FdoLOBValue* GetLOB(FdoInt32 index);
 
     /// \brief
     /// Gets a pointer to the specified LOB property, specified at the index
-    /// position. The reference is returned as an FdoBLOBStreamReader or an 
-    /// FdoCLOBStreamReader, to allow reading in blocks of data. Because 
-    /// no conversion is performed, the property must be FdoDataType_BLOB 
-    /// or FdoDataType_CLOB etc. (a LOB type) Cast the FdoIStreamReader 
+    /// position. The reference is returned as an FdoBLOBStreamReader or an
+    /// FdoCLOBStreamReader, to allow reading in blocks of data. Because
+    /// no conversion is performed, the property must be FdoDataType_BLOB
+    /// or FdoDataType_CLOB etc. (a LOB type) Cast the FdoIStreamReader
     /// to the appropriate LOB Stream Reader.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns a pointer to a LOB stream reader
-    /// 
+    ///
     virtual FdoIStreamReader* GetLOBStreamReader(FdoInt32 index);
 
     /// \brief
-    /// Returns true if the value of the property at the specified 
+    /// Returns true if the value of the property at the specified
     /// index is null.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns true if the value is null.
-    /// 
+    ///
     virtual FdoBoolean IsNull(FdoInt32 index);
 
     /// \brief
     /// Gets the raster object of the property at the specified index.
     /// Because no conversion is performed, the property must be
     /// of Raster type; otherwise, an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the raster object.
-    /// 
+    ///
     virtual FdoIRaster* GetRaster(FdoInt32 index);
 
     /// \brief

Modified: trunk/MgDev/Server/src/Services/Feature/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/Makefile.am	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/Makefile.am	2010-01-09 08:30:45 UTC (rev 4507)
@@ -24,7 +24,7 @@
   -I../../Common/Base \
   -I../../Common/Cache \
   -I../../Common/Manager \
-  -I../../Common/ServerUtil 
+  -I../../Common/ServerUtil
 
 lib_LTLIBRARIES = libMgServerFeatureService.la
 
@@ -228,7 +228,6 @@
   OpUpdateFeaturesWithTransaction.h \
   ServerFeatureTransaction.h \
   ServerFeatureTransactionPool.h
-  
 
 libMgServerFeatureService_la_LIBADD = -lMgGwsCommon -lMgGwsQueryEngine
 

Modified: trunk/MgDev/Server/src/Services/Feature/ServerCreateFeatureSource.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerCreateFeatureSource.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/ServerCreateFeatureSource.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -279,7 +279,7 @@
 }
 
 MgServerCreateSdfFeatureSource::MgServerCreateSdfFeatureSource(
-    MgResourceIdentifier* resource, 
+    MgResourceIdentifier* resource,
     MgFileFeatureSourceParams* params):
     MgServerCreateFileFeatureSource(resource, params)
 {
@@ -305,7 +305,7 @@
 }
 
 MgServerCreateShpFeatureSource::MgServerCreateShpFeatureSource(
-    MgResourceIdentifier* resource, 
+    MgResourceIdentifier* resource,
     MgFileFeatureSourceParams* params):
     MgServerCreateFileFeatureSource(resource, params)
 {
@@ -347,7 +347,7 @@
 
 STRING MgServerCreateShpFeatureSource::GetFirstConnectionString()
 {
-    // For SHP feature source, m_tempFileName saves a temporary path 
+    // For SHP feature source, m_tempFileName saves a temporary path
     // instead of a temporary file name.
     m_tempFileName = MgFileUtil::GenerateTempPath();
     STRING connstr = m_connectParamName + L"=" + m_tempFileName;  // NOXLATE
@@ -371,7 +371,7 @@
 }
 
 MgServerCreateSqliteFeatureSource::MgServerCreateSqliteFeatureSource(
-    MgResourceIdentifier* resource, 
+    MgResourceIdentifier* resource,
     MgFileFeatureSourceParams* params):
     MgServerCreateFileFeatureSource(resource, params)
 {

Modified: trunk/MgDev/Server/src/Services/Feature/ServerFdoFeatureReader.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFdoFeatureReader.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFdoFeatureReader.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -63,13 +63,13 @@
 
 /// \brief
 /// Gets the name of the property at the given ordinal position.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the position of the property.
-/// 
+///
 /// \return
 /// Returns the property name
-/// 
+///
 FdoString* MgServerFdoFeatureReader::GetPropertyName(FdoInt32 index)
 {
     return m_internalReader->GetPropertyName(index);
@@ -77,13 +77,13 @@
 
 /// \brief
 /// Gets the index of the property with the specified name.
-/// 
-/// \param propertyName 
+///
+/// \param propertyName
 /// Input the property name.
-/// 
+///
 /// \return
 /// Returns the property index
-/// 
+///
 FdoInt32 MgServerFdoFeatureReader::GetPropertyIndex(FdoString* propertyName)
 {
     return m_internalReader->GetPropertyIndex(propertyName);
@@ -124,23 +124,23 @@
 }
 
 /// \brief
-/// Gets the geometry value of the property, at the specified index, 
-/// as a byte array in FGF format. Because no conversion is performed, 
-/// the property must be of Geometric type; otherwise, an exception is thrown. 
+/// Gets the geometry value of the property, at the specified index,
+/// as a byte array in FGF format. Because no conversion is performed,
+/// the property must be of Geometric type; otherwise, an exception is thrown.
 /// This method is a language-specific performance optimization that returns a
 /// pointer to the array data, rather than to an object that encapsulates
 /// the array.  The array's memory area is only guaranteed to be valid
 /// until a call to ReadNext() or Close(), or the disposal of this reader
 /// object.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// \param count 
+/// \param count
 /// Output the number of bytes in the array.
-/// 
+///
 /// \return
 /// Returns a pointer to the byte array in FGF format.
-/// 
+///
 const FdoByte * MgServerFdoFeatureReader::GetGeometry(FdoInt32 index, FdoInt32 * count)
 {
     if(m_internalReader->IsNull(index))
@@ -188,16 +188,16 @@
 }
 
 /// \brief
-/// Gets the geometry value of the specified property, at the specified index, 
-/// as a byte array in FGF format. Because no conversion is performed, the property 
+/// Gets the geometry value of the specified property, at the specified index,
+/// as a byte array in FGF format. Because no conversion is performed, the property
 /// must be of Geometric type; otherwise, an exception is thrown.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns the byte array in FGF format.
-/// 
+///
 FdoByteArray* MgServerFdoFeatureReader::GetGeometry(FdoInt32 index)
 {
     if(m_internalReader->IsNull(index))
@@ -246,15 +246,15 @@
 
 /// \brief
 /// Gets a reference to an FdoIFeatureReader to read the data contained in
-/// the object or object collection property defined at the specified index 
+/// the object or object collection property defined at the specified index
 /// position. If the property is not an object property, an exception is thrown.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns the nested feature reader
-/// 
+///
 FdoIFeatureReader* MgServerFdoFeatureReader::GetFeatureObject(FdoInt32 index)
 {
     if(m_internalReader->IsNull(index))
@@ -302,16 +302,16 @@
 }
 
 /// \brief
-/// Gets the Boolean value of the property specified at the index position. 
-/// No conversion is performed, thus the property must be FdoDataType_Boolean 
+/// Gets the Boolean value of the property specified at the index position.
+/// No conversion is performed, thus the property must be FdoDataType_Boolean
 /// or an exception is thrown.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns the Boolean value.
-/// 
+///
 bool MgServerFdoFeatureReader::GetBoolean(FdoInt32 index)
 {
     if(m_internalReader->IsNull(index))
@@ -359,16 +359,16 @@
 }
 
 /// \brief
-/// Gets the Byte value of the property specified at the index position. 
-/// No conversion is performed, thus the property must be FdoDataType_Byte 
+/// Gets the Byte value of the property specified at the index position.
+/// No conversion is performed, thus the property must be FdoDataType_Byte
 /// or an exception is thrown.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns the byte value.
-/// 
+///
 FdoByte MgServerFdoFeatureReader::GetByte(FdoInt32 index)
 {
     if(m_internalReader->IsNull(index))
@@ -416,16 +416,16 @@
 }
 
 /// \brief
-/// Gets the date and time value of the of the property specified at 
-/// the index position. No conversion is performed, thus the property 
+/// Gets the date and time value of the of the property specified at
+/// the index position. No conversion is performed, thus the property
 /// must be FdoDataType_DateTime or an exception is thrown.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns the date and time value.
-/// 
+///
 FdoDateTime MgServerFdoFeatureReader::GetDateTime(FdoInt32 index)
 {
     if(m_internalReader->IsNull(index))
@@ -473,16 +473,16 @@
 }
 
 /// \brief
-/// Gets the double-precision floating point value of the property specified at 
-/// the index position. No conversion is performed, thus the property must be 
+/// Gets the double-precision floating point value of the property specified at
+/// the index position. No conversion is performed, thus the property must be
 /// FdoDataType_Double or an exception is thrown.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns the double floating point value
-/// 
+///
 double MgServerFdoFeatureReader::GetDouble(FdoInt32 index)
 {
     if(m_internalReader->IsNull(index))
@@ -530,16 +530,16 @@
 }
 
 /// \brief
-/// Gets the 16-bit integer value of the property specified at 
-/// the index position. No conversion is performed, thus the 
+/// Gets the 16-bit integer value of the property specified at
+/// the index position. No conversion is performed, thus the
 /// property must be FdoDataType_Int16 or an exception is thrown.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns the FdoInt16 value.
-/// 
+///
 FdoInt16 MgServerFdoFeatureReader::GetInt16(FdoInt32 index)
 {
     if(m_internalReader->IsNull(index))
@@ -587,16 +587,16 @@
 }
 
 /// \brief
-/// Gets the 32-bit integer value of the property specified at 
-/// the index position. No conversion is performed, thus the 
+/// Gets the 32-bit integer value of the property specified at
+/// the index position. No conversion is performed, thus the
 /// property must be FdoDataType_Int32 or an exception is thrown.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns the FdoInt32 value
-/// 
+///
 FdoInt32 MgServerFdoFeatureReader::GetInt32(FdoInt32 index)
 {
     if(m_internalReader->IsNull(index))
@@ -644,16 +644,16 @@
 }
 
 /// \brief
-/// Gets the 64-bit integer value of the property specified at 
-/// the index position. No conversion is performed, thus the 
+/// Gets the 64-bit integer value of the property specified at
+/// the index position. No conversion is performed, thus the
 /// property must be FdoDataType_Int64 or an exception is thrown.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns the FdoInt64 value.
-/// 
+///
 FdoInt64 MgServerFdoFeatureReader::GetInt64(FdoInt32 index)
 {
     if(m_internalReader->IsNull(index))
@@ -701,16 +701,16 @@
 }
 
 /// \brief
-/// Gets the Single floating point value of the property specified at 
-/// the index position. No conversion is performed, thus the property 
+/// Gets the Single floating point value of the property specified at
+/// the index position. No conversion is performed, thus the property
 /// must be FdoDataType_Single or an exception is thrown.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns the single value
-/// 
+///
 float MgServerFdoFeatureReader::GetSingle(FdoInt32 index)
 {
     if(m_internalReader->IsNull(index))
@@ -761,13 +761,13 @@
 /// Gets the string value of the property specified at the index
 /// position. No conversion is performed, thus the property must
 /// be FdoDataType_String or an exception is thrown.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns the string value
-/// 
+///
 FdoString* MgServerFdoFeatureReader::GetString(FdoInt32 index)
 {
     if(m_internalReader->IsNull(index))
@@ -817,15 +817,15 @@
 /// \brief
 /// Gets a LOBValue pointer to the property specified at the index
 /// position. The LOB is fully read in and data available.
-/// Because no conversion is performed, the property must be 
+/// Because no conversion is performed, the property must be
 /// FdoDataType_BLOB or FdoDataType_CLOB etc. (a LOB type)
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns the pointer to LOBValue
-/// 
+///
 FdoLOBValue* MgServerFdoFeatureReader::GetLOB(FdoInt32 index)
 {
     if(m_internalReader->IsNull(index))
@@ -876,18 +876,18 @@
 
 /// \brief
 /// Gets a pointer to the specified LOB property, specified at the index
-/// position. The reference is returned as an FdoBLOBStreamReader or an 
-/// FdoCLOBStreamReader, to allow reading in blocks of data. Because 
-/// no conversion is performed, the property must be FdoDataType_BLOB 
-/// or FdoDataType_CLOB etc. (a LOB type) Cast the FdoIStreamReader 
+/// position. The reference is returned as an FdoBLOBStreamReader or an
+/// FdoCLOBStreamReader, to allow reading in blocks of data. Because
+/// no conversion is performed, the property must be FdoDataType_BLOB
+/// or FdoDataType_CLOB etc. (a LOB type) Cast the FdoIStreamReader
 /// to the appropriate LOB Stream Reader.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns a pointer to a LOB stream reader
-/// 
+///
 FdoIStreamReader* MgServerFdoFeatureReader::GetLOBStreamReader(FdoInt32 index)
 {
     if(m_internalReader->IsNull(index))
@@ -922,15 +922,15 @@
 }
 
 /// \brief
-/// Returns true if the value of the property at the specified 
+/// Returns true if the value of the property at the specified
 /// index is null.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns true if the value is null.
-/// 
+///
 bool MgServerFdoFeatureReader::IsNull(FdoInt32 index)
 {
     return m_internalReader->IsNull(index);
@@ -971,13 +971,13 @@
 /// Gets the raster object of the property at the specified index.
 /// Because no conversion is performed, the property must be
 /// of Raster type; otherwise, an exception is thrown.
-/// 
-/// \param index 
+///
+/// \param index
 /// Input the index of the property.
-/// 
+///
 /// \return
 /// Returns the raster object.
-/// 
+///
 FdoIRaster* MgServerFdoFeatureReader::GetRaster(FdoInt32 index)
 {
     // TODO: The IsNull() check is returning true for WFS/WMS FDO providers when there is valid data.

Modified: trunk/MgDev/Server/src/Services/Feature/ServerFdoFeatureReader.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFdoFeatureReader.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFdoFeatureReader.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -59,24 +59,24 @@
 
     /// \brief
     /// Gets the name of the property at the given ordinal position.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the position of the property.
-    /// 
+    ///
     /// \return
     /// Returns the property name
-    /// 
+    ///
     virtual FdoString* GetPropertyName(FdoInt32 index);
 
     /// \brief
     /// Gets the index of the property with the specified name.
-    /// 
-    /// \param propertyName 
+    ///
+    /// \param propertyName
     /// Input the property name.
-    /// 
+    ///
     /// \return
     /// Returns the property index
-    /// 
+    ///
     virtual FdoInt32 GetPropertyIndex(FdoString* propertyName);
 
     /// \brief
@@ -296,221 +296,221 @@
 
 
     /// \brief
-    /// Gets the geometry value of the property, at the specified index, 
-    /// as a byte array in FGF format. Because no conversion is performed, 
-    /// the property must be of Geometric type; otherwise, an exception is thrown. 
+    /// Gets the geometry value of the property, at the specified index,
+    /// as a byte array in FGF format. Because no conversion is performed,
+    /// the property must be of Geometric type; otherwise, an exception is thrown.
     /// This method is a language-specific performance optimization that returns a
     /// pointer to the array data, rather than to an object that encapsulates
     /// the array.  The array's memory area is only guaranteed to be valid
     /// until a call to ReadNext() or Close(), or the disposal of this reader
     /// object.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// \param count 
+    /// \param count
     /// Output the number of bytes in the array.
-    /// 
+    ///
     /// \return
     /// Returns a pointer to the byte array in FGF format.
-    /// 
+    ///
     virtual const FdoByte * GetGeometry(FdoInt32 index, FdoInt32* count);
 
     /// \brief
-    /// Gets the geometry value of the specified property, at the specified index, 
-    /// as a byte array in FGF format. Because no conversion is performed, the property 
+    /// Gets the geometry value of the specified property, at the specified index,
+    /// as a byte array in FGF format. Because no conversion is performed, the property
     /// must be of Geometric type; otherwise, an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the byte array in FGF format.
-    /// 
+    ///
     virtual FdoByteArray* GetGeometry(FdoInt32 index);
 
     /// \brief
     /// Gets a reference to an FdoIFeatureReader to read the data contained in
-    /// the object or object collection property defined at the specified index 
+    /// the object or object collection property defined at the specified index
     /// position. If the property is not an object property, an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the nested feature reader
-    /// 
+    ///
     virtual FdoIFeatureReader* GetFeatureObject(FdoInt32 index);
 
     /// \brief
-    /// Gets the Boolean value of the property specified at the index position. 
-    /// No conversion is performed, thus the property must be FdoDataType_Boolean 
+    /// Gets the Boolean value of the property specified at the index position.
+    /// No conversion is performed, thus the property must be FdoDataType_Boolean
     /// or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the Boolean value.
-    /// 
+    ///
     virtual FdoBoolean GetBoolean(FdoInt32 index);
 
     /// \brief
-    /// Gets the Byte value of the property specified at the index position. 
-    /// No conversion is performed, thus the property must be FdoDataType_Byte 
+    /// Gets the Byte value of the property specified at the index position.
+    /// No conversion is performed, thus the property must be FdoDataType_Byte
     /// or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the byte value.
-    /// 
+    ///
     virtual FdoByte GetByte(FdoInt32 index);
 
     /// \brief
-    /// Gets the date and time value of the of the property specified at 
-    /// the index position. No conversion is performed, thus the property 
+    /// Gets the date and time value of the of the property specified at
+    /// the index position. No conversion is performed, thus the property
     /// must be FdoDataType_DateTime or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the date and time value.
-    /// 
+    ///
     virtual FdoDateTime GetDateTime(FdoInt32 index);
 
     /// \brief
-    /// Gets the double-precision floating point value of the property specified at 
-    /// the index position. No conversion is performed, thus the property must be 
+    /// Gets the double-precision floating point value of the property specified at
+    /// the index position. No conversion is performed, thus the property must be
     /// FdoDataType_Double or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the double floating point value
-    /// 
+    ///
     virtual FdoDouble GetDouble(FdoInt32 index);
 
     /// \brief
-    /// Gets the 16-bit integer value of the property specified at 
-    /// the index position. No conversion is performed, thus the 
+    /// Gets the 16-bit integer value of the property specified at
+    /// the index position. No conversion is performed, thus the
     /// property must be FdoDataType_Int16 or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the FdoInt16 value.
-    /// 
+    ///
     virtual FdoInt16 GetInt16(FdoInt32 index);
 
     /// \brief
-    /// Gets the 32-bit integer value of the property specified at 
-    /// the index position. No conversion is performed, thus the 
+    /// Gets the 32-bit integer value of the property specified at
+    /// the index position. No conversion is performed, thus the
     /// property must be FdoDataType_Int32 or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the FdoInt32 value
-    /// 
+    ///
     virtual FdoInt32 GetInt32(FdoInt32 index);
 
     /// \brief
-    /// Gets the 64-bit integer value of the property specified at 
-    /// the index position. No conversion is performed, thus the 
+    /// Gets the 64-bit integer value of the property specified at
+    /// the index position. No conversion is performed, thus the
     /// property must be FdoDataType_Int64 or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the FdoInt64 value.
-    /// 
+    ///
     virtual FdoInt64 GetInt64(FdoInt32 index);
 
     /// \brief
-    /// Gets the Single floating point value of the property specified at 
-    /// the index position. No conversion is performed, thus the property 
+    /// Gets the Single floating point value of the property specified at
+    /// the index position. No conversion is performed, thus the property
     /// must be FdoDataType_Single or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the single value
-    /// 
+    ///
     virtual FdoFloat GetSingle(FdoInt32 index);
 
     /// \brief
     /// Gets the string value of the property specified at the index
     /// position. No conversion is performed, thus the property must
     /// be FdoDataType_String or an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the string value
-    /// 
+    ///
     virtual FdoString* GetString(FdoInt32 index);
 
     /// \brief
     /// Gets a LOBValue pointer to the property specified at the index
     /// position. The LOB is fully read in and data available.
-    /// Because no conversion is performed, the property must be 
+    /// Because no conversion is performed, the property must be
     /// FdoDataType_BLOB or FdoDataType_CLOB etc. (a LOB type)
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the pointer to LOBValue
-    /// 
+    ///
     virtual FdoLOBValue* GetLOB(FdoInt32 index);
 
     /// \brief
     /// Gets a pointer to the specified LOB property, specified at the index
-    /// position. The reference is returned as an FdoBLOBStreamReader or an 
-    /// FdoCLOBStreamReader, to allow reading in blocks of data. Because 
-    /// no conversion is performed, the property must be FdoDataType_BLOB 
-    /// or FdoDataType_CLOB etc. (a LOB type) Cast the FdoIStreamReader 
+    /// position. The reference is returned as an FdoBLOBStreamReader or an
+    /// FdoCLOBStreamReader, to allow reading in blocks of data. Because
+    /// no conversion is performed, the property must be FdoDataType_BLOB
+    /// or FdoDataType_CLOB etc. (a LOB type) Cast the FdoIStreamReader
     /// to the appropriate LOB Stream Reader.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns a pointer to a LOB stream reader
-    /// 
+    ///
     virtual FdoIStreamReader* GetLOBStreamReader(FdoInt32 index);
 
     /// \brief
-    /// Returns true if the value of the property at the specified 
+    /// Returns true if the value of the property at the specified
     /// index is null.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns true if the value is null.
-    /// 
+    ///
     virtual FdoBoolean IsNull(FdoInt32 index);
 
     /// \brief
     /// Gets the raster object of the property at the specified index.
     /// Because no conversion is performed, the property must be
     /// of Raster type; otherwise, an exception is thrown.
-    /// 
-    /// \param index 
+    ///
+    /// \param index
     /// Input the index of the property.
-    /// 
+    ///
     /// \return
     /// Returns the raster object.
-    /// 
+    ///
     virtual FdoIRaster* GetRaster(FdoInt32 index);
 
     /// \brief

Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -721,7 +721,7 @@
 //////////////////////////////////////////////////////////////////
 /// <summary>
 /// This method executes the SELECT SQL statement specified within a given transaction
-/// and returns a pointer to SqlDataReader instance. This instance can be used to 
+/// and returns a pointer to SqlDataReader instance. This instance can be used to
 /// retrieve column information and related values.
 ///
 /// NOTE:
@@ -767,7 +767,7 @@
 //////////////////////////////////////////////////////////////////
 /// <summary>
 /// This method executes the SELECT SQL statement specified within a given transaction
-/// and returns a pointer to SqlDataReader instance. This instance can be used to 
+/// and returns a pointer to SqlDataReader instance. This instance can be used to
 /// retrieve column information and related values.
 ///
 /// NOTE:
@@ -789,7 +789,7 @@
 /// The MgTransaction instance on which the sql statement will be executed.
 /// </param>
 /// <param name="fetchSize">
-/// The fetch size of query. This method returns all data of query if 
+/// The fetch size of query. This method returns all data of query if
 /// setting the fetch size to 0.
 /// </param>
 /// <returns>

Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -452,7 +452,7 @@
 
     //////////////////////////////////////////////////////////////////
     /// <summary>
-    /// It executes all the commands specified in command collection 
+    /// It executes all the commands specified in command collection
     /// within the given transaction.
     /// </summary>
     /// <param name="resource">Input
@@ -629,7 +629,7 @@
     /// The MgTransaction instance on which the sql statement will be executed.
     /// </param>
     /// <param name="fetchSize">
-    /// The fetch size of query. This method returns all data of query if 
+    /// The fetch size of query. This method returns all data of query if
     /// setting the fetch size to 0.
     /// </param>
     /// <returns>
@@ -951,7 +951,7 @@
     // Commit the transaction specified by the transaction id.
     bool CommitTransaction(CREFSTRING transactionId);
 
-    // Rollback the transaction specified by the transaction id. 
+    // Rollback the transaction specified by the transaction id.
     bool RollbackTransaction(CREFSTRING transactionId);
 
 private:

Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransaction.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransaction.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransaction.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -51,7 +51,7 @@
 
     m_fdoTransaction->Commit();
 
-    // close it as this transaction object is obsolete now. 
+    // close it as this transaction object is obsolete now.
     Close();
 }
 
@@ -66,7 +66,7 @@
 
     m_fdoTransaction->Rollback();
 
-    // close it as this transaction object is obsolete now. 
+    // close it as this transaction object is obsolete now.
     Close();
 }
 

Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransaction.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransaction.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransaction.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -22,8 +22,8 @@
 
 /////////////////////////////////////////////////////////////////
 /// <summary>
-/// MgServerFeatureTransaction represents a transaction to be performed in 
-/// a DataStore. If the transaction is time out, commit or rollback a 
+/// MgServerFeatureTransaction represents a transaction to be performed in
+/// a DataStore. If the transaction is time out, commit or rollback a
 /// transaction will result in one exception MgFeatureServiceException thrown.
 /// </summary>
 class MG_SERVER_FEATURE_API MgServerFeatureTransaction : public MgTransaction

Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransactionPool.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransactionPool.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransactionPool.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -79,7 +79,7 @@
             {
                 try
                 {
-                    // Set timeout for this transaction object. It will release the internal FdoITransaction object. 
+                    // Set timeout for this transaction object. It will release the internal FdoITransaction object.
                     featTransaction->SetTimeout();
                 }
                 catch (FdoException* e)
@@ -142,7 +142,7 @@
 {
     Ptr<MgServerFeatureTransaction> tran = new MgServerFeatureTransaction(resource);
 
-    // Add it to the pool. 
+    // Add it to the pool.
     AddTransaction(tran);
 
     return tran.Detach();

Modified: trunk/MgDev/Server/src/Services/Feature/ServerGetSpatialContexts.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerGetSpatialContexts.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/ServerGetSpatialContexts.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -114,7 +114,7 @@
 
     STRING coordSysName = L"";
     FdoString* csName = spatialReader->GetCoordinateSystem();
-    
+
     Ptr<MgCoordinateSystemFactory> csFactory;
     // WKT for co-ordinate system
     FdoString* csWkt = NULL;

Modified: trunk/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -26,7 +26,7 @@
 {
 public:
     GwsRightSideIterator(IGWSFeatureIterator* iter, bool b):m_iterator(iter), m_bHasData(b){}
-    
+
     IGWSFeatureIterator * Iterator(){return m_iterator;};
     bool HasData(){return m_bHasData;}
 

Modified: trunk/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -1236,7 +1236,7 @@
             bool bForceOneToOne = true;
             Ptr<MgStringCollection> attributeNameDelimiters = new MgStringCollection();
 
-            //Store all the secondary's name, and if the filter property doesn't contain secondary's name, 
+            //Store all the secondary's name, and if the filter property doesn't contain secondary's name,
             //it applies only to the primary.
             Ptr<MgStringCollection> secondaryNames = new MgStringCollection();
 

Modified: trunk/MgDev/Server/src/Services/Feature/ServerSqlCommand.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerSqlCommand.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/ServerSqlCommand.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -94,9 +94,9 @@
 
 // Executes the describe schema command and serializes the schema to XML
 INT32 MgServerSqlCommand::ExecuteNonQuery(
-    MgResourceIdentifier* resource, 
-    CREFSTRING sqlStatement, 
-    MgParameterCollection* params, 
+    MgResourceIdentifier* resource,
+    CREFSTRING sqlStatement,
+    MgParameterCollection* params,
     MgTransaction* transaction)
 {
     INT32 rowsAffected = 0;

Modified: trunk/MgDev/Server/src/Services/Feature/ServerSqlCommand.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerSqlCommand.h	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Feature/ServerSqlCommand.h	2010-01-09 08:30:45 UTC (rev 4507)
@@ -37,9 +37,9 @@
                         MgTransaction* transaction,
                         INT32 fetchSize = 0);
     INT32 ExecuteNonQuery(
-                        MgResourceIdentifier* resource, 
-                        CREFSTRING sqlStatement, 
-                        MgParameterCollection* params, 
+                        MgResourceIdentifier* resource,
+                        CREFSTRING sqlStatement,
+                        MgParameterCollection* params,
                         MgTransaction* transaction);
 
 private:

Modified: trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -433,7 +433,7 @@
         #ifdef _DEBUG
         printf("  StylizeLayers() **LAYERSTART** Name:%S  VAS:%S\n", (mapLayer->GetName()).c_str(), mapLayer->IsVisibleAtScale(scale)? L"True" : L"False");
         #endif
-        
+
         if(mapLayer->GetLayerResourceContent() == L"")
             continue;
 

Modified: trunk/MgDev/Server/src/Services/Resource/ApplicationRepositoryManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ApplicationRepositoryManager.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Resource/ApplicationRepositoryManager.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -486,7 +486,7 @@
             __LINE__, __WFILE__, &arguments, L"MgResourcesIdentical", NULL);
     }
 
-    // If cascade update referencing resources, get the references and check permission. 
+    // If cascade update referencing resources, get the references and check permission.
     // An MgUnauthorizedAccessException will throw if current user doesn't have write permission to any referencing resource.
     Ptr<MgStringCollection> referencingIds = NULL;
     if(cascade)
@@ -513,7 +513,7 @@
 
     resourceContentMan->MoveResource(sourceResource, destResource, overwrite);
 
-    // If cascade update referencing resources, update referencing resources' content, 
+    // If cascade update referencing resources, update referencing resources' content,
     // setting ResourceId from sourceResource to destResource
     if(cascade && referencingIds != NULL &&  referencingIds->GetCount() != 0)
     {

Modified: trunk/MgDev/Server/src/Services/Resource/ApplicationResourceContentManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ApplicationResourceContentManager.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Resource/ApplicationResourceContentManager.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -165,7 +165,7 @@
     // this XML follows the ResourceReferenceList-1.0.0.xsd schema
     MgResourceIdentifier currResource;
     XmlValue xmlValue;
-    
+
     while (results.next(xmlValue)) // TODO: Need an XML writer
     {
         const XmlDocument& xmlDoc = xmlValue.asDocument();

Modified: trunk/MgDev/Server/src/Services/Resource/OpGetResourceContents.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/OpGetResourceContents.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Resource/OpGetResourceContents.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -63,7 +63,7 @@
     ACE_ASSERT(m_stream != NULL);
 
     if (2 == m_packet.m_NumArguments)
-    {        
+    {
         Ptr<MgStringCollection> resources = (MgStringCollection*)m_stream->GetObject();
         Ptr<MgStringCollection> preProcessTags = (MgStringCollection*)m_stream->GetObject();
 
@@ -92,7 +92,7 @@
 
                     MgCryptographyManager cryptoManager;
                     STRING cipherText = cryptoManager.EncryptString(plainText);
-                    
+
                     resourceContents->SetItem(i, cipherText);
                 }
             }

Modified: trunk/MgDev/Server/src/Services/Resource/ServerResourceService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ServerResourceService.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Services/Resource/ServerResourceService.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -931,10 +931,10 @@
     }
 
     MgLogDetail logDetail(MgServiceType::ResourceService, MgLogDetail::Trace, L"MgServerResourceService.GetResourceContents", mgStackParams);
-    logDetail.AddObject(L"Resources", resources);    
+    logDetail.AddObject(L"Resources", resources);
     logDetail.AddObject(L"PreProcessTags", preProcessTags);
     logDetail.Create();
-    
+
     // Iterator resources to get the content
     for(INT32 i = 0; i < resources->GetCount(); i ++)
     {

Modified: trunk/MgDev/Server/src/UnitTesting/TestKmlService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestKmlService.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/UnitTesting/TestKmlService.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -246,7 +246,7 @@
             SAFE_RELEASE(e);
             ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestCase_GetMapKml skipped because unable to connect to test server.\n")));
 
-            // We need to update the mapguide server status so that it can be used again because we have used the 
+            // We need to update the mapguide server status so that it can be used again because we have used the
             // same exception class for servers outside the one actually executing this code.
             MgSiteManager* siteManager = MgSiteManager::GetInstance();
             Ptr<MgSiteInfo> siteInfo = siteManager->GetSiteInfo(0);
@@ -297,7 +297,7 @@
             SAFE_RELEASE(e);
             ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestCase_GetMapKmz skipped because unable to connect to test server.\n")));
 
-            // We need to update the mapguide server status so that it can be used again because we have used the 
+            // We need to update the mapguide server status so that it can be used again because we have used the
             // same exception class for servers outside the one actually executing this code.
             MgSiteManager* siteManager = MgSiteManager::GetInstance();
             Ptr<MgSiteInfo> siteInfo = siteManager->GetSiteInfo(0);
@@ -347,7 +347,7 @@
             SAFE_RELEASE(e);
             ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestCase_GetLayerKml skipped because unable to connect to test server.\n")));
 
-            // We need to update the mapguide server status so that it can be used again because we have used the 
+            // We need to update the mapguide server status so that it can be used again because we have used the
             // same exception class for servers outside the one actually executing this code.
             MgSiteManager* siteManager = MgSiteManager::GetInstance();
             Ptr<MgSiteInfo> siteInfo = siteManager->GetSiteInfo(0);

Modified: trunk/MgDev/Server/src/UnitTesting/TestResourceService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestResourceService.cpp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/UnitTesting/TestResourceService.cpp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -957,7 +957,7 @@
         for(int i = 0; i < ret->GetCount(); i ++)
         {
             CPPUNIT_ASSERT(!ret->GetItem(i).empty());
-        }        
+        }
     }
     catch(MgException* e)
     {

Modified: trunk/MgDev/Server/src/Wfs/1.0.0.xml.awd
===================================================================
--- trunk/MgDev/Server/src/Wfs/1.0.0.xml.awd	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Wfs/1.0.0.xml.awd	2010-01-09 08:30:45 UTC (rev 4507)
@@ -19,7 +19,7 @@
  <!--                                                                                     -->
  <!--  Feature.PrimarySRS    - Unused.  Reserved for future use. DO NOT USE.              -->
  <Define item="Feature.xml">
-  <!-- 
+  <!--
        Feature class #&Feature.iteration;
     -->
     <FeatureType xmlns:&Feature.Prefix;="&Feature.Resource;">
@@ -102,7 +102,7 @@
  <Define item="OtherSRS.xml"><wfs:OtherSRS>&Enum.item;</wfs:OtherSRS></Define>
  <Define item="Format.xml"><ows:Format>&Enum.item;</ows:Format></Define>
 
- <Define item="DescribeFeature.EnumDelim.xml">  
+ <Define item="DescribeFeature.EnumDelim.xml">
    <!-- &Enum.iteration; -->
    <xs:import schemaLocation="&Url.DescribeFeatureType;?request=DescribeFeatureType&amp;service=WFS&amp;typeName=&Enum.item;"/>
  </Define>
@@ -127,12 +127,12 @@
   WFS GetCapabilities  - XML
 
 -->
-<Response request="GetCapabilities" content-type="text/xml"><WFS_Capabilities version="1.0.0" 
+<Response request="GetCapabilities" content-type="text/xml"><WFS_Capabilities version="1.0.0"
           xmlns="http://www.opengis.net/wfs"
                   xmlns:myns="http://www.someserver.com/myns"
                   xmlns:ogc="http://www.opengis.net/ogc"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengeospatial.net/wfs/1.0.0/WFS-capabilities.xsd"> 
+                  xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengeospatial.net/wfs/1.0.0/WFS-capabilities.xsd">
   <!-- ================================================================== -->
   <!-- SERVICE IDENTIFICATION SECTION                                     -->
   <!-- ================================================================== -->
@@ -242,7 +242,7 @@
 
 -->
 <Response request="DescribeFeatureType" content-type="text/xml; subtype=gml/2.1.2">
- <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
             elementFormDefault="qualified" attributeFormDefault="unqualified">
  <?EnumFeatureTypes using="&DescribeFeature.EnumFeature.xml;" ?>
  </xs:schema>

Modified: trunk/MgDev/Server/src/Wfs/1.1.0.xml.awd
===================================================================
--- trunk/MgDev/Server/src/Wfs/1.1.0.xml.awd	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Wfs/1.1.0.xml.awd	2010-01-09 08:30:45 UTC (rev 4507)
@@ -7,10 +7,10 @@
 
  <!-- This defines the format any given feature type will take when enumerated -->
  <Define item="Feature.xml">
-  <!-- 
+  <!--
        Feature class #&Feature.iteration;
     -->
-  <wfs:FeatureType 
+  <wfs:FeatureType
      xmlns:ns="&Feature.namespace;">
    <wfs:Name>&Feature.name;</wfs:Name>
    <wfs:Title>&Feature.Title;</wfs:Title>
@@ -77,9 +77,9 @@
  <Define item="Feature.Bounds.east">180</Define>
 
 
- <Define item="DescribeFeature.EnumDelim.xml">  
+ <Define item="DescribeFeature.EnumDelim.xml">
    <!-- &Enum.iteration; -->
-   <?EnumDelim list="&Enum.item;" sep=":" subset="1" using="&DescribeFeature.Import.xml;"?> 
+   <?EnumDelim list="&Enum.item;" sep=":" subset="1" using="&DescribeFeature.Import.xml;"?>
  </Define>
  <Define item="DescribeFeature.EnumFeature.xml">
    <!-- &Feature.iteration; -->
@@ -107,8 +107,8 @@
 
 -->
 <Response request="GetCapabilities" content-type="text/xml">
-<wfs:WFS_Capabilities 
-  xmlns:ows="http://www.opengis.net/ows" 
+<wfs:WFS_Capabilities
+  xmlns:ows="http://www.opengis.net/ows"
   xmlns:ogc="http://www.opengis.net/ogc"
   xmlns:wfs="http://www.opengis.net/wfs"
   xmlns:gml="http://www.opengis.net/gml"
@@ -155,7 +155,7 @@
         <ows:OnlineResource xlink:href="&URL.OnlineResource;"/>
         <ows:HoursOfService>24x7</ows:HoursOfService>
         <ows:ContactInstructions>&Service.Contact.Instructions;</ows:ContactInstructions>
-      </ows:ContactInfo> 
+      </ows:ContactInfo>
       <ows:Role>PointOfContact</ows:Role>
     </ows:ServiceContact>
   </ows:ServiceProvider>
@@ -235,7 +235,6 @@
   <wfs:FeatureTypeList>
    <?EnumFeatureTypes using="&Feature.xml;"?>
   </wfs:FeatureTypeList>
- 
 
   <!-- ================================================================== -->
   <!-- FILTER CAPABILITIES SECTION                                        -->
@@ -285,7 +284,7 @@
 
 -->
 <Response request="DescribeFeatureType" content-type="text/xml; subtype=gml/2.1.2">
- <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
             elementFormDefault="qualified" attributeFormDefault="unqualified">
  <?Ifdef item="Request.typename"?>
  <?EnumDelim list="&Request.typename;" using="&DescribeFeature.EnumDelim.xml;"?>

Modified: trunk/MgDev/Server/src/Wfs/OgcWfsService.config.awd
===================================================================
--- trunk/MgDev/Server/src/Wfs/OgcWfsService.config.awd	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Wfs/OgcWfsService.config.awd	2010-01-09 08:30:45 UTC (rev 4507)
@@ -2,10 +2,10 @@
 <Configuration>
 <Definitions>
 
- <!-- This definition enumerates the WFS versions we will support. 
-      Note that each version below must be backed by a like-named  
-      template file (ie, 1.0.0.xml.awd) in order to work.          
-      These must appear in increasing order!                       
+ <!-- This definition enumerates the WFS versions we will support.
+      Note that each version below must be backed by a like-named
+      template file (ie, 1.0.0.xml.awd) in order to work.
+      These must appear in increasing order!
       Also, anything other than a <Version> element is ignored.    -->
  <Define item="SupportedVersions">
    <Version number="1.0.0"/>
@@ -47,21 +47,21 @@
  <Define item="Service.Keywords"><item>GIS</item><item>WFS</item><item>Server</item></Define>
 
 
- <!-- Enumerates an element in a dictionary for HTML  
+ <!-- Enumerates an element in a dictionary for HTML
       (Used chiefly for debugging, and in exceptions) -->
  <Define item="EnumDictionary.html"><tr><td class="name">&EnumDictionary.Name;</td><td><?Escape text="&EnumDictionary.Value;"?></td></tr>
  </Define>
 
- <!-- This is the HTML stylesheet, which should be referenced by anything returning HTML      
-      Note: one could substitute this with an out-of-band stylesheet link to an external doc, 
-      that is to say, replacing this with:                                                    
-           <link rel="stylesheet" href="http://your-url-to-a/stylesheet.css" />               
+ <!-- This is the HTML stylesheet, which should be referenced by anything returning HTML
+      Note: one could substitute this with an out-of-band stylesheet link to an external doc,
+      that is to say, replacing this with:
+           <link rel="stylesheet" href="http://your-url-to-a/stylesheet.css" />
       and then maintaining that document somewhere on your webserver.                         -->
  <Define item="html.stylesheet">
 <style>
 body {
   font-family: arial,
-} 
+}
 table {
   font-family: arial,
 }
@@ -82,7 +82,7 @@
  </Define>
 
  <!-- This is the default definition for a layer in GetCapabilities as text/xml
-      Some versions may override this definition with a like-named definition  
+      Some versions may override this definition with a like-named definition
       of their own; any version-specific definition supercedes this one.        -->
  <Define item="EnumLayer.xml">
   <Layer queryable="&Layer.queryable;" transparent="&Layer.transparent;">
@@ -110,16 +110,16 @@
 
 
 
- <!-- You can control the formats supported by various  
-      WFS responses by (a) modifying these lists and    
-      (b) adding (if necessary) the appropriate         
-      <Response> element in the corresponding version   
-      template files.  You can locally override the     
-      supported formats by copying one of these         
-      definitions and modifying it to suit; in this     
+ <!-- You can control the formats supported by various
+      WFS responses by (a) modifying these lists and
+      (b) adding (if necessary) the appropriate
+      <Response> element in the corresponding version
+      template files.  You can locally override the
+      supported formats by copying one of these
+      definitions and modifying it to suit; in this
       case, the mods only apply to that version.        -->
 
- <!-- These are the supported (Get)Capabilities formats 
+ <!-- These are the supported (Get)Capabilities formats
       Specific version templates can override these     -->
  <Define item="Formats.GetCapabilities">
    <item>text/xml</item>
@@ -127,7 +127,7 @@
    <item>text/plain</item>
  </Define>
 
- <!-- These are the supported DescribeFeatureType formats      
+ <!-- These are the supported DescribeFeatureType formats
       Specific version templates can override these -->
  <Define item="Formats.DescribeFeatureType">
    <item>text/xml; subtype=gml/2.1.2</item>
@@ -143,16 +143,16 @@
   <translate from="XMLSCHEMA">text/xml; subtype=gml/2.1.2</translate>
  </Define>
 
- <!-- These are the supported GetFeature formats 
+ <!-- These are the supported GetFeature formats
       Specific version templates can override these    -->
  <Define item="Formats.GetFeature">
    <item>text/xml; subtype=gml/2.1.2</item>
    <!--item>text/xml; subtype=gml/3.1.1</item-->
  </Define>
-    
+
  <Define item="Formats.GetFeature.default">text/xml; subtype=gml/2.1.2</Define>
 
- <!-- These are the supported Exception formats     
+ <!-- These are the supported Exception formats
       Specific version templates can override these -->
  <Define item="Formats.Exception">
    <item>application/vnd.ogc.se_xml</item>
@@ -257,13 +257,13 @@
 </Definitions>
 
 
-<!--  This is the exception of last resort, and is used if   
-      no exception Response is found in the version-specific 
-      template (or if an error occurs before a version can   
-      be established.)                                       
-      By this declaration, we say the default response shall 
-      be html.  Of course, any appropriate <Response/> in    
-      the template file will supercede this.                 
+<!--  This is the exception of last resort, and is used if
+      no exception Response is found in the version-specific
+      template (or if an error occurs before a version can
+      be established.)
+      By this declaration, we say the default response shall
+      be html.  Of course, any appropriate <Response/> in
+      the template file will supercede this.
 -->
 
 <Exception content-type="text/html">

Modified: trunk/MgDev/Server/src/Wms/1.0.0.xml.awd
===================================================================
--- trunk/MgDev/Server/src/Wms/1.0.0.xml.awd	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Wms/1.0.0.xml.awd	2010-01-09 08:30:45 UTC (rev 4507)
@@ -3,7 +3,7 @@
 
 <Definitions>
 
-  <!-- This defines the format of each individual layer 
+  <!-- This defines the format of each individual layer
       advertised by GetCapabilities                    -->
   <!-- Note: Studio published the following metadata fields                                -->
   <!-- Layer.Name      - The canonical machine-readable name for a layer                   -->
@@ -51,7 +51,7 @@
  <Define item="Layer.BoundingBox.default">
   <Bounds SRS="EPSG:4326" west="-180" south="-90" east="180" north="90"/>
  </Define>
- 
+
  <!-- This pair of definitions works around a current limitation that -->
  <!-- <?If...?><?Endif?> cannot be nested.                            -->
  <Define item="LatLonBoundingBox.xml"><?Translate text="&Enum.item.SRS;" with="&LatLonBoundingBox.translate.xml;"?></Define>
@@ -59,7 +59,7 @@
    <translate from="EPSG:4326" ?><LatLonBoundingBox minx="&Enum.item.west;" miny="&Enum.item.south;" maxx="&Enum.item.east;" maxy="&Enum.item.north;"/></translate>
    <translate></translate>
  </Define>
- 
+
  <Define item="BoundingBox.xml">
   <BoundingBox SRS="&Enum.item.SRS;" minx="&Enum.item.west;" miny="&Enum.item.south;" maxx="&Enum.item.east;" maxy="&Enum.item.north;"/>
  </Define>
@@ -145,7 +145,7 @@
   <?Translate text="&Enum.Item;" with="&Formats.translate;"?>
  </Define>
 
- <!-- Overrides of default Exception formats     
+ <!-- Overrides of default Exception formats
   specific to this version template -->
  <Define item="Formats.Exception">
   <item>text/xml</item>
@@ -180,7 +180,7 @@
     </Keywords>
   <?Endif?>
   <OnlineResource>&Url.OnlineResource;</OnlineResource>
-  <!-- 
+  <!--
        Contact Information
        ===================
        &Service.Contact.Name;

Modified: trunk/MgDev/Server/src/Wms/1.1.0.xml.awd
===================================================================
--- trunk/MgDev/Server/src/Wms/1.1.0.xml.awd	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Wms/1.1.0.xml.awd	2010-01-09 08:30:45 UTC (rev 4507)
@@ -3,7 +3,7 @@
 
 <Definitions>
 
-  <!-- This defines the format of each individual layer 
+  <!-- This defines the format of each individual layer
       advertised by GetCapabilities                    -->
   <!-- Note: Studio published the following metadata fields                                -->
   <!-- Layer.Name      - The canonical machine-readable name for a layer                   -->
@@ -49,11 +49,11 @@
     <?Endif?>
    </Layer>
  </Define>
- 
+
  <Define item="Layer.BoundingBox.default">
   <Bounds SRS="EPSG:4326" west="-180" south="-90" east="180" north="90"/>
  </Define>
- 
+
  <!-- This pair of definitions works around a current limitation that -->
  <!-- <?If...?><?Endif?> cannot be nested.                            -->
  <Define item="LatLonBoundingBox.xml"><?Translate text="&Enum.item.SRS;" with="&LatLonBoundingBox.translate.xml;"?></Define>
@@ -61,7 +61,7 @@
    <translate from="EPSG:4326" ?><LatLonBoundingBox minx="&Enum.item.west;" miny="&Enum.item.south;" maxx="&Enum.item.east;" maxy="&Enum.item.north;"/></translate>
    <translate></translate>
  </Define>
- 
+
  <Define item="BoundingBox.xml">
   <BoundingBox SRS="&Enum.item.SRS;" minx="&Enum.item.west;" miny="&Enum.item.south;" maxx="&Enum.item.east;" maxy="&Enum.item.north;"/>
  </Define>
@@ -110,7 +110,7 @@
  <Define item="FeatureProperty.text">
   &FeatureProperty.Name;=&FeatureProperty.Value;
  </Define>
- 
+
  <!-- DUMMY DEFINITIONS - to be removed once this metadata is provided by the server -->
  <Define item="Layer.Queryable">1</Define>
  <Define item="Layer.Cascaded">0</Define>
@@ -125,18 +125,18 @@
 
  <!-- We're currently not supporting child layers... -->
  <Define item="Layer.Sublayers"></Define>
- 
+
  <!-- In this version, keywords are enumerated enclosed in Keyword elements -->
  <Define item="Service.Keywords.xml"><Keyword>&Enum.item;</Keyword>
  </Define>
 
- <!-- Overrides of default Exception formats     
+ <!-- Overrides of default Exception formats
   specific to this version template -->
  <Define item="Formats.Exception">
   <item>application/vnd.ogc.se_xml</item>
  </Define>
 
- <!-- These are the supported (Get)Capabilities formats 
+ <!-- These are the supported (Get)Capabilities formats
   for version 1.1.1.     -->
  <Define item="Formats.GetCapabilities">
   <item>text/xml</item>
@@ -288,7 +288,7 @@
 <Response request="GetCapabilities" content-type="application/vnd.ogc.wms_xml">
  &GetCapabilities.xml;
 </Response>
- 
+
 <!--
 
   WMS GetCapabilities  - HTML

Modified: trunk/MgDev/Server/src/Wms/1.1.1.xml.awd
===================================================================
--- trunk/MgDev/Server/src/Wms/1.1.1.xml.awd	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Wms/1.1.1.xml.awd	2010-01-09 08:30:45 UTC (rev 4507)
@@ -3,8 +3,8 @@
 
 <Definitions>
 
-  <!-- This defines the format of each individual layer 
-      advertised by GetCapabilities                    --> 
+  <!-- This defines the format of each individual layer
+      advertised by GetCapabilities                    -->
   <!-- Note: Studio published the following metadata fields                                -->
   <!-- Layer.Name      - The canonical machine-readable name for a layer                   -->
   <!-- Layer.Abstract  - Free-form human readable description for the layer                -->
@@ -94,19 +94,19 @@
  <Define item="FeatureInfo.text">
   FeatureInfo:
   <?EnumFeatureProperties using="&FeatureProperty.text;" ?>
-  
+
  </Define>
- 
+
  <Define item="FeatureProperty.xml">
   <Property name="&FeatureProperty.Name;" value="&FeatureProperty.Value;"></Property>
  </Define>
- 
+
  <Define item="FeatureProperty.html">
   <tr><td class="name">&FeatureProperty.Name;</td><td>&FeatureProperty.Value;</td></tr>
  </Define>
- 
+
  <Define item="FeatureProperty.text">
-  &FeatureProperty.Name;=&FeatureProperty.Value; 
+  &FeatureProperty.Name;=&FeatureProperty.Value;
  </Define>
 
  <!-- We're currently not supporting child layers... -->
@@ -116,13 +116,13 @@
  <Define item="Service.Keywords.xml"><Keyword>&Enum.item;</Keyword>
  </Define>
 
- <!-- Overrides of default Exception formats     
+ <!-- Overrides of default Exception formats
   specific to this version template -->
  <Define item="Formats.Exception">
   <item>application/vnd.ogc.se_xml</item>
  </Define>
 
- <!-- These are the supported (Get)Capabilities formats 
+ <!-- These are the supported (Get)Capabilities formats
   for version 1.1.1.     -->
  <Define item="Formats.GetCapabilities">
   <item>text/xml</item>

Modified: trunk/MgDev/Server/src/Wms/OgcWmsService.config.awd
===================================================================
--- trunk/MgDev/Server/src/Wms/OgcWmsService.config.awd	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Wms/OgcWmsService.config.awd	2010-01-09 08:30:45 UTC (rev 4507)
@@ -2,10 +2,10 @@
 <Configuration>
 <Definitions>
 
- <!-- This definition enumerates the WMS versions we will support. 
-      Note that each version below must be backed by a like-named  
-      template file (ie, 1.0.0.xml.awd) in order to work.          
-      These must appear in increasing order!                       
+ <!-- This definition enumerates the WMS versions we will support.
+      Note that each version below must be backed by a like-named
+      template file (ie, 1.0.0.xml.awd) in order to work.
+      These must appear in increasing order!
       Also, anything other than a <Version> element is ignored.    -->
  <Define item="SupportedVersions">
    <Version number="1.0.0"/>
@@ -53,21 +53,21 @@
  </Define>
 
 
- <!-- Enumerates an element in a dictionary for HTML  
+ <!-- Enumerates an element in a dictionary for HTML
       (Used chiefly for debugging, and in exceptions) -->
  <Define item="EnumDictionary.html"><tr><td class="name">&EnumDictionary.Name;</td><td><?Escape text="&EnumDictionary.Value;"?></td></tr>
  </Define>
 
- <!-- This is the HTML stylesheet, which should be referenced by anything returning HTML      
-      Note: one could substitute this with an out-of-band stylesheet link to an external doc, 
-      that is to say, replacing this with:                                                    
-           <link rel="stylesheet" href="http://your-url-to-a/stylesheet.css" />               
+ <!-- This is the HTML stylesheet, which should be referenced by anything returning HTML
+      Note: one could substitute this with an out-of-band stylesheet link to an external doc,
+      that is to say, replacing this with:
+           <link rel="stylesheet" href="http://your-url-to-a/stylesheet.css" />
       and then maintaining that document somewhere on your webserver.                         -->
  <Define item="html.stylesheet">
 <style>
 body {
   font-family: arial,
-} 
+}
 table {
   font-family: arial,
 }
@@ -91,7 +91,7 @@
  </Define>
 
  <!-- This is the default definition for a layer in GetCapabilities as text/xml
-      Some versions may override this definition with a like-named definition  
+      Some versions may override this definition with a like-named definition
       of their own; any version-specific definition supercedes this one.        -->
  <Define item="EnumLayer.xml">
   <Layer queryable="&Layer.queryable;" transparent="&Layer.transparent;">
@@ -116,16 +116,16 @@
  <!-- This is the default definition for a reference system (SRS, or CRS) -->
  <Define item="RS.xml"><SRS>&Enum.item;</SRS></Define>
 
- <!-- You can control the formats supported by various  
-      WMS responses by (a) modifying these lists and    
-      (b) adding (if necessary) the appropriate         
-      <Response> element in the corresponding version   
-      template files.  You can locally override the     
-      supported formats by copying one of these         
-      definitions and modifying it to suit; in this     
+ <!-- You can control the formats supported by various
+      WMS responses by (a) modifying these lists and
+      (b) adding (if necessary) the appropriate
+      <Response> element in the corresponding version
+      template files.  You can locally override the
+      supported formats by copying one of these
+      definitions and modifying it to suit; in this
       case, the mods only apply to that version.        -->
 
- <!-- These are the supported (Get)Capabilities formats 
+ <!-- These are the supported (Get)Capabilities formats
       Specific version templates can override these     -->
  <Define item="Formats.GetCapabilities">
    <item>text/xml</item>
@@ -133,7 +133,7 @@
    <item>text/plain</item>
  </Define>
 
- <!-- These are the supported (Get)Map formats      
+ <!-- These are the supported (Get)Map formats
       Specific version templates can override these -->
  <Define item="Formats.GetMap">
    <item>image/png</item>
@@ -173,7 +173,7 @@
   <translate from="LL84">EPSG:4326</translate>
  </Define>
 
- <!-- These are the supported (Get)FeatureInfo formats 
+ <!-- These are the supported (Get)FeatureInfo formats
       Specific version templates can override these    -->
  <Define item="Formats.GetFeatureInfo">
    <item>text/xml</item>
@@ -181,7 +181,7 @@
    <item>text/plain</item>
  </Define>
 
- <!-- These are the supported Exception formats     
+ <!-- These are the supported Exception formats
       Specific version templates can override these -->
  <Define item="Formats.Exception">
    <item>application/vnd.ogc.se_xml</item>
@@ -215,8 +215,8 @@
  <Define item="Layer.Opaque">0</Define>
  <Define item="Layer.Title">&Layer.Title;</Define>
 
- <!-- Hack!- these are guard values in case the Layer.Bounds property 
-      is not well formed; Studio is offering zero data validation on 
+ <!-- Hack!- these are guard values in case the Layer.Bounds property
+      is not well formed; Studio is offering zero data validation on
       its input via the UI.  Of course, this isn't a perfect solution
       either, but it guards against the most likely cases.  If somebody
       types in a badly-formed <Bounds /> element that isn't EPSG:4326
@@ -233,7 +233,7 @@
  <!-- troublesome SRS to some appropriate WKT.                  -->
  <Define item="SRS.WKT.map">
   <!-- This example fixes a problem with EPSG:21781 not         -->
-       finding the WKT for EPSG:21781 in the CS library. 
+       finding the WKT for EPSG:21781 in the CS library.
        -->
   <translate from="EPSG:21781">PROJCS["CH1903.LV03",GEOGCS["LLCH1903",DATUM["CH-1903",SPHEROID["BESSEL",6377397.155,299.15281535],TOWGS84[660.0770,13.5510,369.3440,0.804816,0.577692,0.952236,5.66000000]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Swiss_Oblique_Cylindrical"],PARAMETER["central_meridian",7.43958333333333],PARAMETER["latitude_of_origin",46.95240555555556],PARAMETER["false_easting",600000.000],PARAMETER["false_northing",200000.000],UNIT["Meter",1.00000000000000],AXIS["Y",NORTH],AXIS["X",EAST]]"</translate>
 
@@ -242,13 +242,13 @@
 </Definitions>
 
 
-<!--  This is the exception of last resort, and is used if   
-      no exception Response is found in the version-specific 
-      template (or if an error occurs before a version can   
-      be established.)                                       
-      By this declaration, we say the default response shall 
-      be html.  Of course, any appropriate <Response/> in    
-      the template file will supercede this.                 
+<!--  This is the exception of last resort, and is used if
+      no exception Response is found in the version-specific
+      template (or if an error occurs before a version can
+      be established.)
+      By this declaration, we say the default response shall
+      be html.  Of course, any appropriate <Response/> in
+      the template file will supercede this.
 -->
 
 <Exception content-type="text/html">

Modified: trunk/MgDev/Server/src/Wms/REGRESS.xml.awd
===================================================================
--- trunk/MgDev/Server/src/Wms/REGRESS.xml.awd	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Server/src/Wms/REGRESS.xml.awd	2010-01-09 08:30:45 UTC (rev 4507)
@@ -139,8 +139,8 @@
 
  <Test name="Response.xml">
   <Purpose>Verifies that the response is XML, verifies that Definitions and Expansions work, and establishes that the &lt;?If ?&gt; Processing Instruction functions using the "eq"uality operator -- fundamental functionality that needs to be in place to perform the remainder of the tests</Purpose>
-  <!-- 
-  Each test enumerates those aspects of the OgcServer engine that they exercise 
+  <!--
+  Each test enumerates those aspects of the OgcServer engine that they exercise
   and/or rely on to complete.  A failure of any given test should call into question
   the items enumerated here.  A failure of several tests should call into question
   the intersection of each test's <Exercises> set.
@@ -157,8 +157,8 @@
   <Expected>&Response.Xml.Expected;</Expected>
   <!-- The test actually generated the following result -->
   <Actual>&Response.Xml.Actual;</Actual>
-  <!-- 
-  The results are success or failure, based on the 
+  <!--
+  The results are success or failure, based on the
   equality of the two results above
   -->
   <Results>
@@ -167,9 +167,9 @@
  </Test>
 
  <Test name="VersionNegotiation">
-  <Purpose>Exercises the version negotiation code, to make sure it complies with the OGC spec: 
+  <Purpose>Exercises the version negotiation code, to make sure it complies with the OGC spec:
            (1) "If a version lower than any of those known to the server, then the server shall send the lowest version it supports."
-           (2) "If a version unknown to the server and higher than the lowest supported version, the server shall send the highest 
+           (2) "If a version unknown to the server and higher than the lowest supported version, the server shall send the highest
                version it supports that is less than the requested version"
 </Purpose>
   <Exercises>

Modified: trunk/MgDev/UnitTest/Common/DotNetWrappers/DotNetWrappers.csproj
===================================================================
--- trunk/MgDev/UnitTest/Common/DotNetWrappers/DotNetWrappers.csproj	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/UnitTest/Common/DotNetWrappers/DotNetWrappers.csproj	2010-01-09 08:30:45 UTC (rev 4507)
@@ -47,7 +47,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>

Modified: trunk/MgDev/UnitTest/Common/FoundationTest/DotNetApi/Makefile
===================================================================
--- trunk/MgDev/UnitTest/Common/FoundationTest/DotNetApi/Makefile	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/UnitTest/Common/FoundationTest/DotNetApi/Makefile	2010-01-09 08:30:45 UTC (rev 4507)
@@ -6,11 +6,11 @@
 cleanbebug64:
   del /Q Mg*.cs
   del ..\..\bin\debug64\MapGuideDotNetApid.dll
-  
+
 cleanrelease:
   del /Q Mg*.cs
   del ..\..\bin\release\MapGuideDotNetApi.dll
-  
+
 cleanrelease64:
   del /Q Mg*.cs
   del ..\..\bin\release64\MapGuideDotNetApi.dll
@@ -23,14 +23,14 @@
 
 release64: ..\..\bin\release64\MapGuideDotNetApi.dll
 
-..\..\bin\debug\MapGuideDotNetApid.dll: 
+..\..\bin\debug\MapGuideDotNetApid.dll:
   csc.exe /out:..\..\bin\debug\MapGuideDotNetApid.dll /target:library /debug+ /debug:full *.cs
-  
-..\..\bin\debug64\MapGuideDotNetApid.dll: 
+
+..\..\bin\debug64\MapGuideDotNetApid.dll:
   csc.exe /out:..\..\bin\debug64\MapGuideDotNetApid.dll /target:library /debug+ /debug:full *.cs
 
-..\..\bin\release\MapGuideDotNetApi.dll: 
+..\..\bin\release\MapGuideDotNetApi.dll:
   csc.exe /out:..\..\bin\release\MapGuideDotNetApi.dll /target:library *.cs
-  
-..\..\bin\release64\MapGuideDotNetApi.dll: 
+
+..\..\bin\release64\MapGuideDotNetApi.dll:
   csc.exe /out:..\..\bin\release64\MapGuideDotNetApi.dll /target:library *.cs

Modified: trunk/MgDev/Web/src/ApacheAgent/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/ApacheAgent/Makefile.am	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/ApacheAgent/Makefile.am	2010-01-09 08:30:45 UTC (rev 4507)
@@ -41,7 +41,7 @@
                  -lMgPlatformBase \
                  -lMgMdfModel \
                  -lMgMdfParser \
-                 -lMgHttpHandler 
+                 -lMgHttpHandler
 
 mod_mgmapagent_la_LDFLAGS = -version-info 7:0:0 \
             -L../../../Oem/ACE/ACE_wrappers/ace \

Modified: trunk/MgDev/Web/src/CgiAgent/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/CgiAgent/Makefile.am	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/CgiAgent/Makefile.am	2010-01-09 08:30:45 UTC (rev 4507)
@@ -39,7 +39,7 @@
                  -lMgPlatformBase \
                  -lMgMdfModel \
                  -lMgMdfParser \
-                 -lMgHttpHandler 
+                 -lMgHttpHandler
 
 mapagent_LDFLAGS = \
             -L../../../Oem/ACE/ACE_wrappers/ace \

Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml	2010-01-09 08:30:45 UTC (rev 4507)
@@ -8,7 +8,7 @@
 <!--
    Custom file path.
 -->
-<CustomFile path="./GeometryCustom" />  
+<CustomFile path="./GeometryCustom" />
 
 <!--
    Target section.

Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApiGen.xml
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApiGen.xml	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApiGen.xml	2010-01-09 08:30:45 UTC (rev 4507)
@@ -4,11 +4,11 @@
    Module section.
 -->
 <Module name="MapGuideCommonApi" />
-  
+
 <!--
    Custom file path.
 -->
-<CustomFile path="./MapGuideCommonCustom" />  
+<CustomFile path="./MapGuideCommonCustom" />
 
 <!--
    Target section.

Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml	2010-01-09 08:30:45 UTC (rev 4507)
@@ -9,7 +9,7 @@
    Custom file path.
 -->
 <CustomFile path="./PlatformBaseCustom" />
-  
+
 <!--
    Target section.
 -->

Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApiGen.xml
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApiGen.xml	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApiGen.xml	2010-01-09 08:30:45 UTC (rev 4507)
@@ -4,11 +4,11 @@
    Module section.
 -->
 <Module name="MapGuideApi" />
-  
+
 <!--
    Custom file path.
 -->
-<CustomFile path="./WebCustom" />  
+<CustomFile path="./WebCustom" />
 
 <!--
    Target section.

Modified: trunk/MgDev/Web/src/HttpHandler/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/Makefile.am	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/HttpHandler/Makefile.am	2010-01-09 08:30:45 UTC (rev 4507)
@@ -12,7 +12,7 @@
               -I../../../Oem/ACE/ACE_wrappers \
               -I../../../Oem/dbxml-2.3.10/xerces-c-src/src \
               -I../../../Oem/jsoncpp/include
-              
+
 lib_LTLIBRARIES = libMgHttpHandler.la
 
 libMgHttpHandler_la_SOURCES = HttpHandlerBuild.cpp
@@ -286,4 +286,3 @@
     -L../../../Common/PlatformBase \
     -L../../../Common/MapGuideCommon \
     -L../../../Oem/jsoncpp/lib
-    
\ No newline at end of file

Modified: trunk/MgDev/Web/src/JavaApi/org/osgeo/mapguide/MgBase64.java
===================================================================
--- trunk/MgDev/Web/src/JavaApi/org/osgeo/mapguide/MgBase64.java	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/JavaApi/org/osgeo/mapguide/MgBase64.java	2010-01-09 08:30:45 UTC (rev 4507)
@@ -28,17 +28,17 @@
  *   with other encodings (like EBCDIC).</li>
  *  <li>v2.0.1 - Fixed an error when decoding a single byte, that is, when the
  *   encoded data was a single byte.</li>
- *  <li>v2.0 - I got rid of methods that used booleans to set options. 
+ *  <li>v2.0 - I got rid of methods that used booleans to set options.
  *   Now everything is more consolidated and cleaner. The code now detects
  *   when data that's being decoded is gzip-compressed and will decompress it
  *   automatically. Generally things are cleaner. You'll probably have to
  *   change some method calls that you were making to support the new
  *   options format (<tt>int</tt>s that you "OR" together).</li>
- *  <li>v1.5.1 - Fixed bug when decompressing and decoding to a             
- *   byte[] using <tt>decode( String s, boolean gzipCompressed )</tt>.      
- *   Added the ability to "suspend" encoding in the Output Stream so        
- *   you can turn on and off the encoding if you need to embed base64       
- *   data in an otherwise "normal" stream (like an XML file).</li>  
+ *  <li>v1.5.1 - Fixed bug when decompressing and decoding to a
+ *   byte[] using <tt>decode( String s, boolean gzipCompressed )</tt>.
+ *   Added the ability to "suspend" encoding in the Output Stream so
+ *   you can turn on and off the encoding if you need to embed base64
+ *   data in an otherwise "normal" stream (like an XML file).</li>
  *  <li>v1.5 - Output stream pases on flush() command but doesn't do anything itself.
  *      This helps when using GZIP streams.
  *      Added the ability to GZip-compress objects before encoding them.</li>
@@ -67,64 +67,64 @@
 
 public class MgBase64
 {
-    
-/* ********  P U B L I C   F I E L D S  ******** */   
-    
-    
+
+/* ********  P U B L I C   F I E L D S  ******** */
+
+
     /** No options specified. Value is zero. */
     public final static int NO_OPTIONS = 0;
-    
+
     /** Specify encoding. */
     public final static int ENCODE = 1;
-    
-    
+
+
     /** Specify decoding. */
     public final static int DECODE = 0;
-    
-    
+
+
     /** Specify that data should be gzip-compressed. */
     public final static int GZIP = 2;
-    
-    
+
+
     /** Don't break lines when encoding (violates strict Base64 specification) */
     public final static int DONT_BREAK_LINES = 8;
-    
-    
-/* ********  P R I V A T E   F I E L D S  ******** */  
-    
-    
+
+
+/* ********  P R I V A T E   F I E L D S  ******** */
+
+
     /** Maximum line length (76) of Base64 output. */
     private final static int MAX_LINE_LENGTH = 76;
-    
-    
+
+
     /** The equals sign (=) as a byte. */
     private final static byte EQUALS_SIGN = (byte)'=';
-    
-    
+
+
     /** The new line character (\n) as a byte. */
     private final static byte NEW_LINE = (byte)'\n';
-    
-    
+
+
     /** Preferred encoding. */
     private final static String PREFERRED_ENCODING = "UTF-8";
-    
-    
+
+
     /** The 64 valid Base64 values. */
     private final static byte[] ALPHABET;
     private final static byte[] _NATIVE_ALPHABET = /* May be something funny like EBCDIC */
     {
         (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
         (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
-        (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U', 
+        (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
         (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
         (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
         (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
-        (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u', 
+        (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
         (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
-        (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5', 
+        (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5',
         (byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'+', (byte)'/'
     };
-    
+
     /** Determine which ALPHABET to use. */
     static
     {
@@ -139,14 +139,14 @@
         }   // end catch
         ALPHABET = __bytes;
     }   // end static
-    
-    
-    /** 
+
+
+    /**
      * Translates a Base64 value to either its 6-bit reconstruction value
      * or a negative number indicating some other meaning.
      **/
     private final static byte[] DECODABET =
-    {   
+    {
         -9,-9,-9,-9,-9,-9,-9,-9,-9,                 // Decimal  0 -  8
         -5,-5,                                      // Whitespace: Tab and Linefeed
         -9,-9,                                      // Decimal 11 - 12
@@ -179,21 +179,21 @@
         -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 231 - 243
         -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9         // Decimal 244 - 255 */
     };
-    
+
     // I think I end up not using the BAD_ENCODING indicator.
     //private final static byte BAD_ENCODING    = -9; // Indicates error in encoding
     private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
     private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
 
-    
+
     /** Defeats instantiation. */
     private MgBase64(){}
-    
-    
-    
-/* ********  E N C O D I N G   M E T H O D S  ******** */    
-    
-    
+
+
+
+/* ********  E N C O D I N G   M E T H O D S  ******** */
+
+
     /**
      * Encodes up to the first three bytes of array <var>threeBytes</var>
      * and returns a four-byte array in Base64 notation.
@@ -215,12 +215,12 @@
         return b4;
     }   // end encode3to4
 
-    
+
     /**
      * Encodes up to three bytes of the array <var>source</var>
      * and writes the resulting four Base64 bytes to <var>destination</var>.
      * The source and destination arrays can be manipulated
-     * anywhere along their length by specifying 
+     * anywhere along their length by specifying
      * <var>srcOffset</var> and <var>destOffset</var>.
      * This method does not check to make sure your arrays
      * are large enough to accomodate <var>srcOffset</var> + 3 for
@@ -237,17 +237,17 @@
      * @return the <var>destination</var> array
      * @since 1.3
      */
-    private static byte[] encode3to4( 
+    private static byte[] encode3to4(
      byte[] source, int srcOffset, int numSigBytes,
      byte[] destination, int destOffset )
     {
-        //           1         2         3  
+        //           1         2         3
         // 01234567890123456789012345678901 Bit position
         // --------000000001111111122222222 Array position from threeBytes
         // --------|    ||    ||    ||    | Six bit groups to index ALPHABET
         //          >>18  >>12  >> 6  >> 0  Right shift necessary
         //                0x3f  0x3f  0x3f  Additional AND
-        
+
         // Create buffer with zero-padding if there are only one or two
         // significant bytes passed in the array.
         // We have to shift left 24 in order to flush out the 1's that appear
@@ -264,28 +264,28 @@
                 destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>>  6) & 0x3f ];
                 destination[ destOffset + 3 ] = ALPHABET[ (inBuff       ) & 0x3f ];
                 return destination;
-                
+
             case 2:
                 destination[ destOffset     ] = ALPHABET[ (inBuff >>> 18)        ];
                 destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
                 destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>>  6) & 0x3f ];
                 destination[ destOffset + 3 ] = EQUALS_SIGN;
                 return destination;
-                
+
             case 1:
                 destination[ destOffset     ] = ALPHABET[ (inBuff >>> 18)        ];
                 destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
                 destination[ destOffset + 2 ] = EQUALS_SIGN;
                 destination[ destOffset + 3 ] = EQUALS_SIGN;
                 return destination;
-                
+
             default:
                 return destination;
         }   // end switch
     }   // end encode3to4
-    
-    
-    
+
+
+
     /**
      * Serializes an object and returns the Base64-encoded
      * version of that serialized object. If the object
@@ -301,9 +301,9 @@
     {
         return encodeObject( serializableObject, NO_OPTIONS );
     }   // end encodeObject
-    
 
 
+
     /**
      * Serializes an object and returns the Base64-encoded
      * version of that serialized object. If the object
@@ -330,21 +330,21 @@
     public static String encodeObject( java.io.Serializable serializableObject, int options )
     {
         // Streams
-        java.io.ByteArrayOutputStream  baos  = null; 
-        java.io.OutputStream           b64os = null; 
-        java.io.ObjectOutputStream     oos   = null; 
+        java.io.ByteArrayOutputStream  baos  = null;
+        java.io.OutputStream           b64os = null;
+        java.io.ObjectOutputStream     oos   = null;
         java.util.zip.GZIPOutputStream gzos  = null;
-        
+
         // Isolate options
         int gzip           = (options & GZIP);
         int dontBreakLines = (options & DONT_BREAK_LINES);
-        
+
         try
         {
             // ObjectOutputStream -> (GZIP) -> Base64 -> ByteArrayOutputStream
             baos  = new java.io.ByteArrayOutputStream();
             b64os = new MgBase64.OutputStream( baos, ENCODE | dontBreakLines );
-    
+
             // GZip?
             if( gzip == GZIP )
             {
@@ -353,7 +353,7 @@
             }   // end if: gzip
             else
                 oos   = new java.io.ObjectOutputStream( b64os );
-            
+
             oos.writeObject( serializableObject );
         }   // end try
         catch( java.io.IOException e )
@@ -368,9 +368,9 @@
             try{ b64os.close(); } catch( Exception e ){}
             try{ baos.close();  } catch( Exception e ){}
         }   // end finally
-        
+
         // Return value according to relevant encoding.
-        try 
+        try
         {
             return new String( baos.toByteArray(), PREFERRED_ENCODING );
         }   // end try
@@ -378,11 +378,11 @@
         {
             return new String( baos.toByteArray() );
         }   // end catch
-        
+
     }   // end encode
-    
-    
 
+
+
     /**
      * Encodes a byte array into Base64 notation.
      * Does not GZip-compress data.
@@ -394,9 +394,9 @@
     {
         return encodeBytes( source, 0, source.length, NO_OPTIONS );
     }   // end encodeBytes
-    
 
 
+
     /**
      * Encodes a byte array into Base64 notation.
      * <p>
@@ -418,11 +418,11 @@
      * @since 2.0
      */
     public static String encodeBytes( byte[] source, int options )
-    {   
+    {
         return encodeBytes( source, 0, source.length, options );
     }   // end encodeBytes
-    
-    
+
+
     /**
      * Encodes a byte array into Base64 notation.
      * Does not GZip-compress data.
@@ -436,9 +436,9 @@
     {
         return encodeBytes( source, off, len, NO_OPTIONS );
     }   // end encodeBytes
-    
-    
 
+
+
     /**
      * Encodes a byte array into Base64 notation.
      * <p>
@@ -466,22 +466,22 @@
         // Isolate options
         int dontBreakLines = ( options & DONT_BREAK_LINES );
         int gzip           = ( options & GZIP   );
-        
+
         // Compress?
         if( gzip == GZIP )
         {
             java.io.ByteArrayOutputStream  baos  = null;
             java.util.zip.GZIPOutputStream gzos  = null;
             MgBase64.OutputStream          b64os = null;
-            
-    
+
+
             try
             {
                 // GZip -> Base64 -> ByteArray
                 baos = new java.io.ByteArrayOutputStream();
                 b64os = new MgBase64.OutputStream( baos, ENCODE | dontBreakLines );
-                gzos  = new java.util.zip.GZIPOutputStream( b64os ); 
-            
+                gzos  = new java.util.zip.GZIPOutputStream( b64os );
+
                 gzos.write( source, off, len );
                 gzos.close();
             }   // end try
@@ -507,17 +507,17 @@
                 return new String( baos.toByteArray() );
             }   // end catch
         }   // end if: compress
-        
+
         // Else, don't compress. Better not to use streams at all then.
         else
         {
             // Convert option to boolean in way that code likes it.
             boolean breakLines = dontBreakLines == 0;
-            
+
             int    len43   = len * 4 / 3;
             byte[] outBuff = new byte[   ( len43 )                      // Main 4:3
                                        + ( (len % 3) > 0 ? 4 : 0 )      // Account for padding
-                                       + (breakLines ? ( len43 / MAX_LINE_LENGTH ) : 0) ]; // New lines      
+                                       + (breakLines ? ( len43 / MAX_LINE_LENGTH ) : 0) ]; // New lines
             int d = 0;
             int e = 0;
             int len2 = len - 2;
@@ -528,7 +528,7 @@
 
                 lineLength += 4;
                 if( breakLines && lineLength == MAX_LINE_LENGTH )
-                {   
+                {
                     outBuff[e+4] = NEW_LINE;
                     e++;
                     lineLength = 0;
@@ -541,7 +541,7 @@
                 e += 4;
             }   // end if: some padding needed
 
-            
+
             // Return value according to relevant encoding.
             try
             {
@@ -551,33 +551,33 @@
             {
                 return new String( outBuff, 0, e );
             }   // end catch
-            
+
         }   // end else: don't compress
-        
+
     }   // end encodeBytes
-    
 
-    
-    
-    
+
+
+
+
 /* ********  D E C O D I N G   M E T H O D S  ******** */
-    
-    
+
+
     /**
      * Decodes four bytes from array <var>source</var>
      * and writes the resulting bytes (up to three of them)
      * to <var>destination</var>.
      * The source and destination arrays can be manipulated
-     * anywhere along their length by specifying 
+     * anywhere along their length by specifying
      * <var>srcOffset</var> and <var>destOffset</var>.
      * This method does not check to make sure your arrays
      * are large enough to accomodate <var>srcOffset</var> + 4 for
      * the <var>source</var> array or <var>destOffset</var> + 3 for
      * the <var>destination</var> array.
-     * This method returns the actual number of bytes that 
+     * This method returns the actual number of bytes that
      * were converted from the Base64 encoding.
-     * 
      *
+     *
      * @param source the array to convert
      * @param srcOffset the index where conversion begins
      * @param destination the array to hold the conversion
@@ -595,11 +595,11 @@
             //              | ( ( DECODABET[ source[ srcOffset + 1] ] << 24 ) >>> 12 );
             int outBuff =   ( ( DECODABET[ source[ srcOffset    ] ] & 0xFF ) << 18 )
                           | ( ( DECODABET[ source[ srcOffset + 1] ] & 0xFF ) << 12 );
-            
+
             destination[ destOffset ] = (byte)( outBuff >>> 16 );
             return 1;
         }
-        
+
         // Example: DkL=
         else if( source[ srcOffset + 3 ] == EQUALS_SIGN )
         {
@@ -610,12 +610,12 @@
             int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] & 0xFF ) << 18 )
                           | ( ( DECODABET[ source[ srcOffset + 1 ] ] & 0xFF ) << 12 )
                           | ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) <<  6 );
-            
+
             destination[ destOffset     ] = (byte)( outBuff >>> 16 );
             destination[ destOffset + 1 ] = (byte)( outBuff >>>  8 );
             return 2;
         }
-        
+
         // Example: DkLE
         else
         {
@@ -630,7 +630,7 @@
                           | ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) <<  6)
                           | ( ( DECODABET[ source[ srcOffset + 3 ] ] & 0xFF )      );
 
-            
+
             destination[ destOffset     ] = (byte)( outBuff >> 16 );
             destination[ destOffset + 1 ] = (byte)( outBuff >>  8 );
             destination[ destOffset + 2 ] = (byte)( outBuff       );
@@ -645,10 +645,10 @@
             }   //e nd catch
         }
     }   // end decodeToBytes
-    
-    
-    
-    
+
+
+
+
     /**
      * Very low-level access to decoding ASCII characters in
      * the form of a byte array. Does not support automatically
@@ -665,7 +665,7 @@
         int    len34   = len * 3 / 4;
         byte[] outBuff = new byte[ len34 ]; // Upper limit on size of output
         int    outBuffPosn = 0;
-        
+
         byte[] b4        = new byte[4];
         int    b4Posn    = 0;
         int    i         = 0;
@@ -675,7 +675,7 @@
         {
             sbiCrop = (byte)(source[i] & 0x7f); // Only the low seven bits
             sbiDecode = DECODABET[ sbiCrop ];
-            
+
             if( sbiDecode >= WHITE_SPACE_ENC ) // White space, Equals sign or better
             {
                 if( sbiDecode >= EQUALS_SIGN_ENC )
@@ -685,30 +685,30 @@
                     {
                         outBuffPosn += decode4to3( b4, 0, outBuff, outBuffPosn );
                         b4Posn = 0;
-                        
+
                         // If that was the equals sign, break out of 'for' loop
                         if( sbiCrop == EQUALS_SIGN )
                             break;
                     }   // end if: quartet built
-                    
+
                 }   // end if: equals sign or better
-                
+
             }   // end if: white space, equals sign or better
             else
             {
                 System.err.println( "Bad Base64 input character at " + i + ": " + source[i] + "(decimal)" );
                 return null;
-            }   // end else: 
+            }   // end else:
         }   // each input character
-                                   
+
         byte[] out = new byte[ outBuffPosn ];
-        System.arraycopy( outBuff, 0, out, 0, outBuffPosn ); 
+        System.arraycopy( outBuff, 0, out, 0, outBuffPosn );
         return out;
     }   // end decode
-    
-    
-    
-    
+
+
+
+
     /**
      * Decodes data from Base64 notation, automatically
      * detecting gzip-compressed data and decompressing it.
@@ -718,7 +718,7 @@
      * @since 1.4
      */
     public static byte[] decode( String s )
-    {   
+    {
         byte[] bytes;
         try
         {
@@ -729,18 +729,18 @@
             bytes = s.getBytes();
         }   // end catch
         //</change>
-        
+
         // Decode
         bytes = decode( bytes, 0, bytes.length );
-        
-        
+
+
         // Check to see if it's gzip-compressed
         // GZIP Magic Two-Byte Number: 0x8b1f (35615)
         if( bytes != null && bytes.length >= 4 )
         {
-            
-            int head = ((int)bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);       
-            if( java.util.zip.GZIPInputStream.GZIP_MAGIC == head ) 
+
+            int head = ((int)bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);
+            if( java.util.zip.GZIPInputStream.GZIP_MAGIC == head )
             {
                 java.io.ByteArrayInputStream  bais = null;
                 java.util.zip.GZIPInputStream gzis = null;
@@ -776,13 +776,13 @@
 
             }   // end if: gzipped
         }   // end if: bytes.length >= 2
-        
+
         return bytes;
     }   // end decode
 
 
-    
 
+
     /**
      * Attempts to decode Base64 data and deserialize a Java
      * Object within. Returns <tt>null</tt> if there was an error.
@@ -795,16 +795,16 @@
     {
         // Decode and gunzip if necessary
         byte[] objBytes = decode( encodedObject );
-        
+
         java.io.ByteArrayInputStream  bais = null;
         java.io.ObjectInputStream     ois  = null;
         Object obj = null;
-        
+
         try
         {
             bais = new java.io.ByteArrayInputStream( objBytes );
             ois  = new java.io.ObjectInputStream( bais );
-        
+
             obj = ois.readObject();
         }   // end try
         catch( java.io.IOException e )
@@ -822,12 +822,12 @@
             try{ bais.close(); } catch( Exception e ){}
             try{ ois.close();  } catch( Exception e ){}
         }   // end finally
-        
+
         return obj;
     }   // end decodeObject
-    
-    
-    
+
+
+
     /**
      * Convenience method for encoding data to a file.
      *
@@ -843,25 +843,25 @@
         MgBase64.OutputStream bos = null;
         try
         {
-            bos = new MgBase64.OutputStream( 
+            bos = new MgBase64.OutputStream(
                       new java.io.FileOutputStream( filename ), MgBase64.ENCODE );
             bos.write( dataToEncode );
             success = true;
         }   // end try
         catch( java.io.IOException e )
         {
-            
+
             success = false;
         }   // end catch: IOException
         finally
         {
             try{ bos.close(); } catch( Exception e ){}
         }   // end finally
-        
+
         return success;
     }   // end encodeToFile
-    
-    
+
+
     /**
      * Convenience method for decoding data to a file.
      *
@@ -877,7 +877,7 @@
         MgBase64.OutputStream bos = null;
         try
         {
-                bos = new MgBase64.OutputStream( 
+                bos = new MgBase64.OutputStream(
                           new java.io.FileOutputStream( filename ), MgBase64.DECODE );
                 bos.write( dataToDecode.getBytes( PREFERRED_ENCODING ) );
                 success = true;
@@ -890,13 +890,13 @@
         {
                 try{ bos.close(); } catch( Exception e ){}
         }   // end finally
-        
+
         return success;
     }   // end decodeToFile
-    
-    
-    
-    
+
+
+
+
     /**
      * Convenience method for reading a base64-encoded
      * file and decoding it.
@@ -917,7 +917,7 @@
             byte[] buffer = null;
             int length   = 0;
             int numBytes = 0;
-            
+
             // Check for size of file
             if( file.length() > Integer.MAX_VALUE )
             {
@@ -925,20 +925,20 @@
                 return null;
             }   // end if: file too big for int index
             buffer = new byte[ (int)file.length() ];
-            
+
             // Open a stream
-            bis = new MgBase64.InputStream( 
-                      new java.io.BufferedInputStream( 
+            bis = new MgBase64.InputStream(
+                      new java.io.BufferedInputStream(
                       new java.io.FileInputStream( file ) ), MgBase64.DECODE );
-            
+
             // Read until done
             while( ( numBytes = bis.read( buffer, length, 4096 ) ) >= 0 )
                 length += numBytes;
-            
+
             // Save in a variable to return
             decodedData = new byte[ length ];
             System.arraycopy( buffer, 0, decodedData, 0, length );
-            
+
         }   // end try
         catch( java.io.IOException e )
         {
@@ -948,12 +948,12 @@
         {
             try{ bis.close(); } catch( Exception e) {}
         }   // end finally
-        
+
         return decodedData;
     }   // end decodeFromFile
-    
-    
-    
+
+
+
     /**
      * Convenience method for reading a binary file
      * and base64-encoding it.
@@ -974,19 +974,19 @@
             byte[] buffer = new byte[ (int)(file.length() * 1.4) ];
             int length   = 0;
             int numBytes = 0;
-            
+
             // Open a stream
-            bis = new MgBase64.InputStream( 
-                      new java.io.BufferedInputStream( 
+            bis = new MgBase64.InputStream(
+                      new java.io.BufferedInputStream(
                       new java.io.FileInputStream( file ) ), MgBase64.ENCODE );
-            
+
             // Read until done
             while( ( numBytes = bis.read( buffer, length, 4096 ) ) >= 0 )
                 length += numBytes;
-            
+
             // Save in a variable to return
             encodedData = new String( buffer, 0, length, MgBase64.PREFERRED_ENCODING );
-                
+
         }   // end try
         catch( java.io.IOException e )
         {
@@ -996,17 +996,17 @@
         {
             try{ bis.close(); } catch( Exception e) {}
         }   // end finally
-        
+
         return encodedData;
         }   // end encodeFromFile
-    
-    
-    
-    
+
+
+
+
     /* ********  I N N E R   C L A S S   I N P U T S T R E A M  ******** */
-    
-    
-    
+
+
+
     /**
      * A {@link MgBase64.InputStream} will read data from another
      * <tt>java.io.InputStream</tt>, given in the constructor,
@@ -1024,8 +1024,8 @@
         private int     numSigBytes;    // Number of meaningful bytes in the buffer
         private int     lineLength;
         private boolean breakLines;     // Break lines at less than 80 characters
-        
-        
+
+
         /**
          * Constructs a {@link MgBase64.InputStream} in DECODE mode.
          *
@@ -1033,11 +1033,11 @@
          * @since 1.3
          */
         public InputStream( java.io.InputStream in )
-        {   
+        {
             this( in, DECODE );
         }   // end constructor
-        
-        
+
+
         /**
          * Constructs a {@link MgBase64.InputStream} in
          * either ENCODE or DECODE mode.
@@ -1060,7 +1060,7 @@
          * @since 2.0
          */
         public InputStream( java.io.InputStream in, int options )
-        {   
+        {
             super( in );
             this.breakLines   = (options & DONT_BREAK_LINES) != DONT_BREAK_LINES;
             this.encode       = (options & ENCODE) == ENCODE;
@@ -1069,7 +1069,7 @@
             this.position = -1;
             this.lineLength = 0;
         }   // end constructor
-        
+
         /**
          * Reads enough of the input stream to convert
          * to/from Base64 and returns the next byte.
@@ -1077,8 +1077,8 @@
          * @return next byte
          * @since 1.3
          */
-        public int read() throws java.io.IOException 
-        { 
+        public int read() throws java.io.IOException
+        {
             // Do we need to get data?
             if( position < 0 )
             {
@@ -1089,26 +1089,26 @@
                     for( int i = 0; i < 3; i++ )
                     {
                         try
-                        { 
+                        {
                             int b = in.read();
-                            
+
                             // If end of stream, b is -1.
                             if( b >= 0 )
                             {
                                 b3[i] = (byte)b;
                                 numBinaryBytes++;
                             }   // end if: not end of stream
-                            
+
                         }   // end try: read
                         catch( java.io.IOException e )
-                        {   
+                        {
                             // Only a problem if we got no data at all.
                             if( i == 0 )
                                 throw e;
-                            
+
                         }   // end catch
                     }   // end for: each needed input byte
-                    
+
                     if( numBinaryBytes > 0 )
                     {
                         encode3to4( b3, 0, numBinaryBytes, buffer, 0 );
@@ -1120,7 +1120,7 @@
                         return -1;
                     }   // end else
                 }   // end if: encoding
-                
+
                 // Else decoding
                 else
                 {
@@ -1132,13 +1132,13 @@
                         int b = 0;
                         do{ b = in.read(); }
                         while( b >= 0 && DECODABET[ b & 0x7f ] <= WHITE_SPACE_ENC );
-                        
+
                         if( b < 0 )
                             break; // Reads a -1 if end of stream
-                        
+
                         b4[i] = (byte)b;
                     }   // end for: each needed input byte
-                    
+
                     if( i == 4 )
                     {
                         numSigBytes = decode4to3( b4, 0, buffer, 0 );
@@ -1151,18 +1151,18 @@
                     {
                         // Must have broken out from above.
                         throw new java.io.IOException( "Improperly padded Base64 input." );
-                    }   // end 
-                    
+                    }   // end
+
                 }   // end else: decode
             }   // end else: get data
-            
+
             // Got data?
             if( position >= 0 )
             {
                 // End of relevant data?
                 if( /*!encode &&*/ position >= numSigBytes )
                     return -1;
-                
+
                 if( encode && breakLines && lineLength >= MAX_LINE_LENGTH )
                 {
                     lineLength = 0;
@@ -1173,7 +1173,7 @@
                     lineLength++;   // This isn't important when decoding
                                     // but throwing an extra "if" seems
                                     // just as wasteful.
-                    
+
                     int b = buffer[ position++ ];
 
                     if( position >= bufferLength )
@@ -1183,16 +1183,16 @@
                                      // intended to be unsigned.
                 }   // end else
             }   // end if: position >= 0
-            
+
             // Else error
             else
-            {   
+            {
                 // When JDK1.4 is more accepted, use an assertion here.
                 throw new java.io.IOException( "Error in Base64 code reading stream." );
             }   // end else
         }   // end read
-        
-        
+
+
         /**
          * Calls {@link #read()} repeatedly until the end of stream
          * is reached or <var>len</var> bytes are read.
@@ -1212,10 +1212,10 @@
             for( i = 0; i < len; i++ )
             {
                 b = read();
-                
+
                 //if( b < 0 && i == 0 )
                 //    return -1;
-                
+
                 if( b >= 0 )
                     dest[off + i] = (byte)b;
                 else if( i == 0 )
@@ -1225,18 +1225,18 @@
             }   // end for: each byte read
             return i;
         }   // end read
-        
+
     }   // end inner class InputStream
-    
-    
-    
-    
-    
-    
+
+
+
+
+
+
     /* ********  I N N E R   C L A S S   O U T P U T S T R E A M  ******** */
-    
-    
-    
+
+
+
     /**
      * A {@link MgBase64.OutputStream} will write data to another
      * <tt>java.io.OutputStream</tt>, given in the constructor,
@@ -1255,7 +1255,7 @@
         private boolean breakLines;
         private byte[]  b4; // Scratch used in a few places
         private boolean suspendEncoding;
-        
+
         /**
          * Constructs a {@link Base64.OutputStream} in ENCODE mode.
          *
@@ -1263,11 +1263,11 @@
          * @since 1.3
          */
         public OutputStream( java.io.OutputStream out )
-        {   
+        {
             this( out, ENCODE );
         }   // end constructor
-        
-        
+
+
         /**
          * Constructs a {@link Base64.OutputStream} in
          * either ENCODE or DECODE mode.
@@ -1289,7 +1289,7 @@
          * @since 1.3
          */
         public OutputStream( java.io.OutputStream out, int options )
-        {   
+        {
             super( out );
             this.breakLines   = (options & DONT_BREAK_LINES) != DONT_BREAK_LINES;
             this.encode       = (options & ENCODE) == ENCODE;
@@ -1300,8 +1300,8 @@
             this.suspendEncoding = false;
             this.b4           = new byte[4];
         }   // end constructor
-        
-        
+
+
         /**
          * Writes the byte to the output stream after
          * converting to/from Base64 notation.
@@ -1322,7 +1322,7 @@
                 super.out.write( theByte );
                 return;
             }   // end if: supsended
-            
+
             // Encode?
             if( encode )
             {
@@ -1363,11 +1363,11 @@
                 }   // end else: not white space either
             }   // end else: decoding
         }   // end write
-        
-        
-        
+
+
+
         /**
-         * Calls {@link #write(int)} repeatedly until <var>len</var> 
+         * Calls {@link #write(int)} repeatedly until <var>len</var>
          * bytes are written.
          *
          * @param theBytes array from which to read bytes
@@ -1383,21 +1383,21 @@
                 super.out.write( theBytes, off, len );
                 return;
             }   // end if: supsended
-            
+
             for( int i = 0; i < len; i++ )
             {
                 write( theBytes[ off + i ] );
             }   // end for: each byte written
-            
+
         }   // end write
-        
-        
-        
+
+
+
         /**
          * Method added by PHIL. [Thanks, PHIL. -Rob]
          * This pads the buffer without closing the stream.
          */
-        public void flushBase64() throws java.io.IOException 
+        public void flushBase64() throws java.io.IOException
         {
             if( position > 0 )
             {
@@ -1414,9 +1414,9 @@
 
         }   // end flush
 
-        
-        /** 
-         * Flushes and closes (I think, in the superclass) the stream. 
+
+        /**
+         * Flushes and closes (I think, in the superclass) the stream.
          *
          * @since 1.3
          */
@@ -1428,13 +1428,13 @@
             // 2. Actually close the stream
             // Base class both flushes and closes.
             super.close();
-            
+
             buffer = null;
             out    = null;
         }   // end close
-        
-        
-        
+
+
+
         /**
          * Suspends encoding of the stream.
          * May be helpful if you need to embed a piece of
@@ -1442,13 +1442,13 @@
          *
          * @since 1.5.1
          */
-        public void suspendEncoding() throws java.io.IOException 
+        public void suspendEncoding() throws java.io.IOException
         {
             flushBase64();
             this.suspendEncoding = true;
         }   // end suspendEncoding
-        
-        
+
+
         /**
          * Resumes encoding of the stream.
          * May be helpful if you need to embed a piece of
@@ -1460,10 +1460,10 @@
         {
             this.suspendEncoding = false;
         }   // end resumeEncoding
-        
-        
-        
+
+
+
     }   // end inner class OutputStream
-    
-    
+
+
 }   // end class MgBase64

Modified: trunk/MgDev/Web/src/WebApp/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/WebApp/Makefile.am	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/WebApp/Makefile.am	2010-01-09 08:30:45 UTC (rev 4507)
@@ -82,11 +82,11 @@
            -I../../../Oem/dbxml-2.3.10/xerces-c-src/src \
            -I../../../Oem/ACE/ACE_wrappers
 
-libMgWebApp_la_LIBADD = -lxerces-c -lMgFoundation -lMgGeometry -lMgPlatformBase -lMgMapGuideCommon 
+libMgWebApp_la_LIBADD = -lxerces-c -lMgFoundation -lMgGeometry -lMgPlatformBase -lMgMapGuideCommon
 
 libMgWebApp_la_LDFLAGS = -version-info 7:0:0 \
             -L../../../Oem/dbxml-2.3.10/install/lib \
             -L../../../Common/Foundation \
             -L../../../Common/Geometry \
             -L../../../Common/PlatformBase \
-            -L../../../Common/MapGuideCommon 
+            -L../../../Common/MapGuideCommon

Modified: trunk/MgDev/Web/src/localized/help/en/style/cpm.css
===================================================================
--- trunk/MgDev/Web/src/localized/help/en/style/cpm.css	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/localized/help/en/style/cpm.css	2010-01-09 08:30:45 UTC (rev 4507)
@@ -557,9 +557,9 @@
 p.entryField {
 font-style: normal;
 font-weight: bold;
-} 	/* The same as 'uis-entryField'? */
+}   /* The same as 'uis-entryField'? */
 
-span.keyboardEntry { } 	/* The same as 'charspan-keyboardEntry'? */
+span.keyboardEntry { }  /* The same as 'charspan-keyboardEntry'? */
 
 span.keyCaps {
 font-style: normal;

Modified: trunk/MgDev/Web/src/mapviewerjava/legend.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/legend.jsp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/mapviewerjava/legend.jsp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -390,7 +390,7 @@
     {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         DocumentBuilder builder = factory.newDocumentBuilder();
-        InputStream is = new ByteArrayInputStream(layerData.getBytes("UTF-8")); 
+        InputStream is = new ByteArrayInputStream(layerData.getBytes("UTF-8"));
         Document doc = builder.parse(is);
         int type = 0;
         NodeList scaleRanges = doc.getElementsByTagName("VectorScaleRange");

Modified: trunk/MgDev/Web/src/mapviewerjava/measure.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/measure.jsp	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/mapviewerjava/measure.jsp	2010-01-09 08:30:45 UTC (rev 4507)
@@ -197,7 +197,7 @@
                     //data source already exist. clear its content
                     ClearDataSource(featureSrvc, dataSourceId, featureName);
                 }
-                
+
                 //Add the layer to the map, if it's not already in it
                 if(layer == null)
                 {

Modified: trunk/MgDev/Web/src/mapviewernet/measure.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/measure.aspx	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/mapviewernet/measure.aspx	2010-01-09 08:30:45 UTC (rev 4507)
@@ -187,7 +187,7 @@
                     layer.SetLegendLabel(legendName);
                     layers.Insert(0,layer);
                 }
-                
+
                 // create a feature representing this segment and insert it into the data source
                 //
                 MgPropertyCollection measureProps = new MgPropertyCollection();

Modified: trunk/MgDev/Web/src/mapviewerphp/measure.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/measure.php	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/mapviewerphp/measure.php	2010-01-09 08:30:45 UTC (rev 4507)
@@ -159,14 +159,14 @@
 
                     //Create the layer definition
                     $layerDefContent = BuildLayerDefinitionContent($dataSource, $featureName, $tip);
-                    $resourceSrvc->SetResource($layerDefId, $layerDefContent, null); 
+                    $resourceSrvc->SetResource($layerDefId, $layerDefContent, null);
                 }
                 else
                 {
                     //data source already exist. clear its content
                     ClearDataSource($featureSrvc, $dataSourceId, $featureName);
                 }
-                
+
                 //Add the layer to the map, if it's not already in it
                 if($layer == null)
                 {

Modified: trunk/MgDev/Web/src/mapviewerphp/templates/1.0.0.xml
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Web/src/mapviewerphp/templates/1.1.0.xml
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Web/src/mapviewerphp/templates/1.1.1.xml
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Web/src/mapviewerphp/templates/regress.xml
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Web/src/schemareport/displayschema.xsl
===================================================================
--- trunk/MgDev/Web/src/schemareport/displayschema.xsl	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/schemareport/displayschema.xsl	2010-01-09 08:30:45 UTC (rev 4507)
@@ -42,12 +42,12 @@
                     <xsl:variable name="currclassname" select="@name"/>
                     <h2><xsl:value-of select="$stringClassTitle"/> <xsl:value-of select="$currclassname"/></h2>
                     <xsl:choose>
-                    	<xsl:when test="@abstract='false'">
-                    		<span><a><xsl:attribute name="href">showclass.php?resId=<xsl:value-of select="$resName"/>&amp;schemaName=<xsl:value-of select="../@targetNamespace"/>&amp;className=<xsl:value-of select="$currclassname"/>&amp;sessionId=<xsl:value-of select="$sessionId"/>&amp;index=0</xsl:attribute><xsl:attribute name="target">viewFrame</xsl:attribute><xsl:value-of select="$stringViewData"/></a></span>
-                    	</xsl:when>
-                    	<xsl:otherwise>
-                    		<span class="gray"><xsl:value-of select="$stringNoData"/></span>
-                    	</xsl:otherwise>
+                        <xsl:when test="@abstract='false'">
+                            <span><a><xsl:attribute name="href">showclass.php?resId=<xsl:value-of select="$resName"/>&amp;schemaName=<xsl:value-of select="../@targetNamespace"/>&amp;className=<xsl:value-of select="$currclassname"/>&amp;sessionId=<xsl:value-of select="$sessionId"/>&amp;index=0</xsl:attribute><xsl:attribute name="target">viewFrame</xsl:attribute><xsl:value-of select="$stringViewData"/></a></span>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <span class="gray"><xsl:value-of select="$stringNoData"/></span>
+                        </xsl:otherwise>
                     </xsl:choose>
                     <xsl:apply-templates select="../xs:complexType">
                         <xsl:with-param name="selector" select="$selector"/>

Modified: trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ	2010-01-09 08:30:45 UTC (rev 4507)
@@ -895,7 +895,7 @@
     {
         HideHyperlinkTip();
 
-	// Ctrl + Click to open URL except MacOS, which using Command + Click
+        // Ctrl + Click to open URL except MacOS, which using Command + Click
         if(tool != 6 && ((e.ctrlKey && !macOS) || (e.metaKey && macOS )))
         {
             if(hlData.url != "")
@@ -927,10 +927,10 @@
                     StartToolFeedback(x, y, CIRCLE);
                     break;
                 case 6:
-		    if((e.ctrlKey && !macOS) || (e.metaKey && macOS))
-		    {
-			EndPolygonSelection(x, y);
-		    }
+                    if((e.ctrlKey && !macOS) || (e.metaKey && macOS))
+                    {
+                        EndPolygonSelection(x, y);
+                    }
                     else
                     {
                         if(polySel.xs.length == 0)
@@ -1877,7 +1877,7 @@
 function OnSelectionOverlayImageLoadedError(e)
 {
     var text = this.req.responseText;
-    
+
     var startPos = text.indexOf("<h2>");
     startPos = startPos + 4;
     var endPos = text.indexOf("</h2>", startPos);
@@ -1928,7 +1928,7 @@
     startPos = startPos + 4;
     var endPos = text.indexOf("</h2>", startPos);
     var message = text.substring(startPos, endPos);
-    
+
     alert(message);
 }
 

Modified: trunk/MgDev/Web/src/viewerfiles/bufferui.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/bufferui.templ	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/viewerfiles/bufferui.templ	2010-01-09 08:30:45 UTC (rev 4507)
@@ -56,7 +56,7 @@
 var transparent = 1;
 var pickClr;
 var thousandSeparator = "__#THOUSANDSEPARATOR#__";
-var decimalSeparator = "__#DECIMALSEPARATOR#__";    
+var decimalSeparator = "__#DECIMALSEPARATOR#__";
 
 function InitDocument()
 {
@@ -107,7 +107,7 @@
     elt.backgroundColor = transparent? "#ffffff": "#" + fbcolor;
     elt.color = transparent? "black": "#" + fbcolor;
 }
-            
+
 function Validate()
 {
     var field = document.getElementById("distance");

Modified: trunk/MgDev/Web/src/viewerfiles/dwfmappane.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/dwfmappane.templ	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/viewerfiles/dwfmappane.templ	2010-01-09 08:30:45 UTC (rev 4507)
@@ -491,14 +491,14 @@
     hidePopup(tbMenu);
     hidePopup(ctxMenu);
 }
-  
+
 function OnDblClick(x, y)
 {
     // Override this method in an external script to implement
     // your own double-click handler.
     // e.g. mapFrame.OnDblClick = MyOnDblClick
     // where MyOnDblClick() is a function in your script
-    
+
     return false;
 }
 

Modified: trunk/MgDev/Web/src/viewerfiles/legendui.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/legendui.templ	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/viewerfiles/legendui.templ	2010-01-09 08:30:45 UTC (rev 4507)
@@ -195,14 +195,14 @@
     var iconRequest = GetMapFrame().GetWebAgent() + "?OPERATION=GETLEGENDIMAGE&SESSION=" + GetMapFrame().GetSessionId() + "&VERSION=1.0.0&SCALE=" + scale + "&LAYERDEFINITION=" + encodeURIComponent(layerDef) + "&THEMECATEGORY=" + themeIndex + "&TYPE=" + geomtype + "&CLIENTAGENT=" + encodeURIComponent(clientAgent);
     return iconRequest;
 }
-            
+
 function BuildDelayedLoadIconImg(layerDef, scale, themeIndex, geomtype, iconId)
 {
     var request = BuildIconRequest(layerDef, scale, themeIndex, geomtype);
     iconsToLoad.push(new IconRequest(iconId, '<img width="16" height="16" onerror="OnLoadIconError()" onload="OnLoadIcon()" src="' + request + '" />'));
     return '<img width="16" height="16" src="../stdicons/transparentpixel.gif">';
 }
-  
+
 function OnLoadIcon()
 {
     LoadNextIcon();
@@ -229,7 +229,7 @@
         }
     }
 }
-            
+
 function IconRequest(id, request)
 {
     this.id = id;
@@ -277,10 +277,10 @@
             if(styles.length <= 10)
                 sc.showlongtheme = true;
             layerChildren.innerHTML = code;
-            
+
             sc.iconWasRequested = true;
         }
-        
+
         layerIconImg = iconThemeLayer;
     }
     else
@@ -306,7 +306,7 @@
     if(icElt != null)
         icElt.innerHTML = layerIconImg;
 }
-            
+
 function GetIconId(node)
 {
     return 'Ic_' + node.objectId;
@@ -357,7 +357,7 @@
         Expand(node);
 }
 
-// Expanding a node, the legend for the sub-items of this node will be generated dynamically 
+// Expanding a node, the legend for the sub-items of this node will be generated dynamically
 function Expand(node)
 {
     var elt = document.getElementById('ChildrenOf_' + node.objectId);
@@ -368,7 +368,7 @@
         RefreshNodesState(node.children);
         iconsToLoad.reverse();
         LoadNextIcon();
-        
+
         if(node.type == 0 || HasLayerThemes(node))
             ShowExpandedState(node);
     }
@@ -759,7 +759,7 @@
 }
 
 
-// there are three possible reasons to refresh the nodes' state: 
+// there are three possible reasons to refresh the nodes' state:
 // the first one is updating scale ranges to refresh the legend images
 // the second one is expanding a group to build the legend images of layers in that group.
 // the third one is expanding a layer node to build the legend images of themes in that layer.
@@ -810,7 +810,7 @@
                     break;
                 }
             }
-            
+
             if(node.displayInLegend && node.curScale != -1)
             {
                 // scale changed
@@ -818,8 +818,8 @@
                 {
                     // the layer's theme will be changed on demand
                     node.children[node.curScale].iconWasRequested = false;
-                    
-                    // the layer's legend image will be changed immediately 
+
+                    // the layer's legend image will be changed immediately
                     if(!HasCollapsedParent(node))
                     {
                         SetLayerStyles(node);
@@ -828,7 +828,6 @@
                     // the layer's legend image will be changed on demand
                     else
                     {
-                        
                         node.iconWasRequested = false;
                     }
                 }
@@ -839,7 +838,7 @@
                     node.iconWasRequested = true;
                 }
             }
-            
+
             node.isDisplayed = node.displayInLegend && node.curScale != -1;
         }
         else if(node.type == 2)

Modified: trunk/MgDev/Web/src/viewerfiles/mainframe.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/mainframe.templ	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/viewerfiles/mainframe.templ	2010-01-09 08:30:45 UTC (rev 4507)
@@ -424,19 +424,19 @@
     RestoreView();
     OnSelectionChanged();
     DisplayMapSize();
-    //ping server 
+    //ping server
     pingServerFailTime = 0;
     if(enablePingServer)
-    {    
-        var pingServerInterval = serverSessionTimeout / 5 * 1000;  //Ping server 5 times each period. Timeout is returned in seconds. 
+    {
+        var pingServerInterval = serverSessionTimeout / 5 * 1000;  //Ping server 5 times each period. Timeout is returned in seconds.
         intervalID = window.setInterval(GetServerSessionTimeout, pingServerInterval);
     }
 }
 
-function handler() 
+function handler()
 {
-    if(this.readyState == 4 && this.status != 200) 
-    {    
+    if(this.readyState == 4 && this.status != 200)
+    {
         // error happens
         if(pingServerFailTime < 6)
         {
@@ -453,9 +453,7 @@
 {
     var url = webAgentAddress + "?OPERATION=GETSESSIONTIMEOUT&VERSION=1.0.0&SESSION=" + GetMapFrame().GetSessionId() + "&LOCALE=" + locale + "&CLIENTAGENT=" + encodeComponent(clientAgentName) + "&REQUESTTIME=" + (new Date()).getTime();
     var request = new XMLHttpRequest();
-    
     request.onreadystatechange = handler;
-    
     request.open('GET', url);
     request.send(null);
 }
@@ -904,7 +902,7 @@
         mapUnitsType = GetMapFrame().GetMapUnitsType();
     return mapUnitsType;
 }
-        
+
 function FormatLocalizedDecimal(numberValue, decimalPlaces)
 {
     var unlocalized = numberValue.toFixed(decimalPlaces);

Modified: trunk/MgDev/Web/src/viewerfiles/sarissa.js
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/sarissa.js	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/viewerfiles/sarissa.js	2010-01-09 08:30:45 UTC (rev 4507)
@@ -9,25 +9,25 @@
  * ====================================================================
  * Licence
  * ====================================================================
- * Sarissa is free software distributed under the GNU GPL version 2 (see <a href="gpl.txt">gpl.txt</a>) or higher, 
- * GNU LGPL version 2.1 (see <a href="lgpl.txt">lgpl.txt</a>) or higher and Apache Software License 2.0 or higher 
- * (see <a href="asl.txt">asl.txt</a>). This means you can choose one of the three and use that if you like. If 
+ * Sarissa is free software distributed under the GNU GPL version 2 (see <a href="gpl.txt">gpl.txt</a>) or higher,
+ * GNU LGPL version 2.1 (see <a href="lgpl.txt">lgpl.txt</a>) or higher and Apache Software License 2.0 or higher
+ * (see <a href="asl.txt">asl.txt</a>). This means you can choose one of the three and use that if you like. If
  * you make modifications under the ASL, i would appreciate it if you submitted those.
  * In case your copy of Sarissa does not include the license texts, you may find
- * them online in various formats at <a href="http://www.gnu.org">http://www.gnu.org</a> and 
+ * them online in various formats at <a href="http://www.gnu.org">http://www.gnu.org</a> and
  * <a href="http://www.apache.org">http://www.apache.org</a>.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY 
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE 
- * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE 
- * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+ * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE
+ * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
  * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 /**
- * <p>Sarissa is a utility class. Provides "static" methods for DOMDocument, 
+ * <p>Sarissa is a utility class. Provides "static" methods for DOMDocument,
  * DOM Node serialization to XML strings and other utility goodies.</p>
  * @constructor
  * @static
@@ -65,16 +65,16 @@
 
 //This breaks for(x in o) loops in the old Safari
 if(Sarissa._SARISSA_IS_SAFARI_OLD){
-	HTMLHtmlElement = document.createElement("html").constructor;
-	Node = HTMLElement = {};
-	HTMLElement.prototype = HTMLHtmlElement.__proto__.__proto__;
-	HTMLDocument = Document = document.constructor;
-	var x = new DOMParser();
-	XMLDocument = x.constructor;
-	Element = x.parseFromString("<Single />", "text/xml").documentElement.constructor;
-	x = null;
+    HTMLHtmlElement = document.createElement("html").constructor;
+    Node = HTMLElement = {};
+    HTMLElement.prototype = HTMLHtmlElement.__proto__.__proto__;
+    HTMLDocument = Document = document.constructor;
+    var x = new DOMParser();
+    XMLDocument = x.constructor;
+    Element = x.parseFromString("<Single />", "text/xml").documentElement.constructor;
+    x = null;
 }
-if(typeof XMLDocument == "undefined" && typeof Document !="undefined"){ XMLDocument = Document; } 
+if(typeof XMLDocument == "undefined" && typeof Document !="undefined"){ XMLDocument = Document; }
 
 // IE initialization
 if(Sarissa._SARISSA_IS_IE){
@@ -141,13 +141,13 @@
         var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID);
         // if a root tag name was provided, we need to load it in the DOM object
         if (sName){
-            // create an artifical namespace prefix 
+            // create an artifical namespace prefix
             // or reuse existing prefix if applicable
             var prefix = "";
             if(sUri){
                 if(sName.indexOf(":") > 1){
                     prefix = sName.substring(0, sName.indexOf(":"));
-                    sName = sName.substring(sName.indexOf(":")+1); 
+                    sName = sName.substring(sName.indexOf(":")+1);
                 }else{
                     prefix = "a" + (Sarissa._sarissa_iNsCounter++);
                 }
@@ -161,14 +161,14 @@
         }
         return oDoc;
     };
-    // see non-IE version   
+    // see non-IE version
     Sarissa.getParseErrorText = function (oDoc) {
         var parseErrorText = Sarissa.PARSED_OK;
         if(oDoc && oDoc.parseError && oDoc.parseError.errorCode && oDoc.parseError.errorCode !== 0){
-            parseErrorText = "XML Parsing Error: " + oDoc.parseError.reason + 
-                "\nLocation: " + oDoc.parseError.url + 
-                "\nLine Number " + oDoc.parseError.line + ", Column " + 
-                oDoc.parseError.linepos + 
+            parseErrorText = "XML Parsing Error: " + oDoc.parseError.reason +
+                "\nLocation: " + oDoc.parseError.url +
+                "\nLine Number " + oDoc.parseError.line + ", Column " +
+                oDoc.parseError.linepos +
                 ":\n" + oDoc.parseError.srcText +
                 "\n";
             for(var i = 0;  i < oDoc.parseError.linepos;i++){
@@ -187,7 +187,7 @@
         oDoc.setProperty("SelectionNamespaces", sNsSet);
     };
     /**
-     * An implementation of Mozilla's XSLTProcessor for IE. 
+     * An implementation of Mozilla's XSLTProcessor for IE.
      * Reuses the same XSLT stylesheet for multiple transforms
      * @constructor
      */
@@ -213,16 +213,16 @@
         var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID);
         // make included/imported stylesheets work if exist and xsl was originally loaded from url
         try{
-            converted.resolveExternals = true; 
-            converted.setProperty("AllowDocumentFunction", true); 
+            converted.resolveExternals = true;
+            converted.setProperty("AllowDocumentFunction", true);
         }
         catch(e){
             // Ignore. "AllowDocumentFunction" is only supported in MSXML 3.0 SP4 and later.
-        } 
+        }
         if(xslDoc.url && xslDoc.selectSingleNode("//xsl:*[local-name() = 'import' or local-name() = 'include']") !== null){
             converted.async = false;
             converted.load(xslDoc.url);
-        } 
+        }
         else {
             converted.loadXML(xslDoc.xml);
         }
@@ -231,10 +231,10 @@
         //this.outputMethod = output ? output.getAttribute("method") : "html";
         if(output) {
             this.outputMethod = output.getAttribute("method");
-        } 
+        }
         else {
             delete this.outputMethod;
-        } 
+        }
         this.template.stylesheet = converted;
         this.processor = this.template.createProcessor();
         // for getParameter and clearParameters
@@ -262,14 +262,14 @@
             }
             this.processor.input = sourceDoc;
             outDoc = new ActiveXObject(_SARISSA_DOM_XMLWRITER);
-            this.processor.output = outDoc; 
+            this.processor.output = outDoc;
             this.processor.transform();
             var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID);
             oDoc.loadXML(outDoc.output+"");
             return oDoc;
         }
     };
-    
+
     /**
      * Transform the given XML DOM and return the transformation result as a new DOM fragment.
      * <b>Note</b>: The xsl:output method must match the nature of the owner document (XML/HTML).
@@ -306,7 +306,7 @@
         }
         return f;
     };
-    
+
     /**
      * Set global XSLT parameter of the imported stylesheet
      * @argument nsURI The parameter namespace URI
@@ -344,7 +344,7 @@
             return null;
         }
     };
-    
+
     /**
      * Clear parameters (set them to default values as defined in the stylesheet itself)
      */
@@ -393,11 +393,11 @@
                 oDoc.onreadystatechange();
             }
         };
-        
+
         Sarissa.getDomDocument = function(sUri, sName){
             var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null);
             if(!oDoc.onreadystatechange){
-            
+
                 /**
                 * <p>Emulate IE's onreadystatechange attribute</p>
                 */
@@ -420,7 +420,7 @@
             // do nothing
         }// TODO: check if the new document has content before trying to copynodes, check  for error handling in DOM 3 LS
         else if(Sarissa._SARISSA_HAS_DOM_FEATURE && window.Document && !Document.prototype.load && document.implementation.hasFeature('LS', '3.0')){
-    		//Opera 9 may get the XPath branch which gives creates XMLDocument, therefore it doesn't reach here which is good
+            //Opera 9 may get the XPath branch which gives creates XMLDocument, therefore it doesn't reach here which is good
             /**
             * <p>Factory method to obtain a new DOM Document object</p>
             * @memberOf Sarissa
@@ -455,10 +455,10 @@
          * @constructor
          */
         DOMParser = function() { };
-        /** 
+        /**
         * Construct a new DOM Document from the given XMLstring
         * @param sXml the given XML string
-        * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). 
+        * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml).
         * @return a new DOM Document from the given XML string
         */
         DOMParser.prototype.parseFromString = function(sXml, contentType){
@@ -545,7 +545,7 @@
  * Get a string with the concatenated values of all string nodes under the given node
  * @memberOf Sarissa
  * @argument oNode the given DOM node
- * @argument deep whether to recursively scan the children nodes of the given node for text as well. Default is <code>false</code> 
+ * @argument deep whether to recursively scan the children nodes of the given node for text as well. Default is <code>false</code>
  */
 Sarissa.getText = function(oNode, deep){
     var s = "";
@@ -596,7 +596,7 @@
 };
 /**
  * <p> Copies the childNodes of nodeFrom to nodeTo</p>
- * <p> <b>Note:</b> The second object's original content is deleted before 
+ * <p> <b>Note:</b> The second object's original content is deleted before
  * the copy operation, unless you supply a true third parameter</p>
  * @memberOf Sarissa
  * @argument nodeFrom the Node to copy the childNodes from
@@ -605,9 +605,9 @@
  */
 Sarissa.copyChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) {
     if(Sarissa._SARISSA_IS_SAFARI && nodeTo.nodeType == Node.DOCUMENT_NODE){ // SAFARI_OLD ??
-    	nodeTo = nodeTo.documentElement; //Appearantly there's a bug in safari where you can't appendChild to a document node
+        nodeTo = nodeTo.documentElement; //Appearantly there's a bug in safari where you can't appendChild to a document node
     }
-    
+
     if((!nodeFrom) || (!nodeTo)){
         throw "Both source and destination nodes must be provided";
     }
@@ -630,13 +630,13 @@
 
 /**
  * <p> Moves the childNodes of nodeFrom to nodeTo</p>
- * <p> <b>Note:</b> The second object's original content is deleted before 
+ * <p> <b>Note:</b> The second object's original content is deleted before
  * the move operation, unless you supply a true third parameter</p>
  * @memberOf Sarissa
  * @argument nodeFrom the Node to copy the childNodes from
  * @argument nodeTo the Node to copy the childNodes to
  * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is
- */ 
+ */
 Sarissa.moveChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) {
     if((!nodeFrom) || (!nodeTo)){
         throw "Both source and destination nodes must be provided";
@@ -666,9 +666,9 @@
     }
 };
 
-/** 
+/**
  * <p>Serialize any <strong>non</strong> DOM object to an XML string. All properties are serialized using the property name
- * as the XML element name. Array elements are rendered as <code>array-item</code> elements, 
+ * as the XML element name. Array elements are rendered as <code>array-item</code> elements,
  * using their index/key as the value of the <code>key</code> attribute.</p>
  * @memberOf Sarissa
  * @argument anyObject the object to serialize
@@ -693,7 +693,7 @@
     return (s += (objectName.indexOf(' ')!=-1?"</array-item>\n":"</" + objectName + ">\n"));
 };
 
-/** 
+/**
  * Escape the given string chacters that correspond to the five predefined XML entities
  * @memberOf Sarissa
  * @param sXml the string to escape
@@ -702,8 +702,8 @@
     return sXml.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
 };
 
-/** 
- * Unescape the given string. This turns the occurences of the predefined XML 
+/**
+ * Unescape the given string. This turns the occurences of the predefined XML
  * entities to become the characters they represent correspond to the five predefined XML entities
  * @memberOf Sarissa
  * @param sXml the string to unescape
@@ -720,9 +720,9 @@
 };
 
 /**
- * Asynchronously update an element with response of a GET request on the given URL.  Passing a configured XSLT 
+ * Asynchronously update an element with response of a GET request on the given URL.  Passing a configured XSLT
  * processor will result in transforming and updating oNode before using it to update oTargetElement.
- * You can also pass a callback function to be executed when the update is finished. The function will be called as 
+ * You can also pass a callback function to be executed when the update is finished. The function will be called as
  * <code>functionName(oNode, oTargetElement);</code>
  * @memberOf Sarissa
  * @param sFromUrl the URL to make the request to
@@ -756,14 +756,14 @@
 };
 
 /**
- * Update an element's content with the given DOM node. Passing a configured XSLT 
+ * Update an element's content with the given DOM node. Passing a configured XSLT
  * processor will result in transforming and updating oNode before using it to update oTargetElement.
- * You can also pass a callback function to be executed when the update is finished. The function will be called as 
+ * You can also pass a callback function to be executed when the update is finished. The function will be called as
  * <code>functionName(oNode, oTargetElement);</code>
  * @memberOf Sarissa
  * @param oNode the URL to make the request to
  * @param oTargetElement the element to update
- * @param xsltproc (optional) the transformer to use on the given 
+ * @param xsltproc (optional) the transformer to use on the given
  *                  DOM node before updating the target element with it
  * @param callback (optional) a Function object to execute once the update is finished successfuly, called as <code>callback(oNode, oTargetElement)</code>
  */
@@ -818,9 +818,9 @@
     var qs = "";
     for(var i = 0;i < oForm.elements.length;i++) {
         var oField = oForm.elements[i];
-        var sFieldName = oField.getAttribute("name") ? oField.getAttribute("name") : oField.getAttribute("id"); 
+        var sFieldName = oField.getAttribute("name") ? oField.getAttribute("name") : oField.getAttribute("id");
         // ensure we got a proper name/id and that the field is not disabled
-        if(sFieldName && 
+        if(sFieldName &&
             ((!oField.disabled) || oField.type == "hidden")) {
             switch(oField.type) {
                 case "hidden":
@@ -850,22 +850,22 @@
         }
     }
     // return after removing last '&'
-    return qs.substr(0, qs.length - 1); 
+    return qs.substr(0, qs.length - 1);
 };
 
 
 /**
- * Asynchronously update an element with response of an XMLHttpRequest-based emulation of a form submission. <p>The form <code>action</code> and 
- * <code>method</code> attributess will be followed. Passing a configured XSLT processor will result in 
+ * Asynchronously update an element with response of an XMLHttpRequest-based emulation of a form submission. <p>The form <code>action</code> and
+ * <code>method</code> attributess will be followed. Passing a configured XSLT processor will result in
  * transforming and updating the server response before using it to update the target element.
- * You can also pass a callback function to be executed when the update is finished. The function will be called as 
+ * You can also pass a callback function to be executed when the update is finished. The function will be called as
  * <code>functionName(oNode, oTargetElement);</code></p>
  * <p>Here is an example of using this in a form element:</p>
- * <pre name="code" class="xml">&lt;form action="/my/form/handler" method="post" 
+ * <pre name="code" class="xml">&lt;form action="/my/form/handler" method="post"
  *     onbeforesubmit="return Sarissa.updateContentFromForm(this, document.getElementById('targetId'));"&gt;<pre>
  * <p>If JavaScript is supported, the form will not be submitted. Instead, Sarissa will
- * scan the form and make an appropriate AJAX request, also adding a parameter 
- * to signal to the server that this is an AJAX call. The parameter is 
+ * scan the form and make an appropriate AJAX request, also adding a parameter
+ * to signal to the server that this is an AJAX call. The parameter is
  * constructed as <code>Sarissa.REMOTE_CALL_FLAG = "=true"</code> so you can change the name in your webpage
  * simply by assigning another value to Sarissa.REMOTE_CALL_FLAG. If JavaScript is not supported
  * the form will be submitted normally.

Modified: trunk/MgDev/Web/src/viewerfiles/statusbar.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/statusbar.templ	2010-01-09 07:24:49 UTC (rev 4506)
+++ trunk/MgDev/Web/src/viewerfiles/statusbar.templ	2010-01-09 08:30:45 UTC (rev 4507)
@@ -124,14 +124,14 @@
     }
 }
 
-function CalcKeyCode(aChar) 
+function CalcKeyCode(aChar)
 {
     var character = aChar.substring(0,1);
     var code = aChar.charCodeAt(0);
     return code;
 }
 
-function KeyboardController(val) 
+function KeyboardController(val)
 {
     var strPass = val.value;
     var strLength = strPass.length;
@@ -146,9 +146,9 @@
     return false;
 }
 
-function SetZoomToScale(val) 
+function SetZoomToScale(val)
 {
-    if (val.value == "") 
+    if (val.value == "")
     {
         val.value = origScaleValue;
         return;
@@ -162,7 +162,7 @@
 
 function OnScaleFieldKeyDown(event)
 {
-    if(event.keyCode==13) 
+    if(event.keyCode==13)
     {
         document.getElementById("4").focus();
     }
@@ -173,14 +173,14 @@
     var scaleField = GetScaleField();
     origScaleFieldBackground = scaleField.style.backgroundColor;
     scaleField.style.backgroundColor = 'lightyellow';
-    origScaleValue = scaleField.value; 
+    origScaleValue = scaleField.value;
     scaleField.value='';
 }
 
 function OnBlurScaleField()
 {
     var scaleField = GetScaleField();
-    scaleField.style.backgroundColor = origScaleFieldBackground; 
+    scaleField.style.backgroundColor = origScaleFieldBackground;
     SetZoomToScale(scaleField);
 }
 



More information about the mapguide-commits mailing list