Merge remote-tracking branch 'upstream/wms_new_layer_factories_clean'

Conflicts:
	eoxserver/__init__.py
	eoxserver/instance_template/project_name/templates/404.html
	eoxserver/instance_template/project_name/templates/500.html
	eoxserver/services/mapserver/wms/layers/coverage_outlines_layer_factory.py

Author: pacesm

.travis.yml

@@ -1,18 +1,19 @@
 language: python
 env:
-  - DJANGO=1.4 GDAL=1.10 DB=spatialite
-  - DJANGO=1.5 GDAL=1.10 DB=spatialite
+  - 'DJANGO="1.4.13" GDAL=1.10 DB=spatialite'
+  - 'DJANGO="1.5.8" GDAL=1.10 DB=spatialite'
   #- DJANGO=1.6 GDAL=1.10 DB=spatialite
 python:
   - "2.7"
 virtualenv:
   system_site_packages: true
 before_install:
   # adding required repo for dependencies
-  #- sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
-  - sudo apt-get update -qq
+  - sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
+  - sudo apt-get update
+  - sudo apt-get install aptitude
   # install a lot of deps from the apt-repos
-  - sudo apt-get install -qq -y gdal-bin libgdal1-dev libxml2 python-lxml python-libxml2 libproj0 libproj-dev libgeos-dev libgeos++-dev cgi-mapserver python-mapscript python-psycopg2 postgis python-gdal
+  - sudo aptitude install -y gdal-bin libgdal1-dev libxml2 python-lxml python-libxml2 libproj0 libproj-dev libgeos-dev libgeos++-dev cgi-mapserver python-mapscript python-psycopg2 postgis python-gdal
   # allowing sqlite to load extensions
   - 'if [ "$DB" == "spatialite" ]; then wget https://pypi.python.org/packages/source/p/pysqlite/pysqlite-2.6.3.tar.gz; fi'
   - 'if [ "$DB" == "spatialite" ]; then tar xzf pysqlite-2.6.3.tar.gz; fi'
@@ -25,18 +26,21 @@ before_install:
   - 'if [ "$DB" == "postgis" ]; then sudo -u postgres psql eoxserver_testing -c ''create extension postgis;''; fi'
 install:
   # test with various Django versions
-  - pip install -q Django==$DJANGO
+  - pip install Django==$DJANGO
+  - django-admin.py --version
+  # patch Django 1.4 libgeos
+  - 'if [ $DJANGO == "1.4.13" ]; then find /home/travis/virtualenv/ -name libgeos.py  -exec patch {} jenkins/geos-dev.patch \; ; fi'
   # actually install EOxServer
   - pip install --install-option="--disable-extended-reftools" .
   - export XML_CATALOG_FILES="`pwd`/schemas/catalog.xml"
   - cd autotest
   - "sed -e 's/#binary_raster_comparison_enabled=false/binary_raster_comparison_enabled=false/' -i autotest/conf/eoxserver.conf"
-  - 'echo "disabled_tests=WCS20GetCoverageReferenceableDatasetGeogCRSSubsetTestCase,WCS20GetCoverageReferenceableDatasetGeogCRSSubsetExceedsExtentTestCase,WCS20GetCoverageOutputCRSotherUoMDatasetTestCase,WCS20GetCoverageJPEG2000TestCase,WCS20DescribeEOCoverageSetIncorrectSpatialSubsetFaultTestCase,WCS10DescribeCoverageMosaicTestCase,WCS10DescribeCoverageDatasetTestCase" >> autotest/conf/eoxserver.conf'
+  - 'echo "disabled_tests=WCS20GetCoverageSubsetEPSG4326ResolutionInvalidAxisDatasetFaultTestCase,WCS20GetCoverageReferenceableDatasetGeogCRSSubsetTestCase,WCS20GetCoverageReferenceableDatasetGeogCRSSubsetExceedsExtentTestCase,WCS20GetCoverageOutputCRSotherUoMDatasetTestCase,WCS20GetCoverageJPEG2000TestCase,WCS20DescribeEOCoverageSetIncorrectSpatialSubsetFaultTestCase,WCS10DescribeCoverageMosaicTestCase,WCS10DescribeCoverageDatasetTestCase,WPS10ExecuteComplexDataTIFBase64InMemTestCase" >> autotest/conf/eoxserver.conf'
 script:
-  - python manage.py test core
-  - python manage.py test backends
-  - python manage.py test coverages
-  - python manage.py test autotest_services
+  - python manage.py test core -v2
+  - python manage.py test backends -v2
+  - python manage.py test coverages -v2
+  - python manage.py test autotest_services -v2
 notifications:
   irc:
     channels:

README.rst

@@ -1,10 +1,10 @@
 EOxServer
 ========= 
 
