Skip to content
Permalink
Browse files

master merge

  • Loading branch information
blazek committed Jul 20, 2012
2 parents 47b8d60 + c517a90 commit 73f991f3be8ab2c8df74a1ae872bde391299c889
Showing with 42,666 additions and 29,367 deletions.
  1. +2 −1 CMakeLists.txt
  2. +2 −0 cmake_templates/qgsconfig.h.in
  3. +1 −0 doc/AUTHORS
  4. +3 −2 doc/CONTRIBUTORS
  5. +4 −0 doc/INSTALL.t2t
  6. +40 −40 doc/TRANSLATORS
  7. +6 −0 doc/iauthors.t2t
  8. +89 −0 doc/jenkins.t2t
  9. BIN doc/qgis-download-stats.ods
  10. +114 −0 doc/wcs-test-server.t2t
  11. +6,041 −4,821 i18n/qgis_bg.ts
  12. +4,472 −3,692 i18n/qgis_da_DK.ts
  13. +2,940 −1,755 i18n/qgis_de.ts
  14. +2,629 −1,727 i18n/qgis_gl_ES.ts
  15. +2,051 −367 i18n/qgis_lv.ts
  16. +11,002 −8,797 i18n/qgis_zh_CN.ts
  17. +4,878 −3,545 i18n/qgis_zh_TW.ts
  18. +4 −0 images/images.qrc
  19. BIN images/themes/default/mActionFreezeLabels.png
  20. BIN images/themes/default/mActionShowFrozenLabels.png
  21. BIN images/themes/default/mActionTouch2.png
  22. BIN images/themes/default/mIconZoom.png
  23. +1 −1 ms-windows/osgeo4w/browser.bat.tmpl
  24. +2 −2 python/core/core.sip
  25. +44 −9 python/core/qgscomposermap.sip
  26. +19 −0 python/core/qgscomposition.sip
  27. +3 −0 python/core/qgsmaprenderer.sip
  28. +8 −0 python/core/qgspaintenginehack.sip
  29. +0 −46 python/core/qgssearchstring.sip
  30. +0 −210 python/core/qgssearchtreenode.sip
  31. +3 −2 python/core/qgsvectorlayer.sip
  32. +4 −1 python/gui/qgsscalecombobox.sip
  33. +2 −2 python/plugins/db_manager/db_plugins/postgis/data_model.py
  34. +12 −12 python/plugins/db_manager/db_plugins/spatialite/connector.py
  35. +3 −0 python/plugins/db_manager/db_plugins/spatialite/plugin.py
  36. +1 −1 python/plugins/fTools/tools/doValidate.py
  37. +10 −1 python/plugins/plugin_installer/installer_gui.py
  38. BIN resources/srs.db
  39. +2 −2 scripts/tsstat.pl
  40. +2 −0 src/app/CMakeLists.txt
  41. +145 −217 src/app/composer/qgscomposer.cpp
  42. +8 −3 src/app/composer/qgscomposer.h
  43. +2 −0 src/app/composer/qgscomposerlabelwidget.cpp
  44. +326 −58 src/app/composer/qgscomposermapwidget.cpp
  45. +36 −4 src/app/composer/qgscomposermapwidget.h
  46. +12 −0 src/app/composer/qgscompositionwidget.cpp
  47. +1 −0 src/app/composer/qgscompositionwidget.h
  48. +35 −13 src/app/legend/qgslegend.cpp
  49. +3 −3 src/app/legend/qgslegendgroup.cpp
  50. +13 −13 src/app/legend/qgslegendlayer.cpp
  51. +1 −1 src/app/legend/qgslegendpropertygroup.cpp
  52. +1 −1 src/app/legend/qgslegendsymbologygroup.cpp
  53. +261 −171 src/app/qgisapp.cpp
  54. +22 −16 src/app/qgisapp.h
  55. +22 −2 src/app/qgsattributedialog.cpp
  56. +12 −12 src/app/qgsattributetabledialog.cpp
  57. +3 −3 src/app/qgsbrowserdockwidget.cpp
  58. +9 −9 src/app/qgscustomprojectiondialog.cpp
  59. +3 −1 src/app/qgsembedlayerdialog.cpp
  60. +5 −14 src/app/qgshighlight.cpp
  61. +1 −0 src/app/qgshighlight.h
  62. +5 −5 src/app/qgsidentifyresults.cpp
  63. +533 −0 src/app/qgsmaptoolfreezelabels.cpp
  64. +103 −0 src/app/qgsmaptoolfreezelabels.h
  65. +35 −0 src/app/qgsmaptoollabel.cpp
  66. +5 −0 src/app/qgsmaptoollabel.h
  67. +2 −1 src/app/qgsmaptoolrotatelabel.cpp
  68. +3 −2 src/app/qgsmergeattributesdialog.cpp
  69. +2 −2 src/app/qgsnewspatialitelayerdialog.cpp
  70. +325 −21 src/app/qgsoptions.cpp
  71. +41 −2 src/app/qgsoptions.h
  72. +289 −1 src/app/qgsprojectproperties.cpp
  73. +40 −1 src/app/qgsprojectproperties.h
  74. +162 −279 src/app/qgsrasterlayerproperties.cpp
  75. +5 −5 src/app/qgsrasterlayerproperties.h
  76. +5 −5 src/app/qgstipfactory.cpp
  77. +3 −2 src/app/qgsundowidget.cpp
  78. +5 −5 src/app/qgsvectorlayerproperties.cpp
  79. +8 −6 src/core/CMakeLists.txt
  80. +8 −27 src/core/composer/qgscomposeritem.cpp
  81. +411 −49 src/core/composer/qgscomposermap.cpp
  82. +80 −22 src/core/composer/qgscomposermap.h
  83. +206 −62 src/core/composer/qgscomposition.cpp
  84. +30 −1 src/core/composer/qgscomposition.h
  85. +5 −0 src/core/qgis.h
  86. +39 −0 src/core/qgsapplication.cpp
  87. +10 −0 src/core/qgsapplication.h
  88. +10 −33 src/core/qgsdataitem.cpp
  89. +1 −2 src/core/qgsdataitem.h
  90. +29 −21 src/core/qgsexpression.cpp
  91. +18 −2 src/core/qgslabelsearchtree.cpp
  92. +4 −1 src/core/qgslabelsearchtree.h
  93. +7 −3 src/core/qgsmaprenderer.h
  94. +55 −0 src/core/qgspaintenginehack.cpp
  95. +25 −0 src/core/qgspaintenginehack.h
  96. +28 −2 src/core/qgspallabeling.cpp
  97. +3 −0 src/core/qgspallabeling.h
  98. +56 −0 src/core/qgsprojectfiletransform.cpp
  99. +7 −0 src/core/qgsrasterdataprovider.cpp
  100. +15 −2 src/core/qgsrasterdataprovider.h
  101. +86 −0 src/core/qgsscaleutils.cpp
  102. +44 −0 src/core/qgsscaleutils.h
  103. +0 −116 src/core/qgssearchstring.cpp
  104. +0 −83 src/core/qgssearchstring.h
  105. +0 −144 src/core/qgssearchstringlexer.ll
  106. +0 −266 src/core/qgssearchstringparser.yy
  107. +0 −953 src/core/qgssearchtreenode.cpp
  108. +0 −292 src/core/qgssearchtreenode.h
  109. +8 −6 src/core/qgsvectorlayer.cpp
  110. +25 −1 src/core/raster/qgsmultibandcolorrenderer.cpp
  111. +2 −0 src/core/raster/qgsmultibandcolorrenderer.h
  112. +10 −0 src/core/raster/qgspalettedrasterrenderer.cpp
  113. +2 −0 src/core/raster/qgspalettedrasterrenderer.h
  114. +28 −11 src/core/raster/qgsrasterlayer.cpp
  115. +9 −1 src/core/raster/qgsrasterlayer.h
  116. +3 −0 src/core/raster/qgsrasterrenderer.h
  117. +30 −4 src/core/raster/qgsrasterrendererregistry.cpp
  118. +1 −0 src/core/raster/qgsrasterrendererregistry.h
  119. +10 −0 src/core/raster/qgssinglebandcolordatarenderer.cpp
  120. +2 −0 src/core/raster/qgssinglebandcolordatarenderer.h
  121. +10 −0 src/core/raster/qgssinglebandgrayrenderer.cpp
  122. +2 −0 src/core/raster/qgssinglebandgrayrenderer.h
  123. +10 −0 src/core/raster/qgssinglebandpseudocolorrenderer.cpp
  124. +2 −0 src/core/raster/qgssinglebandpseudocolorrenderer.h
  125. +41 −7 src/core/symbology-ng/qgssymbolv2.cpp
  126. +8 −0 src/gui/CMakeLists.txt
  127. +2 −0 src/gui/qgsmapcanvas.h
  128. +2 −0 src/gui/qgsmaptool.h
  129. +9 −0 src/gui/qgsnewhttpconnection.cpp
  130. +34 −13 src/gui/qgsscalecombobox.cpp
  131. +3 −0 src/gui/qgsscalecombobox.h
  132. +110 −27 src/gui/raster/qgsmultibandcolorrendererwidget.cpp
  133. +8 −0 src/gui/raster/qgsmultibandcolorrendererwidget.h
  134. +992 −0 src/gui/raster/qgsrasterhistogramwidget.cpp
  135. +123 −0 src/gui/raster/qgsrasterhistogramwidget.h
  136. +96 −3 src/gui/raster/qgsrasterrendererwidget.cpp
  137. +19 −0 src/gui/raster/qgsrasterrendererwidget.h
  138. +21 −27 src/gui/raster/qgssinglebandgrayrendererwidget.cpp
  139. +8 −0 src/gui/raster/qgssinglebandgrayrendererwidget.h
  140. +12 −0 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  141. +11 −0 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  142. +18 −15 src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
  143. +0 −1 src/mapserver/qgsmslayerbuilder.cpp
  144. +0 −1 src/mapserver/qgssldparser.cpp
  145. +11 −82 src/mapserver/qgswmsserver.cpp
  146. +4 −13 src/plugins/delimited_text/CMakeLists.txt
  147. +17 −16 src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
  148. +6 −4 src/plugins/delimited_text/qgsdelimitedtextplugin.h
  149. +10 −4 src/providers/delimitedtext/CMakeLists.txt
  150. +15 −11 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  151. +5 −2 src/providers/delimitedtext/qgsdelimitedtextprovider.h
  152. +30 −55 ...ed_text/qgsdelimitedtextplugingui.cpp → providers/delimitedtext/qgsdelimitedtextsourceselect.cpp}
  153. +11 −14 ...imited_text/qgsdelimitedtextplugingui.h → providers/delimitedtext/qgsdelimitedtextsourceselect.h}
  154. +4 −4 src/providers/gdal/qgsgdaldataitems.cpp
  155. +140 −29 src/providers/gdal/qgsgdalprovider.cpp
  156. +4 −1 src/providers/gdal/qgsgdalprovider.h
  157. +2 −2 src/providers/grass/qgsgrassprovidermodule.cpp
  158. +3 −3 src/providers/mssql/qgsmssqldataitems.cpp
  159. +5 −5 src/providers/mssql/qgsmssqltablemodel.cpp
  160. +5 −2 src/providers/ows/qgsowsdataitems.cpp
  161. +5 −5 src/providers/postgres/qgspgtablemodel.cpp
  162. +4 −3 src/providers/postgres/qgspostgresdataitems.cpp
  163. +1 −1 src/providers/spatialite/qgsspatialitedataitems.cpp
  164. +12 −16 src/providers/spatialite/qgsspatialiteprovider.cpp
  165. +2 −0 src/providers/spatialite/qgsspatialitesourceselect.cpp
  166. +4 −4 src/providers/wfs/qgswfsdataitems.cpp
  167. +6 −4 src/providers/wms/qgswmsdataitems.cpp
  168. +51 −0 src/ui/qgisapp.ui
  169. +355 −221 src/ui/qgscomposermapwidgetbase.ui
  170. +14 −4 src/ui/qgscompositionwidgetbase.ui
  171. +5 −14 ...plugins/delimited_text/qgsdelimitedtextpluginguibase.ui → ui/qgsdelimitedtextsourceselectbase.ui}
  172. +246 −325 src/ui/qgsmultibandcolorrendererwidgetbase.ui
  173. +238 −39 src/ui/qgsoptionsbase.ui
  174. +386 −8 src/ui/qgsprojectpropertiesbase.ui
  175. +441 −0 src/ui/qgsrasterhistogramwidgetbase.ui
  176. +28 −74 src/ui/qgsrasterlayerpropertiesbase.ui
  177. +42 −22 src/ui/qgssinglebandgrayrendererwidgetbase.ui
  178. +119 −0 tests/ctest2junix.xsl
  179. +3 −2 tests/src/core/CMakeLists.txt
  180. +131 −0 tests/src/core/qgscompositionchecker.cpp
  181. +41 −0 tests/src/core/qgscompositionchecker.h
  182. +11 −6 tests/src/core/qgsrenderchecker.cpp
  183. +7 −1 tests/src/core/qgsrenderchecker.h
  184. +163 −0 tests/src/core/testqgscomposermap.cpp
  185. +2 −0 tests/src/core/testqgsexpression.cpp
  186. +4 −1 tests/src/core/testqgsrasterlayer.cpp
  187. +0 −74 tests/src/core/testqgssearchstring.cpp
  188. +3 −2 tests/src/core/testziplayer.cpp
  189. +8 −0 tests/src/gui/CMakeLists.txt
  190. +296 −0 tests/src/gui/testqgsrasterhistogram.cpp
  191. BIN tests/testdata/control_images/expected_composermap/composermap_landsat_grid.png
  192. BIN tests/testdata/control_images/expected_composermap/composermap_landsat_overview.png
  193. BIN tests/testdata/control_images/expected_composermap/composermap_landsat_render.png
  194. BIN tests/testdata/control_images/expected_continuous/jenkins_ubuntu_12.04.anomaly.png
  195. BIN tests/testdata/control_images/expected_continuous/msvc9_continuous_anomaly.png
  196. BIN tests/testdata/control_images/expected_continuous/osx_hawkeye_continuous_anomaly.png
  197. BIN tests/testdata/control_images/expected_geometry_bufferCheck/osx_hawkeye_anomaly.png
  198. BIN tests/testdata/control_images/expected_geometry_differenceCheck2/osx_hawkeyeanomaly.png
  199. BIN tests/testdata/control_images/expected_geometry_simplifyCheck1/osx_hawkeye_anomaly.png
  200. BIN tests/testdata/control_images/expected_graduated/jenkins_ubuntu_12.04.anomaly.png
  201. BIN tests/testdata/control_images/expected_graduated/msvc9_graduated_anomaly.png
  202. BIN tests/testdata/control_images/expected_graduated/osx_hawkeye_graduated_anomaly.png
  203. BIN tests/testdata/control_images/expected_landsat_basic/expected_landsat_basic.png
  204. BIN tests/testdata/control_images/expected_single/osx_hawkeye_single_anomaly.png
  205. BIN tests/testdata/control_images/expected_uniquevalue/jenkins_ubuntu_12.04.anomaly.png
  206. BIN tests/testdata/control_images/expected_uniquevalue/msvc9_anomaly.png
  207. BIN tests/testdata/control_images/expected_uniquevalue/osx_hawkeye_anomaly.png
  208. BIN tests/testdata/control_images/histogram_qwt5/expected_histo_gray1/expected_histo_gray1.png
  209. BIN tests/testdata/control_images/histogram_qwt5/expected_histo_gray2/expected_histo_gray2.png
  210. BIN tests/testdata/control_images/histogram_qwt5/expected_histo_gray2/expected_histo_rgb2.png
  211. BIN tests/testdata/control_images/histogram_qwt5/expected_histo_pseudo1/expected_histo_pseudo1.png
  212. BIN tests/testdata/control_images/histogram_qwt5/expected_histo_rgb1/expected_histo_rgb1.png
  213. BIN tests/testdata/control_images/histogram_qwt5/expected_histo_rgb2/expected_histo_rgb2.png
  214. BIN tests/testdata/control_images/histogram_qwt5/expected_histo_rgb3/expected_histo_rgb3.png
  215. BIN tests/testdata/control_images/histogram_qwt5/expected_histo_rgb4/expected_histo_rgb4.png
  216. BIN tests/testdata/control_images/histogram_qwt6/expected_histo_gray1/expected_histo_gray1.png
  217. BIN tests/testdata/control_images/histogram_qwt6/expected_histo_gray2/expected_histo_gray2.png
  218. BIN tests/testdata/control_images/histogram_qwt6/expected_histo_pseudo1/expected_histo_pseudo1.png
  219. BIN tests/testdata/control_images/histogram_qwt6/expected_histo_rgb1/expected_histo_rgb1.png
  220. BIN tests/testdata/control_images/histogram_qwt6/expected_histo_rgb2/expected_histo_rgb2.png
  221. BIN tests/testdata/control_images/histogram_qwt6/expected_histo_rgb3/expected_histo_rgb3.png
  222. BIN tests/testdata/control_images/histogram_qwt6/expected_histo_rgb4/expected_histo_rgb4.png
  223. +0 −164 tests/testdata/landsat.tif.aux.xml
  224. +0 −5 tests/testdata/points.vrt
  225. +0 −13 tests/testdata/tenbytenraster.asc.aux.xml
  226. BIN tests/testdata/testtar.tgz
  227. +32 −0 tests/testdata/zip/landsat_b1.qml
  228. BIN tests/testdata/{ → zip}/landsat_b1.tar
  229. BIN tests/testdata/{ → zip}/landsat_b1.tif.gz
  230. BIN tests/testdata/{ → zip}/landsat_b1.zip
  231. 0 tests/testdata/{ → zip}/points2.qml
  232. BIN tests/testdata/{ → zip}/points2.tar
  233. BIN tests/testdata/{ → zip}/points2.zip
  234. BIN tests/testdata/{ → zip}/points3.geojson.gz
  235. 0 tests/testdata/{ → zip}/points3.qml
  236. BIN tests/testdata/zip/testtar.tgz
  237. BIN tests/testdata/{ → zip}/testzip.zip
