[mapguide-commits] r4776 - in sandbox/rfc90/MgDev/Server: .
src/Common/Base src/Common/Cache src/Common/Manager
src/Common/Thread src/Core src/Gws/GwsCommon
src/Gws/GwsCommon/inc src/Gws/GwsQueryEngine
src/Gws/GwsResource src/Gws/Include src/Services/Drawing
src/Services/Feature src/Services/Kml src/Services/Mapping
src/Services/Rendering src/Services/Resource
src/Services/ServerAdmin src/Services/Site src/Services/Tile
src/UnitTesting
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Apr 9 22:40:45 EDT 2010
Author: uvlite
Date: 2010-04-09 22:40:44 -0400 (Fri, 09 Apr 2010)
New Revision: 4776
Modified:
sandbox/rfc90/MgDev/Server/Server.sln
sandbox/rfc90/MgDev/Server/src/Common/Base/ClientHandler.cpp
sandbox/rfc90/MgDev/Server/src/Common/Base/Makefile.am
sandbox/rfc90/MgDev/Server/src/Common/Base/ServiceOperation.cpp
sandbox/rfc90/MgDev/Server/src/Common/Cache/Makefile.am
sandbox/rfc90/MgDev/Server/src/Common/Manager/CacheManager.cpp
sandbox/rfc90/MgDev/Server/src/Common/Manager/Connection.cpp
sandbox/rfc90/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp
sandbox/rfc90/MgDev/Server/src/Common/Manager/LoadBalanceManager.cpp
sandbox/rfc90/MgDev/Server/src/Common/Manager/LogManager.cpp
sandbox/rfc90/MgDev/Server/src/Common/Manager/LogThread.cpp
sandbox/rfc90/MgDev/Server/src/Common/Manager/Makefile.am
sandbox/rfc90/MgDev/Server/src/Common/Manager/PackageLogWriter.cpp
sandbox/rfc90/MgDev/Server/src/Common/Manager/WorkerThread.cpp
sandbox/rfc90/MgDev/Server/src/Common/Thread/Makefile.am
sandbox/rfc90/MgDev/Server/src/Core/OperationThread.cpp
sandbox/rfc90/MgDev/Server/src/Core/Server.cpp
sandbox/rfc90/MgDev/Server/src/Core/TimedEventHandler.cpp
sandbox/rfc90/MgDev/Server/src/Core/serverconfig.ini
sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/GwsException.cpp
sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/GwsObjectImpl.cpp
sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/Makefile.am
sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/inc/GwsStatus.h
sandbox/rfc90/MgDev/Server/src/Gws/GwsQueryEngine/Makefile.am
sandbox/rfc90/MgDev/Server/src/Gws/GwsResource/Makefile.am
sandbox/rfc90/MgDev/Server/src/Gws/Include/GwsCommon.h
sandbox/rfc90/MgDev/Server/src/Services/Drawing/Makefile.am
sandbox/rfc90/MgDev/Server/src/Services/Feature/Makefile.am
sandbox/rfc90/MgDev/Server/src/Services/Feature/SelectCommand.cpp
sandbox/rfc90/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.cpp
sandbox/rfc90/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp
sandbox/rfc90/MgDev/Server/src/Services/Kml/Makefile.am
sandbox/rfc90/MgDev/Server/src/Services/Mapping/Makefile.am
sandbox/rfc90/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
sandbox/rfc90/MgDev/Server/src/Services/Mapping/RSMgFeatureReader.cpp
sandbox/rfc90/MgDev/Server/src/Services/Rendering/Makefile.am
sandbox/rfc90/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
sandbox/rfc90/MgDev/Server/src/Services/Resource/Makefile.am
sandbox/rfc90/MgDev/Server/src/Services/ServerAdmin/Makefile.am
sandbox/rfc90/MgDev/Server/src/Services/Site/Makefile.am
sandbox/rfc90/MgDev/Server/src/Services/Tile/Makefile.am
sandbox/rfc90/MgDev/Server/src/Services/Tile/ServerTileService.cpp
sandbox/rfc90/MgDev/Server/src/UnitTesting/Makefile.am
sandbox/rfc90/MgDev/Server/src/UnitTesting/TestCoordinateSystem.cpp
sandbox/rfc90/MgDev/Server/src/UnitTesting/TestCoordinateSystem.h
sandbox/rfc90/MgDev/Server/src/UnitTesting/TestServerAdminService.cpp
Log:
rfc90 Server dir merged with trunk
Modified: sandbox/rfc90/MgDev/Server/Server.sln
===================================================================
--- sandbox/rfc90/MgDev/Server/Server.sln 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/Server.sln 2010-04-10 02:40:44 UTC (rev 4776)
@@ -294,6 +294,8 @@
{5287A594-4D4F-43FE-A281-E279AB708CF1} = {5287A594-4D4F-43FE-A281-E279AB708CF1}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "..\Oem\ACE\ACE_wrappers\ace\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6322872A5C}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Static|Win32 = Debug Static|Win32
@@ -712,6 +714,20 @@
{531778C6-C340-40F2-B403-9B58B8121AAB}.Release|Win32.Build.0 = Release|Win32
{531778C6-C340-40F2-B403-9B58B8121AAB}.Release|x64.ActiveCfg = Release|x64
{531778C6-C340-40F2-B403-9B58B8121AAB}.Release|x64.Build.0 = Release|x64
+ {BD537C9A-FECA-1BAD-6757-8A6322872A5C}.Debug Static|Win32.ActiveCfg = Debug|x64
+ {BD537C9A-FECA-1BAD-6757-8A6322872A5C}.Debug Static|x64.ActiveCfg = Debug|x64
+ {BD537C9A-FECA-1BAD-6757-8A6322872A5C}.Debug Static|x64.Build.0 = Debug|x64
+ {BD537C9A-FECA-1BAD-6757-8A6322872A5C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BD537C9A-FECA-1BAD-6757-8A6322872A5C}.Debug|Win32.Build.0 = Debug|Win32
+ {BD537C9A-FECA-1BAD-6757-8A6322872A5C}.Debug|x64.ActiveCfg = Debug|x64
+ {BD537C9A-FECA-1BAD-6757-8A6322872A5C}.Debug|x64.Build.0 = Debug|x64
+ {BD537C9A-FECA-1BAD-6757-8A6322872A5C}.Release Static|Win32.ActiveCfg = Release|x64
+ {BD537C9A-FECA-1BAD-6757-8A6322872A5C}.Release Static|x64.ActiveCfg = Release|x64
+ {BD537C9A-FECA-1BAD-6757-8A6322872A5C}.Release Static|x64.Build.0 = Release|x64
+ {BD537C9A-FECA-1BAD-6757-8A6322872A5C}.Release|Win32.ActiveCfg = Release|Win32
+ {BD537C9A-FECA-1BAD-6757-8A6322872A5C}.Release|Win32.Build.0 = Release|Win32
+ {BD537C9A-FECA-1BAD-6757-8A6322872A5C}.Release|x64.ActiveCfg = Release|x64
+ {BD537C9A-FECA-1BAD-6757-8A6322872A5C}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: sandbox/rfc90/MgDev/Server/src/Common/Base/ClientHandler.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Common/Base/ClientHandler.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Common/Base/ClientHandler.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -178,7 +178,7 @@
stream = new MgMapGuideStream( m_pStreamHelper );
// TODO: use locale from client connection
- mgException->GetMessage(MgResources::DefaultMessageLocale);
+ mgException->GetExceptionMessage(MgResources::DefaultMessageLocale);
mgException->GetDetails(MgResources::DefaultMessageLocale);
mgException->GetStackTrace(MgResources::DefaultMessageLocale);
@@ -250,7 +250,6 @@
m_SockStream.close_writer();
m_SockStream.close_reader();
m_SockStream.close();
- m_pMessageQueue->flush();
MgServerManager* pServerManager = MgServerManager::GetInstance();
if(pServerManager)
Modified: sandbox/rfc90/MgDev/Server/src/Common/Base/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Common/Base/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Common/Base/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -33,4 +33,4 @@
ServerStreamData.h \
ServiceOperation.h
-libMgServerBase_la_LDFLAGS = -version-info 7:0:0
+libMgServerBase_la_LDFLAGS = -release $(PACKAGE_VERSION)
Modified: sandbox/rfc90/MgDev/Server/src/Common/Base/ServiceOperation.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Common/Base/ServiceOperation.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Common/Base/ServiceOperation.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -233,7 +233,7 @@
}
}
- STRING message = except->GetMessage(locale);
+ STRING message = except->GetExceptionMessage(locale);
STRING details = except->GetDetails(locale);
STRING stackTrace = except->GetStackTrace(locale);
@@ -609,7 +609,7 @@
m_currConnection->SetCurrentOperationStatus(MgConnection::OpFailed);
}
- except->GetMessage();
+ except->GetExceptionMessage();
except->GetDetails();
except->GetStackTrace();
Modified: sandbox/rfc90/MgDev/Server/src/Common/Cache/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Common/Cache/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Common/Cache/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -41,4 +41,4 @@
FeatureSourceCacheItem.h \
SpatialContextCacheItem.h
-libMgServerCache_la_LDFLAGS = -version-info 7:0:0
+libMgServerCache_la_LDFLAGS = -release $(PACKAGE_VERSION)
Modified: sandbox/rfc90/MgDev/Server/src/Common/Manager/CacheManager.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Common/Manager/CacheManager.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Common/Manager/CacheManager.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -234,7 +234,7 @@
{
MgResources* resources = MgResources::GetInstance();
ACE_ASSERT(NULL != resources);
- STRING message = resources->GetMessage(MgResources::FeatureService,
+ STRING message = resources->GetResourceMessage(MgResources::FeatureService,
L"MgInvalidFdoProvider", NULL);
MgStringCollection arguments;
arguments.Add(message);
Modified: sandbox/rfc90/MgDev/Server/src/Common/Manager/Connection.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Common/Manager/Connection.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Common/Manager/Connection.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -200,7 +200,7 @@
{
ACE_Time_Value now = ACE_High_Res_Timer::gettimeofday();
ACE_Time_Value diffTime = now - m_lastUsageTime;
- double diff = diffTime.sec();
+ double diff =(double) diffTime.sec();
if ( diff > nIdleTimeout )
{
bExpired = true;
Modified: sandbox/rfc90/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -477,7 +477,7 @@
FdoConnectionCacheEntry* pFdoConnectionCacheEntry = iter->second;
if(pFdoConnectionCacheEntry)
{
- INT32 time = now.sec() - pFdoConnectionCacheEntry->lastUsed.sec();
+ INT32 time = (INT32) (now.sec() - pFdoConnectionCacheEntry->lastUsed.sec());
INT32 useLimit = providerInfo->GetUseLimit();
if((time > m_nFdoConnectionTimeout) || (!pFdoConnectionCacheEntry->bValid) || (useLimit != -1 && pFdoConnectionCacheEntry->nUseTotal >= useLimit))
{
Modified: sandbox/rfc90/MgDev/Server/src/Common/Manager/LoadBalanceManager.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Common/Manager/LoadBalanceManager.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Common/Manager/LoadBalanceManager.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -678,7 +678,7 @@
ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
- MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+ MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
SAFE_RELEASE(e);
}
@@ -768,7 +768,7 @@
ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
- MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+ MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
SAFE_RELEASE(e);
}
@@ -973,7 +973,7 @@
ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
- MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+ MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
SAFE_RELEASE(e);
}
@@ -1579,7 +1579,7 @@
ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
- MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+ MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
SAFE_RELEASE(e);
}
@@ -1649,7 +1649,7 @@
ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
- MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+ MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
SAFE_RELEASE(e);
}
@@ -1751,7 +1751,7 @@
ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
- MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+ MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
SAFE_RELEASE(e);
}
@@ -1778,7 +1778,7 @@
ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
- MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+ MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
SAFE_RELEASE(e);
}
@@ -1845,7 +1845,7 @@
ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
- MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+ MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
SAFE_RELEASE(e);
}
@@ -1873,7 +1873,7 @@
ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(locale).c_str()));
MG_LOG_SYSTEM_ENTRY(LM_ERROR, e->GetDetails(locale).c_str());
- MG_LOG_EXCEPTION_ENTRY(e->GetMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
+ MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(locale).c_str(), e->GetStackTrace(locale).c_str());
SAFE_RELEASE(e);
}
Modified: sandbox/rfc90/MgDev/Server/src/Common/Manager/LogManager.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Common/Manager/LogManager.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Common/Manager/LogManager.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -2041,7 +2041,7 @@
if (mgException != NULL)
{
// Use default message with just the given info.
- logEntry = mgException->GetMessage();
+ logEntry = mgException->GetExceptionMessage();
}
QueueLogEntry(mltPerformance, logEntry, LM_INFO);
@@ -2198,7 +2198,7 @@
ACE_ASSERT(NULL != serverManager);
STRING locale = serverManager->GetDefaultMessageLocale();
- STRING message = except->GetMessage(locale);
+ STRING message = except->GetExceptionMessage(locale);
STRING details = except->GetDetails(locale);
STRING stackTrace = except->GetStackTrace(locale);
Modified: sandbox/rfc90/MgDev/Server/src/Common/Manager/LogThread.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Common/Manager/LogThread.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Common/Manager/LogThread.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -98,7 +98,7 @@
MgServerManager* pServerManager = MgServerManager::GetInstance();
ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
- MG_LOG_EXCEPTION_ENTRY(e->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+ MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
SAFE_RELEASE(e);
}
@@ -118,7 +118,7 @@
mgException = new MgFdoException(L"MgLogThread.svc", __LINE__, __WFILE__, NULL, messageId, &arguments);
ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
- MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+ MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
FDO_SAFE_RELEASE(e);
}
@@ -128,7 +128,7 @@
mgException = MgSystemException::Create(e, L"MgLogThread.svc", __LINE__, __WFILE__);
ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
- MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+ MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
}
catch(...)
{
@@ -136,7 +136,7 @@
mgException = new MgUnclassifiedException(L"MgLogThread.svc", __LINE__, __WFILE__, NULL, L"", NULL);
ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
- MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+ MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
}
}
}
@@ -152,7 +152,7 @@
MgServerManager* pServerManager = MgServerManager::GetInstance();
ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
- MG_LOG_EXCEPTION_ENTRY(e->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+ MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
SAFE_RELEASE(e);
@@ -164,7 +164,7 @@
mgException = MgSystemException::Create(e, L"MgLogThread.svc", __LINE__, __WFILE__);
ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
- MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+ MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
nResult = -1;
}
@@ -174,7 +174,7 @@
mgException = new MgUnclassifiedException(L"MgLogThread.svc", __LINE__, __WFILE__, NULL, L"", NULL);
ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
- MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+ MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
nResult = -1;
}
Modified: sandbox/rfc90/MgDev/Server/src/Common/Manager/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Common/Manager/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Common/Manager/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -99,4 +99,4 @@
WorkerThread.h \
WorkerThreadData.h
-libMgServerManager_la_LDFLAGS = -version-info 7:0:0
+libMgServerManager_la_LDFLAGS = -release $(PACKAGE_VERSION)
Modified: sandbox/rfc90/MgDev/Server/src/Common/Manager/PackageLogWriter.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Common/Manager/PackageLogWriter.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Common/Manager/PackageLogWriter.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -53,7 +53,7 @@
else
{
m_statusInfo.SetStatusCode(MgPackageStatusCode::Failed);
- m_statusInfo.SetErrorMessage(except->GetMessage());
+ m_statusInfo.SetErrorMessage(except->GetExceptionMessage());
m_statusInfo.SetStackTrace(except->GetStackTrace());
}
}
Modified: sandbox/rfc90/MgDev/Server/src/Common/Manager/WorkerThread.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Common/Manager/WorkerThread.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Common/Manager/WorkerThread.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -104,7 +104,7 @@
MgServerManager* pServerManager = MgServerManager::GetInstance();
ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
- MG_LOG_EXCEPTION_ENTRY(e->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+ MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
SAFE_RELEASE(e);
}
@@ -124,7 +124,7 @@
mgException = new MgFdoException(L"MgWorkerThread.svc", __LINE__, __WFILE__, NULL, messageId, &arguments);
ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
- MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+ MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
FDO_SAFE_RELEASE(e);
}
@@ -134,7 +134,7 @@
mgException = MgSystemException::Create(e, L"MgWorkerThread.svc", __LINE__, __WFILE__);
ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
- MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+ MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
}
catch(...)
{
@@ -142,7 +142,7 @@
mgException = new MgUnclassifiedException(L"MgWorkerThread.svc", __LINE__, __WFILE__, NULL, L"", NULL);
ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
- MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+ MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
}
}
}
@@ -158,7 +158,7 @@
MgServerManager* pServerManager = MgServerManager::GetInstance();
ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), e->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
- MG_LOG_EXCEPTION_ENTRY(e->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+ MG_LOG_EXCEPTION_ENTRY(e->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), e->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
SAFE_RELEASE(e);
@@ -170,7 +170,7 @@
mgException = MgSystemException::Create(e, L"MgWorkerThread.svc", __LINE__, __WFILE__);
ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
- MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+ MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
nResult = -1;
}
@@ -180,7 +180,7 @@
mgException = new MgUnclassifiedException(L"MgWorkerThread.svc", __LINE__, __WFILE__, NULL, L"", NULL);
ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%t) %W\n"), mgException->GetDetails(pServerManager->GetDefaultMessageLocale()).c_str()));
- MG_LOG_EXCEPTION_ENTRY(mgException->GetMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
+ MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(pServerManager->GetDefaultMessageLocale()).c_str(), mgException->GetStackTrace(pServerManager->GetDefaultMessageLocale()).c_str());
nResult = -1;
}
Modified: sandbox/rfc90/MgDev/Server/src/Common/Thread/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Common/Thread/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Common/Thread/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -25,4 +25,4 @@
ThreadBase.h \
ServerThreadDllExport.h
-libMgServerThread_la_LDFLAGS = -version-info 7:0:0
+libMgServerThread_la_LDFLAGS = -release $(PACKAGE_VERSION)
Modified: sandbox/rfc90/MgDev/Server/src/Core/OperationThread.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Core/OperationThread.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Core/OperationThread.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -151,7 +151,7 @@
MgServerManager* serverManager = MgServerManager::GetInstance();
STRING locale = (NULL == serverManager) ?
MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
- STRING message = mgException->GetMessage(locale);
+ STRING message = mgException->GetExceptionMessage(locale);
STRING details = mgException->GetDetails(locale);
STRING stackTrace = mgException->GetStackTrace(locale);
@@ -281,7 +281,7 @@
MgServerManager* serverManager = MgServerManager::GetInstance();
STRING locale = (NULL == serverManager) ?
MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
- STRING message = mgException->GetMessage(locale);
+ STRING message = mgException->GetExceptionMessage(locale);
STRING details = mgException->GetDetails(locale);
STRING stackTrace = mgException->GetStackTrace(locale);
@@ -411,7 +411,7 @@
time_t opTime = operationTime.sec();
pConnection->IncrementProcessedOperations();
- pConnection->SetCurrentOperationTime(opTime);
+ pConnection->SetCurrentOperationTime((INT32)opTime);
serverManager->IncrementProcessedOperations();
serverManager->IncrementOperationTime(opTime);
@@ -435,7 +435,7 @@
MgServerManager* serverManager = MgServerManager::GetInstance();
STRING locale = (NULL == serverManager) ?
MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
- STRING message = mgException->GetMessage(locale);
+ STRING message = mgException->GetExceptionMessage(locale);
STRING details = mgException->GetDetails(locale);
STRING stackTrace = mgException->GetStackTrace(locale);
Modified: sandbox/rfc90/MgDev/Server/src/Core/Server.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Core/Server.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Core/Server.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -1121,7 +1121,7 @@
MgServerManager* serverManager = MgServerManager::GetInstance();
STRING locale = (NULL == serverManager) ?
MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
- STRING message = mgException->GetMessage(locale);
+ STRING message = mgException->GetExceptionMessage(locale);
STRING details = mgException->GetDetails(locale);
STRING stackTrace = mgException->GetStackTrace(locale);
Modified: sandbox/rfc90/MgDev/Server/src/Core/TimedEventHandler.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Core/TimedEventHandler.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Core/TimedEventHandler.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -153,7 +153,7 @@
CREFSTRING locale = serverManager->GetDefaultMessageLocale();
ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) %W\n"), e.GetDetails(locale).c_str()));
- MG_LOG_EXCEPTION_ENTRY(e.GetMessage(locale).c_str(), e.GetStackTrace(locale).c_str());
+ MG_LOG_EXCEPTION_ENTRY(e.GetExceptionMessage(locale).c_str(), e.GetStackTrace(locale).c_str());
}
MG_CATCH_AND_RELEASE()
Modified: sandbox/rfc90/MgDev/Server/src/Core/serverconfig.ini
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Core/serverconfig.ini 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Core/serverconfig.ini 2010-04-10 02:40:44 UTC (rev 4776)
@@ -333,7 +333,7 @@
RasterGridSizeForPlot = 50
MinRasterGridSizeForPlot = 5
RasterGridSizeOverrideRatioForPlot = 0.10
-RenderSelectionBatchSize = 10000
+RenderSelectionBatchSize = 50000
ClampPoints = 0
GeneralizeData = 0
Modified: sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/GwsException.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/GwsException.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/GwsException.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -106,12 +106,12 @@
FdoString* CGwsException::GetExceptionMessage()
{
- return m_status.GetMessage ();
+ return m_status.GetErrorMessage ();
}
FdoString* CGwsException::ToString()
{
- return m_status.GetMessage ();
+ return m_status.GetErrorMessage ();
}
Modified: sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/GwsObjectImpl.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/GwsObjectImpl.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/GwsObjectImpl.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -75,7 +75,7 @@
return m_status;
}
-FdoString *CGwsStatus::GetMessage () const
+FdoString *CGwsStatus::GetErrorMessage () const
{
if (m_message.empty ()) {
CGwsResourceModule::GwsStatusMessage (m_status, ((CGwsStatus *)this)->m_message);
Modified: sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -44,5 +44,5 @@
-I../../../../Common/Foundation \
-I../../../../Common/Geometry
-libMgGwsCommon_la_LDFLAGS = -version-info 1:0:0
+libMgGwsCommon_la_LDFLAGS = -release $(PACKAGE_VERSION)
Modified: sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/inc/GwsStatus.h
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/inc/GwsStatus.h 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Gws/GwsCommon/inc/GwsStatus.h 2010-04-10 02:40:44 UTC (rev 4776)
@@ -40,7 +40,7 @@
GWS_COMMON_API
EGwsStatus GetStatus () const ;
GWS_COMMON_API
- FdoString* GetMessage () const;
+ FdoString* GetErrorMessage () const;
// get diagnostincs parameters
GWS_COMMON_API
Modified: sandbox/rfc90/MgDev/Server/src/Gws/GwsQueryEngine/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Gws/GwsQueryEngine/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Gws/GwsQueryEngine/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -71,4 +71,4 @@
-I../GwsCommon/inc \
-I./inc
-libMgGwsQueryEngine_la_LDFLAGS = -version-info 1:0:0
+libMgGwsQueryEngine_la_LDFLAGS = -release $(PACKAGE_VERSION)
Modified: sandbox/rfc90/MgDev/Server/src/Gws/GwsResource/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Gws/GwsResource/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Gws/GwsResource/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -13,4 +13,4 @@
INCLUDES = -I../INCLUDE
-libMgGwsResource_la_LDFLAGS = -version-info 1:0:0
+libMgGwsResource_la_LDFLAGS = -release $(PACKAGE_VERSION)
Modified: sandbox/rfc90/MgDev/Server/src/Gws/Include/GwsCommon.h
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Gws/Include/GwsCommon.h 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Gws/Include/GwsCommon.h 2010-04-10 02:40:44 UTC (rev 4776)
@@ -641,7 +641,7 @@
/// Gets the message associated with the error if any.
/// </summary>
/// <returns>Returns the error message.</returns>
- virtual FdoString* GetMessage() const = 0;
+ virtual FdoString* GetErrorMessage() const = 0;
/// <summary>
/// Gets the name value pair at index. These values may be the name of the
Modified: sandbox/rfc90/MgDev/Server/src/Services/Drawing/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Drawing/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Drawing/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -66,7 +66,7 @@
libMgServerDrawingService_la_LIBADD = -lMgFoundation -lMgGeometry -lMgPlatformBase -lMgMapGuideCommon -lxerces-c
-libMgServerDrawingService_la_LDFLAGS = -version-info 7:0:0 \
+libMgServerDrawingService_la_LDFLAGS = -release $(PACKAGE_VERSION) \
-L../../../../Oem/dbxml-2.3.10/install/lib \
-L../../../../Common/Foundation \
-L../../../../Common/Geometry \
Modified: sandbox/rfc90/MgDev/Server/src/Services/Feature/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Feature/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Feature/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -231,6 +231,6 @@
libMgServerFeatureService_la_LIBADD = -lMgGwsCommon -lMgGwsQueryEngine
-libMgServerFeatureService_la_LDFLAGS = -version-info 7:0:0 \
+libMgServerFeatureService_la_LDFLAGS = -release $(PACKAGE_VERSION) \
-L../../Gws/GwsCommon \
-L../../Gws/GwsQueryEngine
Modified: sandbox/rfc90/MgDev/Server/src/Services/Feature/SelectCommand.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Feature/SelectCommand.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Feature/SelectCommand.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -324,7 +324,7 @@
}
}
-#ifdef _DEBUG
+#ifdef _MAPDEBUG
int nCount = fragmenter.GetOrCount();
if ( nCount > 0)
{
Modified: sandbox/rfc90/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -114,7 +114,7 @@
if(NULL != filter)
{
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
STRING filterText = filter->ToString();
ACE_DEBUG((LM_ERROR, ACE_TEXT("JOIN FILTER:\n%W\n\n"), filterText.c_str()));
#endif
Modified: sandbox/rfc90/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -392,8 +392,8 @@
if (!filterText.empty())
{
regularFilter = FdoFilter::Parse(filterText.c_str());
- #ifdef _DEBUG
- ACE_DEBUG((LM_ERROR, ACE_TEXT("FILTER(size=%d):\n%W\n\n"), filterText.length(), filterText.c_str()));
+ #ifdef _MAPDEBUG
+ ACE_DEBUG((LM_DEBUG, ACE_TEXT("FILTER(size=%d):\n%W\n\n"), filterText.length(), filterText.c_str()));
#endif
}
@@ -423,14 +423,14 @@
FdoPtr<FdoByteArray> byteArray = FdoByteArray::Create(gisBytes, (FdoInt32)len);
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
// Get the spatial filter geometry text
FdoPtr<FdoFgfGeometryFactory> geometryFactory = FdoFgfGeometryFactory::GetInstance();
if(geometryFactory)
{
FdoPtr<FdoIGeometry> geometry = geometryFactory->CreateGeometryFromFgf(byteArray);
STRING geomText = geometry->GetText();
- ACE_DEBUG((LM_ERROR, ACE_TEXT("SPATIAL FILTER:\n%W\n\n"), geomText.c_str()));
+ ACE_DEBUG((LM_DEBUG, ACE_TEXT("SPATIAL FILTER:\n%W\n\n"), geomText.c_str()));
}
#endif
Modified: sandbox/rfc90/MgDev/Server/src/Services/Kml/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Kml/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Kml/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -51,4 +51,4 @@
OpGetLayerKml.h \
OpGetFeaturesKml.h
-libMgServerKmlService_la_LDFLAGS = -version-info 7:0:0
+libMgServerKmlService_la_LDFLAGS = -release $(PACKAGE_VERSION)
Modified: sandbox/rfc90/MgDev/Server/src/Services/Mapping/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Mapping/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Mapping/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -75,4 +75,4 @@
libMgServerMappingService_la_LIBADD =
-libMgServerMappingService_la_LDFLAGS = -version-info 7:0:0
+libMgServerMappingService_la_LDFLAGS = -release $(PACKAGE_VERSION)
Modified: sandbox/rfc90/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Mapping/MappingUtil.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Mapping/MappingUtil.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -84,7 +84,7 @@
MgCoordinateSystem* layerCs,
TransformCache* cache)
{
-#ifdef _DEBUG
+#ifdef _MAPDEBUG
long dwStart = GetTickCount();
#endif
@@ -227,7 +227,7 @@
}
}
-#ifdef _DEBUG
+#ifdef _MAPDEBUG
printf(" ExecuteFeatureQuery() total time = %6.4f (s)\n", (GetTickCount()-dwStart)/1000.0);
#endif
@@ -253,7 +253,7 @@
Ptr<MgCoordinate> ur = new MgCoordinateXY(extent.maxx, extent.maxy);
Ptr<MgEnvelope> mapExt = new MgEnvelope(ll, ur);
Ptr<MgEnvelope> rasterExt;
- if (NULL != layerCs && NULL != mapCs && layerCs->GetCode() != mapCs->GetCode())
+ if (NULL != layerCs && NULL != mapCs && layerCs->GetCsCode() != mapCs->GetCsCode())
{
Ptr<MgCoordinateSystemFactory> csFactory = new MgCoordinateSystemFactory();
@@ -366,7 +366,7 @@
bool selection,
bool extractColors)
{
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
long dwStart = GetTickCount();
printf("\nStylizeLayers() **MAPSTART** Layers:%d Scale:%f\n", layers->GetCount(), scale);
#endif
@@ -430,7 +430,7 @@
Ptr<MgLayerBase> mapLayer = layers->GetItem(i);
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf(" StylizeLayers() **LAYERSTART** Name:%S VAS:%S\n", (mapLayer->GetName()).c_str(), mapLayer->IsVisibleAtScale(scale)? L"True" : L"False");
#endif
@@ -475,7 +475,7 @@
if (vl) //############################################################################ vector layer
{
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
long dwLayerStart = GetTickCount();
#endif
@@ -500,7 +500,7 @@
if (scaleRange)
{
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf(" StylizeLayers() **Stylizing** Name:%S\n", (mapLayer->GetName()).c_str());
#endif
@@ -522,7 +522,7 @@
extent.maxy += mcsOffset;
}
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf(" StylizeLayers() **Stylizing** Name:%S Extents:%f,%f to %f,%f Expanded:%d\n", (mapLayer->GetName()).c_str(), extent.minx, extent.miny, extent.maxx, extent.maxy, expandExtents);
#endif
@@ -554,7 +554,7 @@
if (overrideFilters)
overrideFilter = overrideFilters->GetItem(i);
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf(" StylizeLayers() **Stylizing** Name:%S Override Filter(size=%d):\n%S\n", (mapLayer->GetName()).c_str(), overrideFilter.length(), overrideFilter.empty() ? L"(Empty)" : overrideFilter.c_str());
#endif
@@ -563,7 +563,7 @@
// create an automatic FdoPtr around the reader
FdoPtr<FdoIFeatureReader> fdoReader = (NULL == rsReader) ? NULL : rsReader->GetInternalReader();
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf(" StylizeLayers() **Stylizing** Name:%S Query Done.\n", (mapLayer->GetName()).c_str());
#endif
@@ -577,11 +577,11 @@
// color extraction for RFC60 only when needed
if (extractColors)
{
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf(" StylizeLayers() //ExtractColors// -Vector- Name:%S Time:%6.4f (s)\n\n", (mapLayer->GetName()).c_str(), (GetTickCount()-dwLayerStart)/1000.0);
#endif
ExtractColors(map, scaleRange, ds);
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf(" StylizeLayers() ##ExtractColors## -Vector- Name:%S Time:%6.4f (s)\n\n", (mapLayer->GetName()).c_str(), (GetTickCount()-dwLayerStart)/1000.0);
#endif
}
@@ -589,12 +589,12 @@
}
else // not scaleRange
{
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf(" StylizeLayers() **NOT Stylizing - NO SCALE RANGE** Name:%S\n", (mapLayer->GetName()).c_str());
#endif
}
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf(" StylizeLayers() **LAYEREND** -Vector- Name:%S Time:%6.4f (s)\n\n", (mapLayer->GetName()).c_str(), (GetTickCount()-dwLayerStart)/1000.0);
#endif
}
@@ -603,7 +603,7 @@
// TODO: FDO RFP - Make FdoPtr's reference counter thread-safe.
static ACE_Recursive_Thread_Mutex sg_fdoRfpMutex;
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
long dwLayerStart = GetTickCount();
#endif
@@ -619,7 +619,7 @@
// get the feature extent to use with the query
RS_Bounds extent = dr->GetBounds();
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf(" StylizeLayers() **Stylizing** Name:%S Extents:%f,%f to %f,%f\n", (mapLayer->GetName()).c_str(), extent.minx, extent.miny, extent.maxx, extent.maxy);
#endif
@@ -641,7 +641,7 @@
MgCSTrans* xformer = item? item->GetTransform() : NULL;
// Test if layer and map are using the same coordinate systems
- if (NULL == layerCs.p || NULL == dstCs || layerCs->GetCode() == dstCs->GetCode())
+ if (NULL == layerCs.p || NULL == dstCs || layerCs->GetCsCode() == dstCs->GetCsCode())
{
// No transform required
xformer = NULL;
@@ -694,7 +694,7 @@
double urx = ur->GetX();
double ury = ur->GetY();
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf(" StylizeLayers() **Stylizing** Name:%S Extents(SpatialContext):%f,%f to %f,%f\n", (mapLayer->GetName()).c_str(), llx, lly, urx, ury);
#endif
@@ -715,7 +715,7 @@
MG_CATCH_AND_RELEASE()
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf(" StylizeLayers() **Stylizing** Name:%S Extents(Using):%f,%f to %f,%f\n", (mapLayer->GetName()).c_str(), extent.minx, extent.miny, extent.maxx, extent.maxy);
#endif
@@ -740,13 +740,13 @@
}
}
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf(" StylizeLayers() **LAYEREND** -Grid- Name:%S Time:%6.4f (s)\n\n", (mapLayer->GetName()).c_str(), (GetTickCount()-dwLayerStart)/1000.0);
#endif
}
else if (dl) //############################################################################ drawing layer
{
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
long dwLayerStart = GetTickCount();
#endif
@@ -803,7 +803,7 @@
dr->EndLayer();
}
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf(" StylizeLayers() **LAYEREND** -Drawing- Name:%S Time = %6.4f (s)\n\n", (mapLayer->GetName()).c_str(), (GetTickCount()-dwLayerStart)/1000.0);
#endif
} // end layer switch
@@ -825,16 +825,16 @@
// Get the reason why the layer failed to stylize
MgStringCollection argumentsWhy;
- argumentsWhy.Add(mgException->GetMessage(locale));
+ argumentsWhy.Add(mgException->GetExceptionMessage(locale));
Ptr<MgStylizeLayerFailedException> exception;
exception = new MgStylizeLayerFailedException(L"MgMappingUtil.StylizeLayers", __LINE__, __WFILE__, &arguments, L"MgFormatInnerExceptionMessage", &argumentsWhy);
- STRING message = exception->GetMessage(locale);
+ STRING message = exception->GetExceptionMessage(locale);
STRING stackTrace = exception->GetStackTrace(locale);
MG_LOG_EXCEPTION_ENTRY(message.c_str(), stackTrace.c_str());
-#if defined(_DEBUG) || defined(_DEBUG_PNG8)
+#if defined(_MAPDEBUG) || defined(_MAPDEBUG_PNG8)
STRING details = mgException->GetDetails(locale);
wstring err = L"\n %t Error during stylization of layer ";
@@ -843,14 +843,14 @@
err += L"Details: ";
err += details;
err += L"\n";
- ACE_DEBUG( (LM_DEBUG, err.c_str()) );
+ ACE_MAPDEBUG( (LM_MAPDEBUG, err.c_str()) );
#endif
// TODO could throw here depending on a serverconfig setting (RFC64)
// throw exception;
} // if exception
} // for all layers
- #ifdef _DEBUG
+ #ifdef _MAPDEBUG
printf("StylizeLayers() **MAPDONE** Layers:%d Total Time:%6.4f (s)\n\n", layers->GetCount(), (GetTickCount()-dwStart)/1000.0);
#endif
@@ -1211,7 +1211,7 @@
MgServerManager* serverManager = MgServerManager::GetInstance();
STRING locale = (NULL == serverManager) ?
MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
- STRING message = mgException->GetMessage(locale);
+ STRING message = mgException->GetExceptionMessage(locale);
STRING details = mgException->GetDetails(locale);
STRING stackTrace = mgException->GetStackTrace(locale);
@@ -1376,7 +1376,6 @@
} // for GetFeatureTypeStyles
}
-
///////////////////////////////////////////////////////////////////////////////
// Extract colors from the scalerange, lookup the referenceIds, and store
// them with the map.
Modified: sandbox/rfc90/MgDev/Server/src/Services/Mapping/RSMgFeatureReader.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Mapping/RSMgFeatureReader.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Mapping/RSMgFeatureReader.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -31,7 +31,7 @@
catch (MgException* ex) \
{ \
STRING message; \
- message = ex->GetMessage(); \
+ message = ex->GetExceptionMessage(); \
ex->Release(); \
throw FdoException::Create(message.c_str()); \
}
@@ -281,7 +281,7 @@
catch (MgException* ex)
{
STRING message;
- message = ex->GetMessage();
+ message = ex->GetExceptionMessage();
bool shouldThrow = (NULL == dynamic_cast<MgFdoException*>(ex));
ex->Release();
Modified: sandbox/rfc90/MgDev/Server/src/Services/Rendering/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Rendering/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Rendering/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -56,4 +56,4 @@
FeaturePropRenderer.h \
OpRenderMapLegend.h
-libMgServerRenderingService_la_LDFLAGS = -version-info 7:0:0
+libMgServerRenderingService_la_LDFLAGS = -release $(PACKAGE_VERSION)
Modified: sandbox/rfc90/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -1538,7 +1538,7 @@
//is to select all features which appear on the screen and then
//do our own geometry math.
#ifdef _DEBUG
- STRING error = e->GetMessage();
+ STRING error = e->GetExceptionMessage();
ACE_DEBUG((LM_ERROR, ACE_TEXT("RenderForSelection() - Error: %S\n"), error.c_str()));
#endif
Modified: sandbox/rfc90/MgDev/Server/src/Services/Resource/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Resource/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Resource/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -201,7 +201,7 @@
libMgServerResourceService_la_LIBADD = -lMgFoundation -lMgGeometry -lMgPlatformBase -lMgMapGuideCommon -lMgServerBase -lMgServerCache -lMgServerManager -lxerces-c -lxqilla -ldb_cxx -ldbxml
-libMgServerResourceService_la_LDFLAGS = -version-info 7:0:0 \
+libMgServerResourceService_la_LDFLAGS = -release $(PACKAGE_VERSION) \
-L../../../../Common/Foundation \
-L../../../../Common/Geometry \
-L../../../../Common/PlatformBase \
Modified: sandbox/rfc90/MgDev/Server/src/Services/ServerAdmin/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/ServerAdmin/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/ServerAdmin/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -94,4 +94,4 @@
ServerAdminServiceHandler.h \
../../../../Common/PlatformBase/Services/Service.h
-libMgServerAdminService_la_LDFLAGS = -version-info 7:0:0
+libMgServerAdminService_la_LDFLAGS = -release $(PACKAGE_VERSION)
Modified: sandbox/rfc90/MgDev/Server/src/Services/Site/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Site/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Site/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -90,4 +90,4 @@
SiteServiceHandler.h \
SiteServiceUtil.h
-libMgServerSiteService_la_LDFLAGS = -version-info 7:0:0
+libMgServerSiteService_la_LDFLAGS = -release $(PACKAGE_VERSION)
Modified: sandbox/rfc90/MgDev/Server/src/Services/Tile/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Tile/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Tile/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -45,4 +45,4 @@
TileOperationFactory.h \
TileServiceHandler.h
-libMgServerTileService_la_LDFLAGS = -version-info 7:0:0
+libMgServerTileService_la_LDFLAGS = -release $(PACKAGE_VERSION)
Modified: sandbox/rfc90/MgDev/Server/src/Services/Tile/ServerTileService.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/Services/Tile/ServerTileService.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/Services/Tile/ServerTileService.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -696,7 +696,7 @@
{
std::wstringstream text;
text << L"(" << ACE_OS::thr_self() << L") METATILE: Broadcastcrash (" << metaTilePathname
- << L")\n" << e->GetMessage() << L")\n";
+ << L")\n" << e->GetExceptionMessage() << L")\n";
ACE_DEBUG ((LM_DEBUG, text.str().c_str()));
}
break;
@@ -1064,7 +1064,7 @@
resources = MgResources::GetInstance();
if (NULL != resources)
{
- message = resources->GetMessage(MgResources::ErrorDescription, L"MgMapCacheCleared", NULL);
+ message = resources->GetResourceMessage(MgResources::ErrorDescription, L"MgMapCacheCleared", NULL);
MG_LOG_ERROR_ENTRY(message.c_str());
}
MG_CATCH_AND_RELEASE()
Modified: sandbox/rfc90/MgDev/Server/src/UnitTesting/Makefile.am
===================================================================
--- sandbox/rfc90/MgDev/Server/src/UnitTesting/Makefile.am 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/UnitTesting/Makefile.am 2010-04-10 02:40:44 UTC (rev 4776)
@@ -74,5 +74,5 @@
libMgUnitTesting_la_LIBADD = -lcppunit
-libMgUnitTesting_la_LDFLAGS = -rpath /createshared -version-info 7:0:0 \
+libMgUnitTesting_la_LDFLAGS = -rpath /createshared -release $(PACKAGE_VERSION) \
-L../../../Oem/CppUnit-1.9.14/src/cppunit
Modified: sandbox/rfc90/MgDev/Server/src/UnitTesting/TestCoordinateSystem.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/UnitTesting/TestCoordinateSystem.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/UnitTesting/TestCoordinateSystem.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -148,7 +148,7 @@
if(NULL != pCoordinateSystem)
{
#ifdef _DEBUG
- string strMessage = MG_WCHAR_TO_CHAR(pCoordinateSystem->GetCode());
+ string strMessage = MG_WCHAR_TO_CHAR(pCoordinateSystem->GetCsCode());
printf("%s - %lf, %lf, %lf, %lf\n", strMessage.c_str(), pCoordinateSystem->GetMinX(), pCoordinateSystem->GetMinY(), pCoordinateSystem->GetMaxX(), pCoordinateSystem->GetMaxY());
#endif
@@ -374,7 +374,7 @@
catch(MgException* e)
{
#ifdef _DEBUG
- STRING message = e->GetMessage(TEST_LOCALE);
+ STRING message = e->GetExceptionMessage(TEST_LOCALE);
// Extract the reason out of the message
size_t index = message.find(L"\n");
@@ -513,7 +513,7 @@
Ptr<MgCoordinateSystem> pCoordinateSystemAlt = factory.Create(pCoordinateSystem->ToString());
CPPUNIT_ASSERT(pCoordinateSystemAlt);
- CPPUNIT_ASSERT(pCoordinateSystem->GetCode() == pCoordinateSystemAlt->GetCode());
+ CPPUNIT_ASSERT(pCoordinateSystem->GetCsCode() == pCoordinateSystemAlt->GetCsCode());
}
catch(MgException* e)
{
@@ -1120,7 +1120,7 @@
}
}
-void TestCoordinateSystem::TestCase_Arbitrary_GetCode()
+void TestCoordinateSystem::TestCase_Arbitrary_GetCsCode()
{
try
{
@@ -1129,28 +1129,28 @@
Ptr<MgCoordinateSystem> pCoordinateSystem = factory.Create(ogcWkt);
CPPUNIT_ASSERT(pCoordinateSystem);
- STRING value = pCoordinateSystem->GetCode();
+ STRING value = pCoordinateSystem->GetCsCode();
CPPUNIT_ASSERT(_wcsicmp(L"XY-MI", value.c_str()) == 0);
ogcWkt = ArbitraryWkt_Alternate1;
pCoordinateSystem = factory.Create(ogcWkt);
CPPUNIT_ASSERT(pCoordinateSystem);
- value = pCoordinateSystem->GetCode();
+ value = pCoordinateSystem->GetCsCode();
CPPUNIT_ASSERT(_wcsicmp(L"XY-MI", value.c_str()) == 0);
ogcWkt = ArbitraryWkt_Alternate2;
pCoordinateSystem = factory.Create(ogcWkt);
CPPUNIT_ASSERT(pCoordinateSystem);
- value = pCoordinateSystem->GetCode();
+ value = pCoordinateSystem->GetCsCode();
CPPUNIT_ASSERT(_wcsicmp(L"XY-MI", value.c_str()) == 0);
ogcWkt = ArbitraryWkt_Meter;
pCoordinateSystem = factory.Create(ogcWkt);
CPPUNIT_ASSERT(pCoordinateSystem);
- value = pCoordinateSystem->GetCode();
+ value = pCoordinateSystem->GetCsCode();
CPPUNIT_ASSERT(_wcsicmp(L"XY-M", value.c_str()) == 0);
}
catch(MgException* e)
@@ -2437,7 +2437,7 @@
}
}
-void TestCoordinateSystem::TestCase_Geographic_GetCode()
+void TestCoordinateSystem::TestCase_Geographic_GetCsCode()
{
try
{
@@ -2446,7 +2446,7 @@
Ptr<MgCoordinateSystem> pCoordinateSystem = factory.Create(ogcWkt);
CPPUNIT_ASSERT(pCoordinateSystem);
- STRING value = pCoordinateSystem->GetCode();
+ STRING value = pCoordinateSystem->GetCsCode();
CPPUNIT_ASSERT(_wcsicmp(L"LL84", value.c_str()) == 0);
}
catch(MgException* e)
@@ -2916,7 +2916,7 @@
}
}
-void TestCoordinateSystem::TestCase_Projected_GetCode()
+void TestCoordinateSystem::TestCase_Projected_GetCsCode()
{
try
{
@@ -2925,7 +2925,7 @@
Ptr<MgCoordinateSystem> pCoordinateSystem = factory.Create(ogcWkt);
CPPUNIT_ASSERT(pCoordinateSystem);
- STRING value = pCoordinateSystem->GetCode();
+ STRING value = pCoordinateSystem->GetCsCode();
CPPUNIT_ASSERT(_wcsicmp(L"GA-W", value.c_str()) == 0);
}
catch(MgException* e)
@@ -3400,10 +3400,10 @@
CPPUNIT_ASSERT(MgUtil::ValuesEqual(32.80833333, ur->GetX()));
CPPUNIT_ASSERT(MgUtil::ValuesEqual(16.40416667, ur->GetY()));
- CPPUNIT_ASSERT(MgUtil::ValuesEqual(6.561666667, ur->GetZ()));
+ CPPUNIT_ASSERT(MgUtil::ValuesEqual(2.0, ur->GetZ()));
CPPUNIT_ASSERT(MgUtil::ValuesEqual(0.0, ll->GetX()));
CPPUNIT_ASSERT(MgUtil::ValuesEqual(3.280833333, ll->GetY()));
- CPPUNIT_ASSERT(MgUtil::ValuesEqual(3.280833333, ll->GetZ()));
+ CPPUNIT_ASSERT(MgUtil::ValuesEqual(1.0, ll->GetZ()));
}
catch(MgException* e)
{
@@ -5634,10 +5634,10 @@
CPPUNIT_ASSERT(MgUtil::ValuesEqual(410983.0, ur->GetX()));
CPPUNIT_ASSERT(MgUtil::ValuesEqual(1415115.0, ur->GetY()));
- CPPUNIT_ASSERT(MgUtil::ValuesEqual(1.0, ur->GetZ()));
+ CPPUNIT_ASSERT(MgUtil::ValuesEqual(2.0, ur->GetZ()));
CPPUNIT_ASSERT(MgUtil::ValuesEqual(410000.0, ll->GetX()));
CPPUNIT_ASSERT(MgUtil::ValuesEqual(1415000.0, ll->GetY()));
- CPPUNIT_ASSERT(MgUtil::ValuesEqual(2.0, ll->GetZ()));
+ CPPUNIT_ASSERT(MgUtil::ValuesEqual(1.0, ll->GetZ()));
}
catch(MgException* e)
{
Modified: sandbox/rfc90/MgDev/Server/src/UnitTesting/TestCoordinateSystem.h
===================================================================
--- sandbox/rfc90/MgDev/Server/src/UnitTesting/TestCoordinateSystem.h 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/UnitTesting/TestCoordinateSystem.h 2010-04-10 02:40:44 UTC (rev 4776)
@@ -51,7 +51,7 @@
CPPUNIT_TEST(TestCase_Arbitrary_GetMinY);
CPPUNIT_TEST(TestCase_Arbitrary_GetMaxX);
CPPUNIT_TEST(TestCase_Arbitrary_GetMaxY);
- CPPUNIT_TEST(TestCase_Arbitrary_GetCode);
+ CPPUNIT_TEST(TestCase_Arbitrary_GetCsCode);
CPPUNIT_TEST(TestCase_Arbitrary_GetDescription);
CPPUNIT_TEST(TestCase_Arbitrary_GetProjection);
CPPUNIT_TEST(TestCase_Arbitrary_GetProjectionDescription);
@@ -79,7 +79,7 @@
CPPUNIT_TEST(TestCase_Geographic_GetMinY);
CPPUNIT_TEST(TestCase_Geographic_GetMaxX);
CPPUNIT_TEST(TestCase_Geographic_GetMaxY);
- CPPUNIT_TEST(TestCase_Geographic_GetCode);
+ CPPUNIT_TEST(TestCase_Geographic_GetCsCode);
CPPUNIT_TEST(TestCase_Geographic_GetDescription);
CPPUNIT_TEST(TestCase_Geographic_GetProjection);
CPPUNIT_TEST(TestCase_Geographic_GetProjectionDescription);
@@ -107,7 +107,7 @@
CPPUNIT_TEST(TestCase_Projected_GetMinY);
CPPUNIT_TEST(TestCase_Projected_GetMaxX);
CPPUNIT_TEST(TestCase_Projected_GetMaxY);
- CPPUNIT_TEST(TestCase_Projected_GetCode);
+ CPPUNIT_TEST(TestCase_Projected_GetCsCode);
CPPUNIT_TEST(TestCase_Projected_GetDescription);
CPPUNIT_TEST(TestCase_Projected_GetProjection);
CPPUNIT_TEST(TestCase_Projected_GetProjectionDescription);
@@ -261,7 +261,7 @@
void TestCase_Arbitrary_GetMinY();
void TestCase_Arbitrary_GetMaxX();
void TestCase_Arbitrary_GetMaxY();
- void TestCase_Arbitrary_GetCode();
+ void TestCase_Arbitrary_GetCsCode();
void TestCase_Arbitrary_GetDescription();
void TestCase_Arbitrary_GetProjection();
void TestCase_Arbitrary_GetProjectionDescription();
@@ -289,7 +289,7 @@
void TestCase_Geographic_GetMinY();
void TestCase_Geographic_GetMaxX();
void TestCase_Geographic_GetMaxY();
- void TestCase_Geographic_GetCode();
+ void TestCase_Geographic_GetCsCode();
void TestCase_Geographic_GetDescription();
void TestCase_Geographic_GetProjection();
void TestCase_Geographic_GetProjectionDescription();
@@ -317,7 +317,7 @@
void TestCase_Projected_GetMinY();
void TestCase_Projected_GetMaxX();
void TestCase_Projected_GetMaxY();
- void TestCase_Projected_GetCode();
+ void TestCase_Projected_GetCsCode();
void TestCase_Projected_GetDescription();
void TestCase_Projected_GetProjection();
void TestCase_Projected_GetProjectionDescription();
Modified: sandbox/rfc90/MgDev/Server/src/UnitTesting/TestServerAdminService.cpp
===================================================================
--- sandbox/rfc90/MgDev/Server/src/UnitTesting/TestServerAdminService.cpp 2010-04-09 03:51:37 UTC (rev 4775)
+++ sandbox/rfc90/MgDev/Server/src/UnitTesting/TestServerAdminService.cpp 2010-04-10 02:40:44 UTC (rev 4776)
@@ -578,7 +578,7 @@
}
catch(MgException* e)
{
- STRING message = e->GetMessage(TEST_LOCALE);
+ STRING message = e->GetExceptionMessage(TEST_LOCALE);
message += e->GetStackTrace(TEST_LOCALE);
SAFE_RELEASE(e);
CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
@@ -640,7 +640,7 @@
}
catch(MgException* e)
{
- STRING message = e->GetMessage(TEST_LOCALE);
+ STRING message = e->GetExceptionMessage(TEST_LOCALE);
message += e->GetStackTrace(TEST_LOCALE);
SAFE_RELEASE(e);
CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
@@ -715,7 +715,7 @@
}
catch(MgException* e)
{
- STRING message = e->GetMessage(TEST_LOCALE);
+ STRING message = e->GetExceptionMessage(TEST_LOCALE);
message += e->GetStackTrace(TEST_LOCALE);
SAFE_RELEASE(e);
CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
@@ -768,7 +768,7 @@
}
catch(MgException* e)
{
- STRING message = e->GetMessage(TEST_LOCALE);
+ STRING message = e->GetExceptionMessage(TEST_LOCALE);
message += e->GetStackTrace(TEST_LOCALE);
SAFE_RELEASE(e);
CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
@@ -822,7 +822,7 @@
}
catch(MgException* e)
{
- STRING message = e->GetMessage(TEST_LOCALE);
+ STRING message = e->GetExceptionMessage(TEST_LOCALE);
message += e->GetStackTrace(TEST_LOCALE);
SAFE_RELEASE(e);
CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
@@ -877,7 +877,7 @@
}
catch(MgException* e)
{
- STRING message = e->GetMessage(TEST_LOCALE);
+ STRING message = e->GetExceptionMessage(TEST_LOCALE);
message += e->GetStackTrace(TEST_LOCALE);
SAFE_RELEASE(e);
CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
More information about the mapguide-commits
mailing list