Revert "Merge branch 'master' of https://github.com/geoserver/geoserver"

This reverts commit 9e78934, reversing changes made to 4898d51.
geoserver · Jul 29, 2016 · 0e6d51a · 0e6d51a
1 parent 9e78934
commit 0e6d51a
Show file tree

Hide file tree

Showing 199 changed files with 545 additions and 13,461 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,6 @@ cache:
   directories:
     - "$HOME/.m2"
 language: java
-before_install:
-  - rm ~/.m2/settings.xml
 before_script:
   - cd src
 script:

diff --git a/doc/en/developer/source/tools.rst b/doc/en/developer/source/tools.rst
@@ -9,7 +9,7 @@ environment can be set up.
 Java
 ----
 
-Developing with GeoServer requires a Java Development Kit (JDK), version 8 or greater, available from `Oracle <http://www.oracle.com/technetwork/java/javase/downloads/>`_ or `OpenJDK <http://openjdk.java.net>`_
+Developing with GeoServer requires a Java Development Kit (JDK) 8 or greater, available from `Oracle <http://www.oracle.com/technetwork/java/javase/downloads/>`_ or `OpenJDK <http://openjdk.java.net>`_
 
 Maven
 -----

diff --git a/doc/en/user/source/community/geofence-server/installing.rst b/doc/en/user/source/community/geofence-server/installing.rst
@@ -8,5 +8,3 @@ Installing the GeoServer GeoFence Server extension
     .. warning:: Make sure to match the version of the extension to the version of the GeoServer instance!
 
  #. Extract the contents of the archive into the ``WEB-INF/lib`` directory of the GeoServer installation.
-
-    .. warning:: By default GeoFence will store his data in a `H2 database <http://www.h2database.com/html/main.html>`_ and the database schema will be automatically managed by Hibernate. `GeoFence documentation <https://github.com/geoserver/geofence/wiki/GeoFence-configuration>`_ explains how to configure a different backed database and configure Hibernate behavior.
diff --git a/doc/en/user/source/data/app-schema/cql-functions.rst b/doc/en/user/source/data/app-schema/cql-functions.rst
@@ -93,10 +93,10 @@ The properties file serves as a lookup table to the function. It has no header,
 
 **Syntax**::
 
-  Vocab(COLUMN_NAME, properties file)
+  Vocab(COLUMN_NAME, properties file URI)
 
 * **COLUMN_NAME**: column name to get values from
-* **properties file**: absolute path of the properties file
+* **properties file URI**: absolute path of the properties file or relative to the mapping file location
 
 **Example:**
 
@@ -111,14 +111,12 @@ Mapping file::
   <AttributeMapping>
     <targetAttribute>gml:name</targetAttribute>
     <sourceExpression>
-        <OCQL>Vocab(ABBREVIATION, strconcat('${config.parent}', '/mapping.properties'))</OCQL>
+        <OCQL>Vocab(ABBREVIATION, '/test-data/mapping.properties')</OCQL>
     </sourceExpression>
   </AttributeMapping>
 
 The above example will map **gml:name** to *urn:cgi:classifier:CGI:SimpleLithology:2008:gravel* if ABBREVIATION value is *1GRAV*.
 
-This example uses the ``config.parent`` predefined interpolation property to specify a vocabulary properties file in the same directory as the mapping file. See :ref:`app-schema.property-interpolation` for details.
-
 
 Geometry creation
 -----------------

diff --git a/doc/en/user/source/data/app-schema/property-interpolation.rst b/doc/en/user/source/data/app-schema/property-interpolation.rst
@@ -16,14 +16,6 @@ Defining properties
 * System properties override properties defined in a configuration file, so if you define ``-Dsome.property`` at the java command line, it will override a value specified in the ``app-schema.properties`` file. This is intended for debugging, so you can set a property file in an Eclipse launch configuration, but override some of the properties contained in the file by setting them explicitly as system properties.
 * All system properties are available for interpolation in mapping files.
 
-Predefined properties
----------------------
-
-If not set elsewhere, the following properties are set for each mapping file:
-
-* ``config.file`` is set to the name of the mapping file
-* ``config.parent`` is set to the name of the directory containing the mapping file
-
 Using properties
 ----------------
 

diff --git a/doc/en/user/source/filter/ecql_reference.rst b/doc/en/user/source/filter/ecql_reference.rst
@@ -156,6 +156,10 @@ OGC `Simple Features for SQL <http://www.opengeospatial.org/standards/sfs>`_ spe
        The optional *CRS* is a string containing an SRS code
        (For example, ``'EPSG:1234'``.  
        The default is to use the CRS of the queried layer)
