[mapguide-commits] r8497 - in branches/2.6/MgDev: . Server/src/Services/Drawing

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-01-11 04:38:10 -0800 (Sun, 11 Jan 2015)
New Revision: 8497

Modified:
   branches/2.6/MgDev/
   branches/2.6/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp
   branches/2.6/MgDev/run_tests.bat
   branches/2.6/MgDev/setenvironment.bat
Log:
Merged revision(s) 8443 from trunk/MgDev:
#1727: Force uniqueness on the MgStringCollection returned by MgDrawingService::EnumerateLayers()
........



Property changes on: branches/2.6/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/sandbox/jng/createruntimemap:7486-7555
/sandbox/rfc94:5099-5163
/trunk/MgDev:8209-8210,8230,8313,8333,8359,8388,8392
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/sandbox/jng/createruntimemap:7486-7555
/sandbox/rfc94:5099-5163
/trunk/MgDev:8209-8210,8230,8313,8333,8359,8388,8392,8443

Modified: branches/2.6/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp
===================================================================
--- branches/2.6/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp	2015-01-11 12:17:26 UTC (rev 8496)
+++ branches/2.6/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp	2015-01-11 12:38:10 UTC (rev 8497)
@@ -80,7 +80,8 @@
     if (layerName)
     {
         wchar_t* name = WT_String::to_wchar(layerName.length(), layerName.unicode());
-        layerList->Add(name);
+        if (layerList->IndexOf(name) < 0)
+            layerList->Add(name);
         delete [] name;
     }
 

Modified: branches/2.6/MgDev/run_tests.bat
===================================================================
--- branches/2.6/MgDev/run_tests.bat	2015-01-11 12:17:26 UTC (rev 8496)
+++ branches/2.6/MgDev/run_tests.bat	2015-01-11 12:38:10 UTC (rev 8497)
@@ -11,15 +11,16 @@
 SET SERVER_ADDR=localhost
 SET WEBCONFIGINI=%CD%\UnitTest\webconfig.ini
 SET SERVER_PORT=8018
+SET PATH=D:\mg-2.6\MgDev\Release\Web\Php;%PATH%;
 REM SET WEBCONFIGINI=C:\Program Files\OSGeo\MapGuide\Web\www\webconfig.ini
 REM SET SERVER_PORT=80
 SET PHP_TEST_CWD=%CD%\Web\src\mapagent
-SET PHP_EXT_DIR=C:\Program Files\OSGeo\MapGuide\Web\Php\ext
+SET PHP_EXT_DIR=D:\mg-2.6\MgDev\Release\Web\Php\ext
 
 SET START_MGSERVER=1
 SET START_WEBSERVER=1
-SET RUN_SERVER_TESTS=1
-SET RUN_PHP_TESTS=1
+SET RUN_SERVER_TESTS=0
+SET RUN_PHP_TESTS=0
 SET RUN_DOTNET_TESTS=1
 
 SET RETURN_CODE=0

Modified: branches/2.6/MgDev/setenvironment.bat
===================================================================
--- branches/2.6/MgDev/setenvironment.bat	2015-01-11 12:17:26 UTC (rev 8496)
+++ branches/2.6/MgDev/setenvironment.bat	2015-01-11 12:38:10 UTC (rev 8497)
@@ -83,7 +83,7 @@
 rem running
 rem ==================================================
 
-IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files\Java\jdk1.6.0_31
+IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files (x86\Java\jdk1.6.0_33
 IF "%DOXYGEN%" == "" SET DOXYGEN=%MG_DEV%\BuildTools\doxygen
 IF "%GNUWIN32%" == "" SET GNUWIN32=C:\Program Files (x86)\GnuWin32\bin
 IF "%SEVENZ%" == "" SET SEVENZ=%MG_DEV%\BuildTools\WebTools\7-Zip