Merge pull request #1296 from mhugent/server_cleanup

Server config redesign
qgis · Apr 20, 2014 · 4aafeb2 · 4aafeb2
2 parents 25676f3 + f132b43
commit 4aafeb2
Show file tree

Hide file tree

Showing 26 changed files with 7,586 additions and 768 deletions.
diff --git a/src/mapserver/CMakeLists.txt b/src/mapserver/CMakeLists.txt
@@ -17,13 +17,10 @@ SET ( qgis_mapserv_SRCS
   qgis_map_serv.cpp
   qgscapabilitiescache.cpp
   qgsconfigcache.cpp
-  qgsconfigparser.cpp
-  qgsprojectparser.cpp
   qgshttprequesthandler.cpp 
   qgsgetrequesthandler.cpp
   qgspostrequesthandler.cpp
   qgssoaprequesthandler.cpp
-  qgssldparser.cpp
   qgswmsserver.cpp
   qgswfsserver.cpp
   qgswcsserver.cpp
@@ -43,6 +40,13 @@ SET ( qgis_mapserv_SRCS
   qgsremotedatasourcebuilder.cpp
   qgssentdatasourcebuilder.cpp
   qgsmsutils.cpp
+  qgswcsprojectparser.cpp
+  qgswfsprojectparser.cpp
+  qgswmsconfigparser.cpp
+  qgswmsprojectparser.cpp
+  qgsserverprojectparser.cpp
+  qgssldconfigparser.cpp
+  qgsconfigparserutils.cpp
   )
 
 # SET (qgis_mapserv_UIS