+   * - ``BBOX (`` :ref:`ecql_expr` ``,`` :ref:`ecql_expr` **|** :ref:`Geometry <ecql_literal>` ``)``
+     - Tests whether a geometry intersects a bounding box 
+       specified by a geometric value computed by a function
+       or provided by a geometry literal.
 
 
 .. _ecql_expr:

diff --git a/doc/en/user/source/index.rst b/doc/en/user/source/index.rst
@@ -1,6 +1,5 @@
-#####################
 GeoServer User Manual
-#####################
+=====================
 
 GeoServer is an open source software server written in Java that allows users to share and edit geospatial data. Designed for interoperability, it publishes data from any major spatial data source using open standards.
 

diff --git a/doc/en/user/source/production/java.rst b/doc/en/user/source/production/java.rst
@@ -48,13 +48,11 @@ Native JAI and ImageIO extensions are available for:
 | Max OSX  |           |           |  
 +----------+-----------+-----------+
 
-.. warning:: A system installations of JAI and ImageIO may conflict with the pure java copy of JAI and ImageIO included in your GeoServer ``WEB-INF/lib`` folder - producing "class cast exceptions" preventing your application server from starting GeoServer.
+.. warning:: When installed as a "java extension" JAI and JAI ImageIO are unpacked into your JRE as both native code (in ``bin``) and jars (in ``ext/libs``). This installation may conflict with the pure java copy of JAI and ImageIO included in your GeoServer ``WEB-INF/lib`` folder - producing "class cast exceptions" preventing your application server from starting GeoServer.
-
+
-    * When installed as a "java extension" JAI and JAI ImageIO are unpacked into your JRE as both native code (in ``bin``) and jars (in ``ext/libs``). If you encounter this problem after installation of native the JAI and ImageIO extensions remove the pure java implementation from your GeoServer instances ``WEB-INF/lib`` folder::
+   If you encounter this problem after installation of native the JAI and ImageIO extensions remove the pure java implementation from your GeoServer instances ``WEB-INF/lib`` folder::
-        
+       
-        rm jai_core-*jar jai_imageio-*.jar jai_codec-*.jar
+       rm jai_core-*jar jai_imageio-*.jar jai_codec-*.jar
-
-    * On OSX jars may be installed in ``~/Library/Java/Extensions``, we advise removing these jars if present as they are no longer maintained by Apple.
    
 .. note:: Native ImageIO encoding may not always be the best choice, we recommend the built-in :ref:`PNGJ based encoder <JAI>` and :ref:`community_libjpeg-turbo` for png8 and jpeg encoding performance.
 

diff --git a/doc/en/user/source/security/webadmin/auth.rst b/doc/en/user/source/security/webadmin/auth.rst
@@ -4,9 +4,21 @@ Authentication
 ==============
 
 This page manages the authentication options, including authentication providers and the authentication chain.
+
+Anonymous authentication
+------------------------
+
+By default, GeoServer will allow anonymous access to the :ref:`web_admin`. Without authentication, users will still be able to view the :ref:`layerpreview`, capabilities documents, and basic GeoServer details. Anonymous access can be disabled by clearing the :guilabel:`Allow anonymous authentication` check box. Anonymous users navigating to the GeoServer page will get an HTTP 401 status code, which typically results in a browser-based request for credentials.
+
+.. note:: Read more about :ref:`security_auth_webadmin`.
+
+.. figure:: images/auth_anonymous.png
+   :align: center
+
+   *Anonymous authentication checkbox*
 
 Authentication filters
-----------------------
+------------------------
 
 This section manages the Authentication Filters (adding, removing, and editing). Several authentication filters are configured by default (anonymous, basic, form, rememberme), but others can be added to the list.
 
@@ -15,14 +27,8 @@ This section manages the Authentication Filters (adding, removing, and editing).
 
    *List of authentication filters*
 
-Anonymous access
+Credentials From Headers Filter
-~~~~~~~~~~~~~~~~
-
-By default, GeoServer will allow anonymous access to the :ref:`web_admin`. Without authentication, users will still be able to view the :ref:`layerpreview`, capabilities documents, and basic GeoServer details. Anonymous access can by removing the :guilabel:`anonymous` authentication filter. If removed, anonymous users navigating to the GeoServer page will get an HTTP 401 status code, which typically results in a browser-based request for credentials.
-
-Credentials From Headers filter
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 This filter allows gathering user credentials (username and password) from request headers in a flexible and configurable way.
 
 .. figure:: images/auth_filter_credentials_from_header.png

diff --git a/doc/en/user/source/security/webadmin/images/auth_anonymous.png b/doc/en/user/source/security/webadmin/images/auth_anonymous.png
diff --git a/src/community/backup-restore/core/pom.xml b/src/community/backup-restore/core/pom.xml