@@ -221,7 +221,8 @@ ELSE ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_M
SET (WITH_TOUCH FALSE)
ENDIF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
IF (WITH_TOUCH)
ADD_DEFINITIONS(-DHAVE_TOUCH)
# following variable is used in qgsconfig.h
SET (HAVE_TOUCH TRUE)
MESSAGE (STATUS "Touch support enabled")
ELSE (WITH_TOUCH)
MESSAGE (STATUS "Touch support disabled")
@@ -35,5 +35,7 @@

#cmakedefine HAVE_PYTHON

#cmakedefine HAVE_TOUCH

#endif

@@ -44,3 +44,4 @@ Alessandro Furieri <a.furieri at lqt.it>
Alexander Bruy <alexander.bruy@gmail.com>
Marco Bernasocchi <marco at bernawebdesign dot ch>
Nathan Woodrow <woodrow.nathan at gmail.com>
Etienne Tourigny <etourigny.dev at gmail.com>
@@ -29,9 +29,10 @@ Giuseppe Sucameli
Horst Duester
Hyao (IRC nickname)
Ivan Lucena
Jean-Denis Giguere
Jean-Denis Giguere
Jeremy Palmer
Jerrit Collord
Larry Shaffer
Luiz Motta
Magnus Homann
Marco Pasetti
@@ -53,5 +54,5 @@ Tamas Szekeres
Tom Russo
Tyler Mitchell
Vita Cizek
Yann Chemin
Yann Chemin
Includes Map icons CC-0 from SJJB Management
@@ -112,4 +112,8 @@ source directory.

