Review fixes

doc/en/user/source/data/webadmin/layers.rst

@@ -216,6 +216,24 @@ Cache parameters that apply to the HTTP response from client requests.
 
 * **Response Cache Headers**— If selected, GeoServer will not request the same tile twice within the time specified in :guilabel:`Cache Time`. One hour measured in seconds (3600), is the default value for :guilabel:`Cache Time`.
 
+Services Settings
+^^^^^^^^^^^^^^^^^
+
+Sets services configuration on layer level.
+
+  .. figure:: img/service_enable_layer.png
+
+     Services Settings
+
+* **Selectively enable services for layer**—Activate/deactivate service enable/disable configuration for the layer.
+* **Enabled Services**—Selects enabled services list for this layer.
+* **Disabled Services**—Selects disabled services list for this layer.
+
+  .. note::
+
+     It is also possible to set by-default disabled services to all layers using the ``org.geoserver.service.disabled`` system/env/servlet context variable.  This variable accepts a comma separated list of services that should be disabled by default, in case the resource in question has no explicit configuration.
+
+
 WMS Settings
 ^^^^^^^^^^^^
 

src/extension/csw/core/src/main/java/applicationContext.xml

@@ -246,6 +246,4 @@
     <bean id="zipResponse" class="org.geoserver.csw.response.ZipOutputFormat" />
 
     <bean id="DirectDownloadXStreamInitializer" class="org.geoserver.csw.DirectDownloadSettingsXStreamInitializer" />
-
-    <bean id="cswResourceVoter" class="org.geoserver.csw.CSWResourceVoter" />
  </beans>

src/extension/wps/wps-core/src/main/java/applicationContext.xml

@@ -322,6 +322,4 @@
     <bean id="rawDataSizeEstimator" class="org.geoserver.wps.validator.RawDataSizeEstimator"/>
     <bean id="geometrySizeEstimator" class="org.geoserver.wps.validator.GeometrySizeEstimator"/>
     <bean id="processStartupFilter" class="org.geoserver.wps.executor.ProcessStartupFilter"/>
-
-    <bean id="wpsResourceVoter" class="org.geoserver.wps.WPSResourceVoter"/>
 </beans>

src/gwc/src/main/java/org/geoserver/gwc/wmts/GWCResourceServiceVoter.java

@@ -0,0 +1,17 @@
+package org.geoserver.gwc.wmts;
+
+import org.geoserver.catalog.ResourceInfo;
+import org.geoserver.catalog.ServiceResourceVoter;
+
+public class GWCResourceServiceVoter implements ServiceResourceVoter {
+
+    @Override
+    public boolean hideService(String service, ResourceInfo resource) {
+        // on WMTS service request hide service from list, because it isn't useful for Service
+        // disable GUI
+        if ("WMTS".equalsIgnoreCase(service)) {
+            return true;
+        }
+        return false;
+    }
+}