-.. image:: https://travis-ci.org/EOxServer/eoxserver.svg?branch=master
+.. image:: https://travis-ci.org/EOxServer/eoxserver.svg?branch=0.4
    :target: https://travis-ci.org/EOxServer/eoxserver
 
-.. image:: https://jenkins.eox.at/buildStatus/icon?job=EOxServer_master
+.. image:: https://jenkins.eox.at/buildStatus/icon?job=EOxServer_0.4
    :target: https://jenkins.eox.at/job/EOxServer_master/
 
 EOxServer is a Python application and framework for presenting Earth

autotest

@@ -27,7 +27,7 @@
 # THE SOFTWARE.
 #-------------------------------------------------------------------------------
 
-VERSION = (0, 4, None, 'dev', 2)
+VERSION = (0, 4, None, 'dev', 3)
 #VERSION = (0, 4, None, 'alpha', 1)
 #VERSION = (0, 4, None, 'beta', 1)
 #VERSION = (0, 4, None, 'rc', 1)

eoxserver/__init__.py

@@ -37,6 +37,7 @@ def validate(self, url):
             if errors occurred.
         """
 
+
 class FileStorageInterface(AbstractStorageInterface):
     """ Interface for storages that provide access to files and allow the 
         retrieval of those.
@@ -82,4 +83,3 @@ def list_contents(self, package_filename, location):
         """ Return a list of item locations under the specified location in the 
             given package.
         """
-

eoxserver/backends/interfaces.py

@@ -27,7 +27,7 @@
 #-------------------------------------------------------------------------------
 
 
-from os import path
+import os.path
 from urlparse import urlparse
 
 from eoxserver.core import Component, implements
@@ -41,4 +41,4 @@ class LocalStorage(Component):
     name = "local"
 
     def retrieve(self, url, location, path):
-        return path.join(url, location)
+        return location

eoxserver/backends/storages/local.py

@@ -32,7 +32,10 @@
 
 from django.utils.importlib import import_module
 
-from eoxserver.core.component import *
+from eoxserver.core.component import (
+    ComponentManager, ComponentMeta, Component, 
+    ExtensionPoint, UniqueExtensionPoint, implements
+)
 from eoxserver.core.util.importtools import easy_import
 
 
@@ -42,6 +45,7 @@
 __init_lock = threading.RLock()
 __is_initialized = False
 
+
 def initialize():
     """ Initialize the EOxServer plugin system by trying to import all the 
         plugins referenced by the `PLUGINS` configuration entry from the 

eoxserver/core/__init__.py

@@ -136,6 +136,8 @@ def __get__(self, decoder, decoder_class=None):
 
 
 class Concatenate(object):
+    """ Helper to concatenate the results of all sub-parameters to one.
+    """
     def __init__(self, *choices, **kwargs):
         self.choices = choices
         self.allow_errors = kwargs.get("allow_errors", True)
@@ -220,12 +222,45 @@ def __call__(self, value):
 
 
 def lower(value):
+    """ Functor to return a lower-case string.
+    """
     return value.lower()
 
-
 def upper(value):
+    """ Functor to return a upper-case string.
+    """
     return value.upper()
 
 
 def strip(value):
+    """ Functor to return a whitespace stripped string.
+    """
     return value.strip()
+
+
+class value_range(object):
+    """ Helper to assert that a given parameter is within a specified range.
+    """
+
+    def __init__(self, min, max, type=float):
+        self._min = min
+        self._max = max
+        self._type = type
+
+    def __call__(self, raw):
+        value = self._type(raw)
+        if value < self._min or value > self._max:
+            raise ValueError(
+                "Given value '%s' exceeds expected bounds (%s, %s)" 
+                % (value, self._min, self._max)
+            )
+        return value
+
+
+def boolean(raw):
+    """ Functor to convert "true"/"false" to a boolean.
+    """
+    raw = raw.lower()
+    if not raw in ("true", "false"):
+        raise ValueError("Could not parse a boolean value from '%s'." % raw)
+    return raw == "true"

eoxserver/core/decoders/__init__.py

@@ -37,11 +37,23 @@ class BaseParameter(object):
     """ Abstract base class for XML, KVP or any other kind of parameter.
     """
 
+    def __init__(self, type=None, num=1, default=None):
+        self.type = type or str
+        self.num = num
+        self.default = default
+
+
     def select(self, decoder, decoder_class=None):
         """ Interface method.
         """
         raise NotImplementedError
 
+
+    @property
+    def locator(self):
+        return ""
+
+
     def __get__(self, decoder, decoder_class=None):
         """ Property getter function.
         """

eoxserver/core/decoders/base.py

@@ -93,7 +93,7 @@ def __init__(cls, name, bases, dct):
             if isinstance(value, Option) and value.key is None:
                 value.key = key
 
-        return super(ReaderMetaclass, cls).__init__(name, bases, dct)
+        super(ReaderMetaclass, cls).__init__(name, bases, dct)
 
 
 class Reader(object):