[mapguide-commits] r6534 - in sandbox/adsk/2.3r: Common/MapGuideCommon/System Server/src/Common/Manager

[svn_mapguide at osgeo.org]

Author: christinebao
Date: 2012-03-04 18:36:31 -0800 (Sun, 04 Mar 2012)
New Revision: 6534

Modified:
   sandbox/adsk/2.3r/Common/MapGuideCommon/System/ConfigProperties.cpp
   sandbox/adsk/2.3r/Common/MapGuideCommon/System/ConfigProperties.h
   sandbox/adsk/2.3r/Server/src/Common/Manager/FdoConnectionManager.h
Log:
http://trac.osgeo.org/mapguide/ticket/1793
AIMS hang when foreign WMS is not available anymore
Integrate r6095, r6110, r6140 to Reeses SP2.
Previous submission forgot some files.

Modified: sandbox/adsk/2.3r/Common/MapGuideCommon/System/ConfigProperties.cpp
===================================================================
--- sandbox/adsk/2.3r/Common/MapGuideCommon/System/ConfigProperties.cpp	2012-03-02 06:27:11 UTC (rev 6533)
+++ sandbox/adsk/2.3r/Common/MapGuideCommon/System/ConfigProperties.cpp	2012-03-05 02:36:31 UTC (rev 6534)
@@ -273,6 +273,8 @@
 const INT32  MgConfigProperties::DefaultFeatureServicePropertyDataTransactionTimeout        = 360;
 const STRING MgConfigProperties::FeatureServicePropertyDataTransactionTimerInterval         = L"DataTransactionTimerInterval";
 const INT32  MgConfigProperties::DefaultFeatureServicePropertyDataTransactionTimerInterval  = 60;
+const STRING MgConfigProperties::FeatureServicePropertyFDOConnectionTimeoutCustom           = L"FDOConnectionTimeoutCustom";
+const STRING MgConfigProperties::DefaultFeatureServicePropertyFDOConnectionTimeoutCustom    = L"OSGeo.WMS:120";
 
 // ******************************************************************
 // Mapping Service Properties
@@ -619,6 +621,7 @@
     { MgConfigProperties::FeatureServicePropertyDataConnectionUseLimit              , MgPropertyType::String    , MG_CONFIG_MIN_FS_CP_EXCLUDED_LENGTH   , MG_CONFIG_MAX_FS_CP_EXCLUDED_LENGTH   , L""                                       },
     { MgConfigProperties::FeatureServicePropertyDataTransactionTimeout              , MgPropertyType::Int32     , MG_CONFIG_MIN_TIMEOUT                 , MG_CONFIG_MAX_TIMEOUT                 , L""                                       },
     { MgConfigProperties::FeatureServicePropertyDataTransactionTimerInterval        , MgPropertyType::Int32     , MG_CONFIG_MIN_TIMER_INTERVAL          , MG_CONFIG_MAX_TIMER_INTERVAL          , L""                                       },
+	{ MgConfigProperties::FeatureServicePropertyFDOConnectionTimeoutCustom          , MgPropertyType::String    , MG_CONFIG_MIN_FS_CP_EXCLUDED_LENGTH   , MG_CONFIG_MAX_FS_CP_EXCLUDED_LENGTH   , L""                                       },
     { L""                                                                           , 0                         , 0.0                                   , 0.0                                   , L""                                       }
 };
 

Modified: sandbox/adsk/2.3r/Common/MapGuideCommon/System/ConfigProperties.h
===================================================================
--- sandbox/adsk/2.3r/Common/MapGuideCommon/System/ConfigProperties.h	2012-03-02 06:27:11 UTC (rev 6533)
+++ sandbox/adsk/2.3r/Common/MapGuideCommon/System/ConfigProperties.h	2012-03-05 02:36:31 UTC (rev 6534)
@@ -334,6 +334,10 @@
     /// Sets the time duration (in seconds) between timeout checks
     static const STRING FeatureServicePropertyDataTransactionTimerInterval;      /// value("DataTransactionTimerInterval")
     static const INT32 DefaultFeatureServicePropertyDataTransactionTimerInterval;/// value(60)
+	
+	/// Set the time duration in seconds for an FDO connection
+    static const STRING FeatureServicePropertyFDOConnectionTimeoutCustom;        /// value("FDOConnectionTimeoutCustom")
+    static const STRING DefaultFeatureServicePropertyFDOConnectionTimeoutCustom; /// value("OSGeo.WMS:120")
 
     /// MAPPING SERVICE PROPERTIES SECTION -------------------------------------------------------------------------------
 

Modified: sandbox/adsk/2.3r/Server/src/Common/Manager/FdoConnectionManager.h
===================================================================
--- sandbox/adsk/2.3r/Server/src/Common/Manager/FdoConnectionManager.h	2012-03-02 06:27:11 UTC (rev 6533)
+++ sandbox/adsk/2.3r/Server/src/Common/Manager/FdoConnectionManager.h	2012-03-05 02:36:31 UTC (rev 6534)
@@ -252,6 +252,8 @@
 
     void SetConfiguration(CREFSTRING provider, FdoIConnection* pFdoConnection, MgResourceIdentifier* resourceIdentifier, STRING& configDataName);
     void SetConnectionProperties(FdoIConnection* pFdoConnection, MdfModel::FeatureSource* pFeatureSource);
+	
+	void SetConnectionTimeout(FdoIConnection* pFdoConnection, STRING providerName);
 
     void ActivateSpatialContext(FdoIConnection* pFdoConnection, STRING& spatialContextName);
     void ActivateLongTransaction(FdoIConnection* pFdoConnection, STRING& longTransactionName);