[mapguide-commits] r6802 - in branches/2.4/MgDev/Desktop: . MapViewer MgAppLayout MgDesktop MgDesktop/Services MgDesktop/Services/Feature MgDesktop/Services/Rendering UnitTest
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jun 22 08:44:48 PDT 2012
Author: jng
Date: 2012-06-22 08:44:48 -0700 (Fri, 22 Jun 2012)
New Revision: 6802
Removed:
branches/2.4/MgDev/Desktop/MgDesktop/Resources/
branches/2.4/MgDev/Desktop/TestProviderList/
Modified:
branches/2.4/MgDev/Desktop/MapViewer/MgMapViewerProvider.cs
branches/2.4/MgDev/Desktop/MgAppLayout/Sheboygan.AppLayout
branches/2.4/MgDev/Desktop/MgDesktop/MgDesktop.vcproj
branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp
branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureDefs.h
branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.cpp
branches/2.4/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp
branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp
branches/2.4/MgDev/Desktop/UnitTest/UnitTest.vcproj
Log:
mg-desktop updates:
- Fix some viewer problems with Raster layers
- Port over r6712, r6797 and r6801 to the mg-desktop implementation
- Uncomment previously commented log and trace calls now that we have the logging infrastructure in place
- Remove our own local copies of mapguide_en.res and providers.xml as we should be using MapGuideCommon's copy and the providers.xml in Oem\FDO\Bin
Modified: branches/2.4/MgDev/Desktop/MapViewer/MgMapViewerProvider.cs
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/MgMapViewerProvider.cs 2012-06-22 14:46:06 UTC (rev 6801)
+++ branches/2.4/MgDev/Desktop/MapViewer/MgMapViewerProvider.cs 2012-06-22 15:44:48 UTC (rev 6802)
@@ -190,9 +190,22 @@
resIds.Add(ldf.ToString());
//Make sure geometry property checks out
- var clsDef = layer.GetClassDefinition();
+ MgClassDefinition clsDef = null;
+ try
+ {
+ clsDef = layer.GetClassDefinition();
+ }
+ catch (MgException ex)
+ {
+ Trace.TraceWarning("Failed to get geometry property for layer: " + layer.Name + Environment.NewLine + ex.ToString());
+ ex.Dispose();
+ continue;
+ }
+ var props = clsDef.GetProperties();
var geomName = clsDef.DefaultGeometryPropertyName;
- var props = clsDef.GetProperties();
+ if (string.IsNullOrEmpty(geomName))
+ continue;
+
if (props.IndexOf(geomName) < 0)
continue;
Modified: branches/2.4/MgDev/Desktop/MgAppLayout/Sheboygan.AppLayout
===================================================================
--- branches/2.4/MgDev/Desktop/MgAppLayout/Sheboygan.AppLayout 2012-06-22 14:46:06 UTC (rev 6801)
+++ branches/2.4/MgDev/Desktop/MgAppLayout/Sheboygan.AppLayout 2012-06-22 15:44:48 UTC (rev 6802)
@@ -23,7 +23,7 @@
</PropertyPane>
</InfoPane>
<Map>
- <MapDefinition>Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition</MapDefinition>
+ <MapDefinition>Library://FIELD DATA/Map/TABLET_BASE_MAPS.MapDefinition</MapDefinition>
</Map>
<Menu>
<Items>
@@ -317,7 +317,7 @@
</NameValue>
<NameValue>
<Name>MapDefinition</Name>
- <Value>Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition</Value>
+ <Value>Library://FIELD DATA/Map/TABLET_BASE_MAPS.MapDefinition</Value>
</NameValue>
</Properties>
</ComponentDefinition>
Modified: branches/2.4/MgDev/Desktop/MgDesktop/MgDesktop.vcproj
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/MgDesktop.vcproj 2012-06-22 14:46:06 UTC (rev 6801)
+++ branches/2.4/MgDev/Desktop/MgDesktop/MgDesktop.vcproj 2012-06-22 15:44:48 UTC (rev 6802)
@@ -101,7 +101,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="xcopy /Y /I $(ProjectDir)Resources\*.* $(OutDir)\Resources
xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)\Schema
xcopy /Y $(ProjectDir)Platform.ini $(OutDir)\
"
+ CommandLine="xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)\Resources
xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)\Schema
xcopy /Y $(ProjectDir)Platform.ini $(OutDir)\
"
/>
</Configuration>
<Configuration
@@ -188,7 +188,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="xcopy /Y /I $(ProjectDir)Resources\*.* $(OutDir)\Resources
xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)\Schema
xcopy /Y $(ProjectDir)Platform.ini $(OutDir)\
"
+ CommandLine="xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)\Resources
xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)\Schema
xcopy /Y $(ProjectDir)Platform.ini $(OutDir)\
"
/>
</Configuration>
<Configuration
@@ -269,7 +269,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="xcopy /Y /I $(ProjectDir)Resources\*.* $(OutDir)\Resources
xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)\Schema
xcopy /Y $(ProjectDir)Platform.ini $(OutDir)\
"
+ CommandLine="xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)\Resources
xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)\Schema
xcopy /Y $(ProjectDir)Platform.ini $(OutDir)\
"
/>
</Configuration>
<Configuration
@@ -351,7 +351,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="xcopy /Y /I $(ProjectDir)Resources\*.* $(OutDir)\Resources
xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)\Schema
xcopy /Y $(ProjectDir)Platform.ini $(OutDir)\
"
+ CommandLine="xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)\Resources
xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)\Schema
xcopy /Y $(ProjectDir)Platform.ini $(OutDir)\
"
/>
</Configuration>
</Configurations>
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp 2012-06-22 14:46:06 UTC (rev 6801)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp 2012-06-22 15:44:48 UTC (rev 6802)
@@ -82,15 +82,37 @@
FdoPtr<FdoIConnectionCapabilities> connCaps = conn->GetConnectionCapabilities();
if (connCaps->SupportsConfiguration() && !configDoc.empty())
{
- STRING path = resSvc->ResolveDataPath(resource);
- MgFileUtil::AppendSlashToEndOfPath(path);
- path += configDoc;
+ Ptr<MgByteReader> br = resSvc->GetResourceData(resource, configDoc, MgResourcePreProcessingType::Substitution);
+ if (br == NULL)
+ {
+ STRING message = MgUtil::GetResourceMessage(MgResources::FeatureService, L"MgMissingConfiguration");
- FdoPtr<FdoIoFileStream> fs = FdoIoFileStream::Create(path.c_str(), L"r");
- conn->SetConfiguration(fs);
+ Ptr<MgStringCollection> strCol;
+ if (!message.empty())
+ {
+ strCol = new MgStringCollection();
+ strCol->Add(message);
+ }
+ throw new MgInvalidFeatureSourceException(L"MgFdoConnectionUtil::CreateConnection",
+ __LINE__, __WFILE__, (MgStringCollection*)strCol, L"", NULL);
+ }
+
+ Ptr<MgByte> bytes;
+ bytes = NULL;
+
+ MgByteSink byteSink(br);
+ bytes = byteSink.ToBuffer();
+
+ if (bytes)
+ {
+ FdoIoMemoryStreamP stream = FdoIoMemoryStream::Create();
+ stream->Write((FdoByte*)bytes->Bytes(), (FdoSize)bytes->GetLength());
+ stream->Reset();
+ conn->SetConfiguration(stream);
+ }
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgFdoConnectionUtil::CreateConnection")
+ MG_FEATURE_SERVICE_CATCH_AND_THROW_WITH_FEATURE_SOURCE(L"MgFdoConnectionUtil::CreateConnection", resource)
return conn.Detach();
}
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureDefs.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureDefs.h 2012-06-22 14:46:06 UTC (rev 6801)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureDefs.h 2012-06-22 15:44:48 UTC (rev 6802)
@@ -20,11 +20,22 @@
MgStringCollection arguments; \
wchar_t* buf = (wchar_t*)e->GetExceptionMessage(); \
INT64 nativeErrorCode = e->GetNativeErrorCode(); \
+ FdoPtr<FdoException> cause = e->GetCause(); \
+ FdoPtr<FdoException> root = e->GetRootCause(); \
\
+ wchar_t* causeStr = NULL; \
+ wchar_t* rootCauseStr = NULL; \
+ if (NULL != cause.p) \
+ causeStr = (wchar_t*)cause->GetExceptionMessage(); \
+ if (NULL != root.p) \
+ rootCauseStr = (wchar_t*)root->GetExceptionMessage(); \
+ \
if (NULL != buf) \
{ \
- messageId = L"MgFormatInnerExceptionMessage"; \
+ messageId = L"MgFormatFdoExceptionMessage"; \
arguments.Add(buf); \
+ arguments.Add((causeStr == NULL) ? L"" : causeStr); \
+ arguments.Add((rootCauseStr == NULL) ? L"" : rootCauseStr); \
} \
\
FDO_SAFE_RELEASE(e); \
@@ -32,6 +43,38 @@
\
MG_CATCH(methodName) \
+#define MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(methodName, fsId) \
+ } \
+ catch (FdoException* e) \
+ { \
+ STRING messageId; \
+ MgStringCollection arguments; \
+ wchar_t* buf = (wchar_t*)e->GetExceptionMessage(); \
+ INT64 nativeErrorCode = e->GetNativeErrorCode(); \
+ FdoPtr<FdoException> cause = e->GetCause(); \
+ FdoPtr<FdoException> root = e->GetRootCause(); \
+ \
+ wchar_t* causeStr = NULL; \
+ wchar_t* rootCauseStr = NULL; \
+ if (NULL != cause.p) \
+ causeStr = (wchar_t*)cause->GetExceptionMessage(); \
+ if (NULL != root.p) \
+ rootCauseStr = (wchar_t*)root->GetExceptionMessage(); \
+ \
+ if (NULL != buf) \
+ { \
+ messageId = L"MgFeatureSourceFormatInnerExceptionMessage"; \
+ arguments.Add(fsId->ToString()); \
+ arguments.Add(buf); \
+ arguments.Add((causeStr == NULL) ? L"" : causeStr); \
+ arguments.Add((rootCauseStr == NULL) ? L"" : rootCauseStr); \
+ } \
+ \
+ FDO_SAFE_RELEASE(e); \
+ mgException = new MgFdoException(methodName, __LINE__, __WFILE__, NULL, messageId, &arguments, nativeErrorCode); \
+ \
+ MG_CATCH(methodName) \
+
#define MG_FEATURE_SERVICE_THROW() \
MG_THROW() \
@@ -40,6 +83,11 @@
\
MG_FEATURE_SERVICE_THROW() \
+#define MG_FEATURE_SERVICE_CATCH_AND_THROW_WITH_FEATURE_SOURCE(methodName, fsId) \
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(methodName, fsId) \
+ \
+ MG_FEATURE_SERVICE_THROW() \
+
// The catch below is used when we want to mark a connection as no longer valid because
// the underlying RDBMS has been stopped or the connection has been lost.
@@ -68,7 +116,16 @@
MgStringCollection arguments; \
wchar_t* buf = (wchar_t*)e->GetExceptionMessage(); \
INT64 nativeErrorCode = e->GetNativeErrorCode(); \
+ FdoPtr<FdoException> cause = e->GetCause(); \
+ FdoPtr<FdoException> root = e->GetRootCause(); \
\
+ wchar_t* causeStr = NULL; \
+ wchar_t* rootCauseStr = NULL; \
+ if (NULL != cause.p) \
+ causeStr = (wchar_t*)cause->GetExceptionMessage(); \
+ if (NULL != root.p) \
+ rootCauseStr = (wchar_t*)root->GetExceptionMessage(); \
+ \
if (NULL != buf) \
{ \
if((NULL != wcsstr(buf, L"Lost connection to MySQL server during query")) || \
@@ -80,8 +137,11 @@
{ \
MgFdoConnectionPool::PurgeCachedConnections(resource); \
} \
- messageId = L"MgFormatInnerExceptionMessage"; \
+ messageId = L"MgFeatureSourceFormatInnerExceptionMessage"; \
+ arguments.Add(resource->ToString()); \
arguments.Add(buf); \
+ arguments.Add((causeStr == NULL) ? L"" : causeStr); \
+ arguments.Add((rootCauseStr == NULL) ? L"" : rootCauseStr); \
} \
\
FDO_SAFE_RELEASE(e); \
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.cpp 2012-06-22 14:46:06 UTC (rev 6801)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.cpp 2012-06-22 15:44:48 UTC (rev 6802)
@@ -112,8 +112,16 @@
while(m_reader->ReadNext())
{
// Get the geometry
- Ptr<MgGeometry> val = GetValue();
-
+ Ptr<MgGeometry> val;
+ try
+ {
+ val = GetValue();
+ }
+ catch (MgException* ex) //Don't let a bad geometry derail us, just discard and continue
+ {
+ ex->Release();
+ continue;
+ }
// Get the envelope
Ptr<MgEnvelope> envl = val->Envelope();
Ptr<MgCoordinate> lcoord;
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp 2012-06-22 14:46:06 UTC (rev 6801)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp 2012-06-22 15:44:48 UTC (rev 6802)
@@ -529,7 +529,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::TestConnection")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::TestConnection", resource)
if (mgException != NULL)
{
@@ -1363,7 +1363,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::DescribeSchema")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::DescribeSchema", resource)
if (mgException != NULL)
{
@@ -1962,7 +1962,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::DescribeSchema")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::DescribeSchema", resource)
if (mgException != NULL)
{
@@ -2054,7 +2054,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::DescribeSchemaAsXml")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::DescribeSchemaAsXml", resource)
if (mgException != NULL)
{
@@ -2093,7 +2093,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::DescribeSchemaAsXml")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::DescribeSchemaAsXml", resource)
if (mgException != NULL)
{
@@ -2379,7 +2379,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::SelectFeatures")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::SelectFeatures", resource)
if (mgException != NULL)
{
@@ -2424,7 +2424,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::SelectFeatures")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::SelectFeatures", resource)
if (mgException != NULL)
{
@@ -2466,7 +2466,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::SelectFeaturesExtended")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::SelectFeaturesExtended", resource)
if (mgException != NULL)
{
@@ -4191,7 +4191,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::InsertFeatures")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::InsertFeatures", resource)
if (mgException != NULL)
{
@@ -4317,7 +4317,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::InsertFeatures")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::InsertFeatures", resource)
if (mgException != NULL)
{
@@ -4495,7 +4495,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::UpdateFeatures")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::UpdateFeatures", resource)
if (mgException != NULL)
{
@@ -4622,7 +4622,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::DeleteFeatures")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::DeleteFeatures", resource)
if (mgException != NULL)
{
@@ -4734,7 +4734,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::PurgeCache")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::PurgeCache", resource)
if (mgException != NULL)
{
@@ -4774,7 +4774,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::GetLockedFeatures")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::GetLockedFeatures", resource)
if (mgException != NULL)
{
@@ -4907,7 +4907,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::ExecuteSqlQuery")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::ExecuteSqlQuery", resource)
if (mgException != NULL)
{
@@ -5713,7 +5713,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::GetClassDefinition")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::GetClassDefinition", resource)
if (mgException != NULL)
{
@@ -5789,7 +5789,7 @@
clone = MgFeatureUtil::CloneMgClassDefinition(classDefinition);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureService::GetClassDefinition")
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureService::GetClassDefinition", resource)
return clone.Detach();
}
@@ -6237,7 +6237,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::GetIdentityProperties")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::GetIdentityProperties", resource)
if (mgException != NULL)
{
@@ -6345,7 +6345,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_FEATURE_SERVICE_CATCH(L"MgdFeatureService::GetIdentityProperties")
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdFeatureService::GetIdentityProperties", resource)
if (mgException != NULL)
{
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp 2012-06-22 14:46:06 UTC (rev 6801)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp 2012-06-22 15:44:48 UTC (rev 6802)
@@ -419,13 +419,13 @@
ldf.reset(MgLayerBase::GetLayerDefinition(svcResource, layerid));
Ptr<MgLayerGroup> group = mapLayer->GetGroup();
- /*
+
MgLogDetail logDetail(MgServiceType::MappingService, MgLogDetail::InternalTrace, L"MgMappingUtil.StylizeLayers", mgStackParams);
logDetail.AddString(L"Map",map->GetName());
logDetail.AddResourceIdentifier(L"LayerId",layerid);
logDetail.Create();
- */
+
//base map layers are not editable
bool bEditable = true;
if (mapLayer->GetLayerType() == MgLayerType::BaseMap)
@@ -866,7 +866,8 @@
STRING message = exception->GetExceptionMessage(locale);
STRING stackTrace = exception->GetStackTrace(locale);
- //MG_LOG_EXCEPTION_ENTRY(message.c_str(), stackTrace.c_str());
+
+ MG_LOG_EXCEPTION_ENTRY(message.c_str(), stackTrace.c_str());
#if defined(_DEBUG) || defined(_DEBUG_PNG8)
STRING details = mgException->GetDetails(locale);
Modified: branches/2.4/MgDev/Desktop/UnitTest/UnitTest.vcproj
===================================================================
--- branches/2.4/MgDev/Desktop/UnitTest/UnitTest.vcproj 2012-06-22 14:46:06 UTC (rev 6801)
+++ branches/2.4/MgDev/Desktop/UnitTest/UnitTest.vcproj 2012-06-22 15:44:48 UTC (rev 6802)
@@ -87,7 +87,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="xcopy /S /Y ..\..\Common\bin\debug\*.* $(OutDir)
xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib\ACEd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\geos-2.2.0\VisualStudio\Debug\GEOSd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Debug\gd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\FDO\Bin\Debug\*.* $(OutDir)\FDO\
xcopy /S /Y /I ..\..\Server\bin\Debug\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\$(ConfigurationName)\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SDF\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SHP\*.* $(OutDir)\..\UnitTestFiles\
&
#x0A;xcopy /S /Y /I ..\..\UnitTest\TestData\MapLayer\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\MappingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\ResourceService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\Symbology\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\TestProviderList\providers.xml $(OutDir)\Fdo\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)\..\UnitTestFiles\
copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels_Writeable.sdf
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)\Diction
aries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)\Dictionaries\
"
+ CommandLine="xcopy /S /Y ..\..\Common\bin\debug\*.* $(OutDir)
xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)\Resources
xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib\ACEd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\geos-2.2.0\VisualStudio\Debug\GEOSd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Debug\gd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\FDO\Bin\Debug\*.* $(OutDir)\FDO\
xcopy /S /Y /I ..\..\Server\bin\Debug\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\$(ConfigurationName)\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SDF\*.* $(OutDir)\..\UnitTestFiles\
xcopy
/Y /I ..\..\UnitTest\TestData\FeatureService\SHP\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\MapLayer\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\MappingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\ResourceService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\Symbology\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)\..\UnitTestFiles\
copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels_Writeable.sdf
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(Ou
tDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)\Dictionaries\
"
/>
</Configuration>
<Configuration
@@ -160,7 +160,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="xcopy /S /Y ..\..\Common\bin\debug\*.* $(OutDir)
xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib\ACEd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\geos-2.2.0\VisualStudio\Debug\GEOSd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Debug\gd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\FDO\Bin\Debug\*.* $(OutDir)\FDO\
xcopy /S /Y /I ..\..\Server\bin\Debug\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\$(ConfigurationName)\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SDF\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SHP\*.* $(OutDir)\..\UnitTestFiles\
&
#x0A;xcopy /S /Y /I ..\..\UnitTest\TestData\MapLayer\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\MappingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\ResourceService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\Symbology\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\TestProviderList\providers.xml $(OutDir)\Fdo\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)\..\UnitTestFiles\
copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels_Writeable.sdf
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)\Diction
aries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)\Dictionaries\
"
+ CommandLine="xcopy /S /Y ..\..\Common\bin\debug\*.* $(OutDir)
xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)\Resources
xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib\ACEd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\geos-2.2.0\VisualStudio\Debug\GEOSd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Debug\gd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\FDO\Bin\Debug\*.* $(OutDir)\FDO\
xcopy /S /Y /I ..\..\Server\bin\Debug\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\$(ConfigurationName)\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SDF\*.* $(OutDir)\..\UnitTestFiles\
xcopy
/Y /I ..\..\UnitTest\TestData\FeatureService\SHP\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\MapLayer\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\MappingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\ResourceService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\Symbology\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)\..\UnitTestFiles\
copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels_Writeable.sdf
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(Ou
tDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)\Dictionaries\
"
/>
</Configuration>
<Configuration
@@ -236,7 +236,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="xcopy /S /Y ..\..\Common\bin\release\*.* $(OutDir)
xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib\ACE.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\dbxml\bin\xerces-c_3_1mg.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\geos-2.2.0\VisualStudio\Release\GEOS.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Release\gd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\FDO\Bin\Release\*.* $(OutDir)\FDO\
xcopy /S /Y /I ..\..\Server\bin\Release\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\$(ConfigurationName)\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SDF\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SHP\*.* $(OutDir)\..\UnitTestFiles\