%!include: osx.t2t

%!include: wcs-test-server.t2t
%!include: jenkins.t2t


%!include: iauthors.t2t

Large diffs are not rendered by default.

@@ -27,5 +27,11 @@ The following people have contributed to this document:
- Tim Sutton 2006
- Debian package section: Juergen Fischer 2008

- WCS Test Server Section
- Tim Sutton, Radim Blazek 2012

- Jenkins CI Configuration
- Tim Sutton 2012

- Latex Generator
- Tim Sutton 2011
@@ -0,0 +1,89 @@

= Setting up a Jenkins Build Server =

**Assumption:** You know how to make a working build environment and want to
deploy it under Jenkins for continuous integration testing now.

These notes are terse, I will expand on them later as the need arises. The
procedure is:

- Install Jenkins and get it configured according to your own preferences
- Make sure you have the git, github, junit etc plugins installed. A complete
list of the plugins I have installed follows (note that you almost certainly
don't need evey plugin listed here):
- External Monitor Job Type Plugin
- LDAP Plugin
- pam-auth
- javadoc
- ant
- Jenkins Subversion Plug-in
- Git Plugin
- Maven 2 Project Plugin
- Jenkins SLOCCount Plug-in
- Jenkins Sounds plugin
- Jenkins Translation Assistance plugin
- ruby-runtime
- Jenkins CVS Plug-in
- Coverage/Complexity Scatter Plot PlugIn
- Status Monitor Plugin
- Git Parameter Plug-In
- github-api
- GitHub plugin
- Jenkins Violations plugin
- git-notes Plugin
- Twitter plugin
- Jenkins Cobertura Plugin
- Jenkins Gravatar plugin
- Jenkins SSH Slaves plugin
- Create a Job called 'QGIS'
- Use the following options for your job:
- Job Name: QGIS
- Job Type: Build a free-style software project
- Tick enable project based security (you need to elsewhere configure your
Jenkins security to per project settings)
- Allow Anonymous user Read and Discover access
- Set the github project to https://github.com/qgis/Quantum-GIS/
- Set source code management to Git
- Set repository url to git://github.com/qgis/Quantum-GIS.git
- In advanced repository url settings set refspec to :

```
+refs/heads/master:refs/remotes/origin/master
```

- Set branch to build to master
- Repository Browser: Auto
- Build triggers: set to Poll SCM and set schedule to ``* * * * *`` (polls every minute)
- Build - Execute shell and set shell script to:

```
cd build
cmake ..
xvfb-run --auto-servernum --server-num=1 \
--server-args="-screen 0 1024x768x24" \
make Experimental || true
if [ -f Testing/TAG ] ; then
xsltproc ../tests/ctest2junix.xsl \
Testing/`head -n 1 < Testing/TAG`/Test.xml > \
CTestResults.xml
fi
```

- Add Junit post build action and set 'Publish Junit test result report' to:
``build/CTestResults.xml``
- Email notification: Send separate e-mails to individuals who broke the build
- Jenkins sounds - set up sounds for Failure, Success and Unstable.
- Save
-

Now open the Job dash board and push something to QGIS and wait a minute to
validate automated builds work.

**Note:** You will need to log in to the Jenkins user account and go to
/var/lib/jenkins/jobs/QGIS/workspace, then make a ``build`` directory and run
the initial cmake setup and then do test build. This process is the same as
described elsewhere in this doc.

I based some of the set up from this nice blog article here:

* http://alexott.blogspot.com/2012/03/jenkins-cmakectest.html
BIN +225 Bytes (100%) doc/qgis-download-stats.ods
Binary file not shown.
@@ -0,0 +1,114 @@


= Setting up the WCS test server on GNU/Linux =

**Requires:** Ubuntu / Debian derived distro

These notes are for Ubuntu - other versions and Debian derived distros may
require slight variations in package names.

== Preparation ==

Note the git repo below will change to the default QGIS repo once this work
is integrated into master.

git remote add blazek git://github.com/blazek/Quantum-GIS.git
git fetch blazek
git branch --track wcs2 blazek/wcs2
git checkout wcs2
cd /var/www/
sudo mkdir wcs
sudo chown timlinux wcs
cd wcs/
mkdir cgi-bin
cd cgi-bin/

== Setup mapserver ==

```sudo apt-get install cgi-mapserver```

Set the contents of cgi-bin/wcstest-1.9.0 to:

```
#! /bin/sh
MS_MAPFILE=/var/www/wcs/testdata/qgis-1.9.0/raster/wcs.map
export MS_MAPFILE
/usr/lib/cgi-bin/mapserv
```

Then do:

```
chmod +x cgi-bin/wcstest-1.9.0
mkdir -p /var/www/wcs/testdata/qgis-1.9.0/raster/
cd /var/www/wcs/testdata/qgis-1.9.0/raster/
cp -r /home/timlinux/Quantum-GIS/tests/testdata/raster/* .
```

Edit wcs.map and set the shapepath to this:

```
SHAPEPATH "/var/www/wcs/testdata/qgis-1.9.0/raster"
```

Then create /var/www/wcs/7-wcs.qgis.org.conf setting the contents to this:

```
<VirtualHost *:80>
ServerName wcs.qgis.org
ServerAdmin tim@linfiniti.com

LogLevel warn
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" \"%{forensic-id}n\"" combined
CustomLog /var/log/apache2/wcs_qgis.org/access.log combined
ErrorLog /var/log/apache2/wcs_qgis.org/error.log

DocumentRoot /var/www/wcs/html

ScriptAlias /cgi-bin/ /var/www/wcs/cgi-bin/
<Directory "/var/www/wcs/cgi-bin">
AllowOverride None
Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
Order allow,deny
Allow from all
</Directory>

RewriteEngine on
RewriteRule /1.9.0/wcs /cgi-bin/wcstest-1.9.0 [PT]

</VirtualHost>
```

== Create a home page ==

```
mkdir html
vim html/index.html
```

Set the contents to:

```
This is the test platform for QGIS' wcs client. You can use these services
from QGIS directly (to try out WCS for example) by pointing your QGIS to:
http://wcs.qgis.org/1.9.0/wcs
```


== Now deploy it ==

```
sudo mkdir /var/log/apache2/wcs_qgis.org
sudo chown www-data /var/log/apache2/wcs_qgis.org
cd /etc/apache2/sites-available/
sudo ln -s /var/www/wcs/7-wcs.qgis.org.conf .
cd /var/www/wcs/
sudo a2ensite 7-wcs.qgis.org.conf
sudo /etc/init.d/apache2 reload
```

== Debugging ==

```
sudo tail -f /var/log/apache2/wcs_qgis.org/error.log
```

0 comments on commit 73f991f

Please sign in to comment.
You can’t perform that action at this time.