xcopy /S /Y /I ..\..\UnitTest\TestData\MapLayer\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\MappingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\ResourceService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\Symbology\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\TestProviderList\providers.xml $(OutDir)\Fdo\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)\..\UnitTestFiles\
copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels_Writeable.sdf
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)\Dictio
naries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)\Dictionaries\
xcopy /Y /I ..\..\Oem\CsMap\Dictionaries\*.txt $(OutDir)\Dictionaries\
"
+ CommandLine="xcopy /S /Y ..\..\Common\bin\release\*.* $(OutDir)
xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)\Resources
xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib\ACE.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\dbxml\bin\xerces-c_3_1mg.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\geos-2.2.0\VisualStudio\Release\GEOS.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Release\gd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\FDO\Bin\Release\*.* $(OutDir)\FDO\
xcopy /S /Y /I ..\..\Server\bin\Release\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\$(ConfigurationName)\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SDF\*.* $(OutDir)\..\UnitTestFiles\
xcop
y /Y /I ..\..\UnitTest\TestData\FeatureService\SHP\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\MapLayer\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\MappingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\ResourceService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\Symbology\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)\..\UnitTestFiles\
copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels_Writeable.sdf
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(O
utDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)\Dictionaries\
xcopy /Y /I ..\..\Oem\CsMap\Dictionaries\*.txt $(OutDir)\Dictionaries\
"
/>
</Configuration>
<Configuration
@@ -313,7 +313,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="xcopy /S /Y ..\..\Common\bin\release64\*.* $(OutDir)
xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib64\ACE.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\dbxml\bin64\xerces-c_3_1mg.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\geos-2.2.0\VisualStudio\Release64\GEOS.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Release64\gd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\FDO\Bin\Release64\*.* $(OutDir)\FDO\
xcopy /S /Y /I ..\..\Server\bin\Release64\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\release64\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SDF\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SHP\*.* $(OutDir)\..\UnitTestFiles\&#x
0D;
xcopy /S /Y /I ..\..\UnitTest\TestData\MapLayer\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\MappingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\ResourceService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\Symbology\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\TestProviderList\providers.xml $(OutDir)\Fdo\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)\..\UnitTestFiles\
copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels_Writeable.sdf
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)\Dic
tionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)\Dictionaries\
xcopy /Y /I ..\..\Oem\CsMap\Dictionaries\*.txt $(OutDir)\Dictionaries\
"
+ CommandLine="xcopy /S /Y ..\..\Common\bin\release64\*.* $(OutDir)
xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)\Resources
xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib64\ACE.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\dbxml\bin64\xerces-c_3_1mg.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\geos-2.2.0\VisualStudio\Release64\GEOS.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Release64\gd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\FDO\Bin\Release64\*.* $(OutDir)\FDO\
xcopy /S /Y /I ..\..\Server\bin\Release64\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\release64\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SDF\*.* $(OutDir)\..\UnitTestFiles\
x
copy /Y /I ..\..\UnitTest\TestData\FeatureService\SHP\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\MapLayer\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\MappingService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\ResourceService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\Symbology\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)\..\UnitTestFiles\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)\..\UnitTestFiles\
copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)\..\UnitTestFiles\UT_Parcels_Writeable.sdf
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt
$(OutDir)\Dictionaries\
xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)\Dictionaries\
xcopy /Y /I ..\..\Oem\CsMap\Dictionaries\*.txt $(OutDir)\Dictionaries\
"
/>
</Configuration>
</Configurations>
@@ -380,34 +380,6 @@
<File
RelativePath=".\TestMappingService.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\TestPerformance.cpp"
More information about the mapguide-commits
mailing list