[geoserver] 02/09: Merge tag 'upstream/2.10.1' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue May 9 11:24:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository geoserver.
commit 9dca1f44cf6b8eafdb8d1683641f8e38c8078a1f
Merge: f9e0d32 7a305cb
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Jan 5 08:45:08 2017 +0000
Merge tag 'upstream/2.10.1' into debian/master
doc/en/developer/source/conf.py | 2 +-
.../security/images/web_logout.png | Bin 0 -> 11737 bytes
.../source/programming-guide/security/index.rst | 93 ++++++
doc/en/docguide/source/conf.py | 2 +-
doc/en/themes/geoserver/layout.html | 2 +
.../themes/geoserver/static/chrome/content-bg.png | Bin 3275 -> 155 bytes
.../geoserver/static/chrome/content-left-bg.png | Bin 0 -> 1218 bytes
.../geoserver/static/chrome/content-right-bg.png | Bin 0 -> 1209 bytes
.../static/chrome/geoserver-logo-mobile.png | Bin 0 -> 8470 bytes
doc/en/themes/geoserver/static/default.css | 142 +++++++-
doc/en/user/source/community/index.rst | 1 +
.../community/oauth2/images/google_ssl_001.png | Bin 0 -> 30253 bytes
.../community/oauth2/images/google_ssl_002.png | Bin 0 -> 31007 bytes
.../community/oauth2/images/google_ssl_003.png | Bin 0 -> 39932 bytes
.../community/oauth2/images/google_ssl_004.png | Bin 0 -> 40299 bytes
.../community/oauth2/images/google_ssl_005.png | Bin 0 -> 18224 bytes
.../community/oauth2/images/google_ssl_006.png | Bin 0 -> 11629 bytes
.../community/oauth2/images/google_ssl_007.png | Bin 0 -> 18199 bytes
.../community/oauth2/images/google_ssl_008.png | Bin 0 -> 18603 bytes
.../community/oauth2/images/google_ssl_009.png | Bin 0 -> 17825 bytes
.../community/oauth2/images/google_ssl_010.png | Bin 0 -> 16614 bytes
.../community/oauth2/images/google_ssl_011.png | Bin 0 -> 16165 bytes
.../community/oauth2/images/google_ssl_012.png | Bin 0 -> 17029 bytes
.../community/oauth2/images/google_ssl_013.png | Bin 0 -> 13125 bytes
doc/en/user/source/community/oauth2/index.rst | 140 ++++++++
.../community/remote-wps/install_geoserver.rst | 82 +++--
.../source/community/remote-wps/install_python.rst | 285 +++++++++++-----
.../source/community/remote-wps/install_xmpp.rst | 6 +
.../images/layer_dimensions.png | Bin 0 -> 39178 bytes
.../community/wmts-multidimensional/index.rst | 369 +++++++++++++++++++++
.../user/source/community/wps-download/index.rst | 69 +++-
doc/en/user/source/conf.py | 2 +-
.../configuration/crshandling/coordtransforms.rst | 7 +-
.../source/configuration/demos/img/demos_SRS.png | Bin 149425 -> 55928 bytes
.../configuration/demos/img/demos_SRS_page.png | Bin 119518 -> 58322 bytes
.../demos/img/demos_reprojectionconsole.png | Bin 0 -> 19886 bytes
.../img/demos_reprojectionconsoledetails.png} | Bin
.../configuration/demos/img/demos_requests.png | Bin 114192 -> 38314 bytes
.../configuration/demos/img/demos_requests_WFS.png | Bin 122451 -> 42079 bytes
.../demos/img/demos_requests_WMS_feature.png | Bin 131547 -> 60272 bytes
.../demos/img/demos_requests_WMS_map.png | Bin 136862 -> 60817 bytes
.../demos/img/demos_requests_schema.png | Bin 304448 -> 110461 bytes
.../source/configuration/demos/img/demos_view.png | Bin 21245 -> 7894 bytes
.../configuration/demos/img/demos_viewwps.png | Bin 0 -> 8193 bytes
doc/en/user/source/configuration/demos/index.rst | 75 ++++-
doc/en/user/source/data/database/sqlserver.rst | 9 +-
.../user/source/installation/images/win_port.png | Bin 7786 -> 11234 bytes
doc/en/user/source/services/wcs/basics.rst | 2 +-
.../services/wcs/img/demos_wcsrequestbuilder.png | Bin 0 -> 8151 bytes
.../source/services/wcs/img/wcsrequestbuilder.png | Bin 0 -> 7193 bytes
.../services/wcs/img/wcsrequestbuilder_100.png | Bin 0 -> 16260 bytes
.../services/wcs/img/wcsrequestbuilder_111.png | Bin 0 -> 15293 bytes
.../services/wcs/img/wcsrequestbuilder_xml.png | Bin 0 -> 22353 bytes
doc/en/user/source/services/wcs/index.rst | 1 +
doc/en/user/source/services/wcs/requestbuilder.rst | 78 +++++
doc/en/user/source/styling/css/properties.rst | 5 +
.../styling/sld/reference/img/label_underlines.png | Bin 0 -> 69928 bytes
.../user/source/styling/sld/reference/labeling.rst | 16 +
.../styling/ysld/reference/symbolizers/text.rst | 5 +
doc/es/user/source/conf.py | 2 +-
doc/fr/user/source/conf.py | 2 +-
src/community/app-schema/pom.xml | 2 +-
src/community/app-schema/webservice-test/pom.xml | 2 +-
src/community/authkey/pom.xml | 2 +-
src/community/backup-restore/core/pom.xml | 2 +-
.../java/org/geoserver/backuprestore/Backup.java | 7 +-
.../listener/BackupJobExecutionListener.java | 15 +
.../listener/RestoreJobExecutionListener.java | 21 ++
.../geoserver/backuprestore/utils/BackupUtils.java | 62 +++-
.../backuprestore/BackupRestoreTestSupport.java | 147 ++++----
src/community/backup-restore/extension/pom.xml | 2 +-
src/community/backup-restore/pom.xml | 2 +-
src/community/backup-restore/rest/pom.xml | 2 +-
src/community/backup-restore/web/pom.xml | 2 +-
.../backuprestore/web/BackupRestoreDataPage.html | 8 +
.../backuprestore/web/BackupRestoreDataPage.java | 17 +-
.../main/resources/GeoServerApplication.properties | 2 +
src/community/colormap/pom.xml | 2 +-
src/community/dds/pom.xml | 4 +-
src/community/dem/pom.xml | 2 +-
src/community/dyndimension/pom.xml | 2 +-
src/community/feature-aggregate/pom.xml | 2 +-
src/community/gdal/gdal-wcs/pom.xml | 2 +-
src/community/gdal/gdal-wps/pom.xml | 2 +-
src/community/gdal/pom.xml | 2 +-
src/community/geofence-server/pom.xml | 4 +-
.../geofence/internal/InternalUserResolver.java | 91 ++++-
.../geofence/rest/UsersRestController.java | 41 +--
.../src/main/resources/applicationContext.xml | 4 -
.../internal/InternalUserResolverTest.java | 24 +-
src/community/geofence/pom.xml | 4 +-
.../geofence/AccessManagerConfigTest.java | 25 +-
src/community/geogig/pom.xml | 7 +-
.../geogig/geoserver/config/RepositoryManager.java | 6 +-
.../rest/GeoServerRepositoryProvider.java | 2 +-
.../geogig/geoserver/rest/GeogigDispatcher.java | 42 ++-
.../geogig/geoserver/rest/InitCommandResource.java | 33 +-
.../geogig/geoserver/rest/RepositoryResource.java | 2 +-
.../web/repository/RepositoryEditFormPanel.java | 2 +-
.../web/repository/RepositoryEditPanel.java | 1 -
.../java/org/geogig/geoserver/GeoGigTestData.java | 8 +-
.../geogig/geoserver/config/ConfigStoreTest.java | 5 +-
.../functional/GeoServerFunctionalTestContext.java | 88 ++---
.../functional/PluginWebAPICucumberHooks.java | 314 ------------------
.../functional/RunWebAPIFunctionalTest.java | 6 +-
.../geogig/geoserver/gwc/GWCIntegrationTest.java | 5 +
.../rest/GeoGigGeoServerRESTntegrationTest.java | 3 +-
.../rest/GeoGigWebAPIIntegrationTest.java | 7 +-
.../geoserver/rest/InitRequestHandlerTest.java | 63 ++--
.../store/geogig/GeoGigDataStoreEditPanelTest.java | 2 +-
.../geogig/geoserver/wfs/WFSIntegrationTest.java | 4 +-
.../wms/GeogigLayerIntegrationListenerTest.java | 2 +-
.../functional/PluginInitRepository.feature | 120 -------
.../functional/PluginListRepositories.feature | 41 ---
src/community/geomesa/pom.xml | 4 +-
src/community/geopkg/pom.xml | 2 +-
.../geopkg/GeoPackageGetMapOutputFormatTest.java | 1 -
src/community/gpxppio/pom.xml | 4 +-
src/community/gwc-distributed/pom.xml | 2 +-
src/community/gwc-s3/pom.xml | 4 +-
src/community/gwc-sqlite/pom.xml | 4 +-
src/community/hello/pom.xml | 4 +-
src/community/hello_web/pom.xml | 4 +-
src/community/hz-cluster/pom.xml | 2 +-
src/community/jdbcconfig/pom.xml | 4 +-
src/community/jdbcstore/pom.xml | 4 +-
src/community/jms-cluster/activemqBroker/pom.xml | 4 +-
src/community/jms-cluster/jms-commons/pom.xml | 4 +-
src/community/jms-cluster/jms-geoserver/pom.xml | 4 +-
.../impl/events/configuration/JMSEventType.java | 10 +
.../configuration/JMSServiceModifyEvent.java | 52 ++-
.../configuration/JMSSettingsModifyEvent.java | 47 +++
.../handlers/configuration/JMSServiceHandler.java | 52 ++-
.../handlers/configuration/JMSSettingsHandler.java | 103 ++++++
.../configuration/JMSSettingsHandlerSPI.java | 40 +++
.../cluster/server/JMSConfigurationListener.java | 150 ++++++---
.../src/main/resources/applicationContext.xml | 8 +
.../configuration/JMSServiceHandlerTest.java | 185 +++++++++++
.../configuration/JMSWorkspaceHandlerTest.java | 105 ++++++
.../handlers/configuration/JmsTestService.java | 13 +
.../configuration/JmsTestServiceLoader.java | 29 ++
.../src/test/resources/TestContext.xml | 8 +
src/community/jms-cluster/pom.xml | 4 +-
src/community/kmlppio/pom.xml | 4 +-
src/community/mbtiles/pom.xml | 2 +-
src/community/ncwms/pom.xml | 4 +-
.../geoserver/wms/ncwms/NcWmsDatasetCallback.java | 4 +
.../geoserver/wms/ncwms/NcwmsIntegrationTest.java | 40 +++
src/community/params-extractor/pom.xml | 2 +-
src/community/pgraster/pom.xml | 2 +-
src/community/pom.xml | 15 +-
src/community/programming-guide/pom.xml | 6 +-
src/community/release/ext-backup-restore.xml | 44 ++-
src/community/release/ext-geofence-server.xml | 1 -
src/community/release/ext-oauth2-github.xml | 27 ++
src/community/release/ext-wps-remote.xml | 23 +-
src/community/release/pom.xml | 7 +-
src/community/rest-ext/pom.xml | 4 +-
src/community/rest-upload/pom.xml | 4 +-
src/community/script/bsh/pom.xml | 2 +-
src/community/script/core/pom.xml | 2 +-
src/community/script/groovy/pom.xml | 11 +-
src/community/script/js/pom.xml | 2 +-
src/community/script/pom.xml | 2 +-
src/community/script/py/pom.xml | 2 +-
src/community/script/rb/pom.xml | 2 +-
src/community/script/web/pom.xml | 6 +-
src/community/security/oauth2-geonode/pom.xml | 39 ++-
.../GeoNodeOAuth2AuthenticationProvider.java | 20 +-
.../oauth2/GeoNodeOAuth2SecurityConfiguration.java | 6 +-
.../oauth2/GeoNodeOAuthAuthenticationFilter.java | 24 ++
.../oauth2/GeoNodeOAuth2AuthProviderPanelInfo.java | 5 +-
.../main/resources/GeoServerApplication.properties | 4 +-
.../src/main/resources/applicationContext.xml | 22 +-
.../org/geoserver/web/security/oauth2/geonode.png | Bin 330 -> 327 bytes
.../oauth2/OAuth2FilterConfigValidatorTest.java | 2 +-
.../security/oauth2/OAuth2RestTemplateTest.java | 71 ++++
.../security/{oauth2 => oauth2-github}/pom.xml | 88 ++---
.../oauth2/GitHubOAuth2AuthenticationProvider.java | 44 +++
.../security/oauth2/GitHubOAuth2FilterConfig.java | 250 ++++++++++++++
.../oauth2/GitHubOAuth2SecurityConfiguration.java} | 50 +--
.../oauth2/GitHubOAuthAuthenticationFilter.java | 24 ++
.../services/GitHubAccessTokenConverter.java | 74 +++++
.../oauth2/services/GitHubTokenServices.java | 98 ++++++
.../GitHubUserAuthenticationConverter.java | 49 +++
.../oauth2/GitHubOAuth2AuthProviderPanel.html | 151 +++++++++
.../oauth2/GitHubOAuth2AuthProviderPanel.java | 66 ++++
.../oauth2/GitHubOAuth2AuthProviderPanelInfo.java | 28 ++
.../main/resources/GeoServerApplication.properties | 61 ++++
.../src/main/resources/applicationContext.xml | 66 ++++
.../org/geoserver/web/security/oauth2/github.png | Bin 0 -> 563 bytes
.../oauth2/OAuth2FilterConfigValidatorTest.java | 4 +-
.../security/oauth2/OAuth2RestTemplateTest.java | 29 ++
src/community/security/oauth2-google/pom.xml | 17 +-
.../oauth2/GoogleOAuth2AuthenticationProvider.java | 20 +-
.../oauth2/GoogleOAuth2SecurityConfiguration.java | 6 +-
.../oauth2/GoogleOAuthAuthenticationFilter.java | 24 ++
.../oauth2/GoogleOAuth2AuthProviderPanelInfo.java | 6 +-
.../main/resources/GeoServerApplication.properties | 4 +-
.../src/main/resources/applicationContext.xml | 25 +-
.../oauth2/AbstractOAuth2RestTemplateTest.java | 69 ----
.../oauth2/OAuth2AccessTokenURLManglerTest.java | 61 ----
.../security/oauth2/OAuth2RestTemplateTest.java | 29 ++
src/community/security/oauth2/pom.xml | 55 ++-
.../oauth2/src/main/java/applicationContext.xml | 5 -
.../GeoServerOAuth2SecurityConfiguration.java | 2 +-
.../oauth2/GeoServerOAuthAuthenticationFilter.java | 112 +++++--
.../GeoServerOAuthAuthenticationProvider.java | 27 +-
.../oauth2/OAuth2AccessTokenURLMangler.java | 30 +-
.../main/resources/GeoServerApplication.properties | 2 +
.../oauth2/AbstractOAuth2RestTemplateTest.java | 37 +--
src/community/security/pom.xml | 12 +-
src/community/sldService/pom.xml | 10 +-
src/community/solr/pom.xml | 4 +-
src/community/spatialite/pom.xml | 8 +-
src/community/vectortiles/pom.xml | 3 +-
src/community/web-resource/pom.xml | 2 +-
src/community/wms-eo/pom.xml | 2 +-
.../wms-eo/src/main/java/applicationContext.xml | 2 +-
.../wms/eo/XMLFeatureInfoOutputFormat.java | 6 +-
src/community/wmts-multi-dimensional/pom.xml | 4 +-
src/community/wps-download/pom.xml | 4 +-
src/community/wps-jdbc/pom.xml | 2 +-
src/community/wps-remote/pom.xml | 48 +--
.../geoserver/wps/remote/RemoteProcessClient.java | 217 +++++++-----
.../geoserver/wps/remote/RemoteProcessFactory.java | 8 +-
.../geoserver/wps/remote/plugin/XMPPClient.java | 146 +++++++-
.../wps/remote/plugin/XMPPCompletedMessage.java | 7 +-
.../wps/remote/plugin/XMPPRegisterMessage.java | 2 +-
.../remote/plugin/output/XMPPRawDataOutput.java | 79 ++++-
.../wps/remote/plugin/server/XMPPBoshEndpoint.java | 275 +++++++++++++++
.../remote/plugin/server/XMPPServerEmbedded.java | 308 +++++++++++++++++
.../src/main/resources/applicationContext.xml | 81 ++++-
.../resources}/bogus_mina_tls.cert | Bin
.../remote/remote-process/remoteProcess.properties | 13 +-
.../geoserver/wps/remote/RemoteProcessTest.java | 180 +++++-----
.../wps/remote/plugin/MockRemoteClient.java | 6 +-
.../remote-process/remoteProcess.properties | 12 +-
src/community/wps-sextante/pom.xml | 2 +-
src/community/ysld/pom.xml | 4 +-
.../app-schema/app-schema-oracle-test/pom.xml | 2 +-
.../app-schema/app-schema-postgis-test/pom.xml | 2 +-
src/extension/app-schema/app-schema-test/pom.xml | 2 +-
src/extension/app-schema/pom.xml | 2 +-
.../app-schema/sample-data-access-test/pom.xml | 2 +-
src/extension/arcsde/pom.xml | 2 +-
src/extension/charts/pom.xml | 2 +-
src/extension/control-flow/pom.xml | 4 +-
src/extension/css/pom.xml | 4 +-
src/extension/csw/api/pom.xml | 2 +-
src/extension/csw/core/pom.xml | 2 +-
src/extension/csw/pom.xml | 4 +-
src/extension/csw/simple-store/pom.xml | 2 +-
src/extension/csw/web-csw/pom.xml | 4 +-
src/extension/db2/pom.xml | 2 +-
src/extension/dxf/core/pom.xml | 4 +-
src/extension/dxf/pom.xml | 4 +-
src/extension/dxf/wps/pom.xml | 4 +-
src/extension/excel/pom.xml | 2 +-
src/extension/feature-pregeneralized/pom.xml | 4 +-
src/extension/gdal/pom.xml | 2 +-
.../main/java/org/geoserver/gdal/GDALStatus.java | 12 +-
src/extension/grib/pom.xml | 2 +-
src/extension/h2/pom.xml | 2 +-
src/extension/imagemap/pom.xml | 2 +-
src/extension/imagemosaic-jdbc/pom.xml | 2 +-
src/extension/importer/bdb/pom.xml | 2 +-
src/extension/importer/core/pom.xml | 2 +-
.../org/geoserver/importer/DataStoreFormat.java | 5 +
.../importer/ImportTransformFeatureCollection.java | 150 +++++++++
.../main/java/org/geoserver/importer/Importer.java | 316 ++++++++++--------
.../org/geoserver/importer/ImporterDataTest.java | 55 ++-
src/extension/importer/pom.xml | 2 +-
src/extension/importer/rest/pom.xml | 2 +-
src/extension/importer/web/pom.xml | 2 +-
src/extension/inspire/pom.xml | 4 +-
src/extension/jp2k/pom.xml | 2 +-
src/extension/libjpeg-turbo/pom.xml | 4 +-
src/extension/monitor/core/pom.xml | 10 +-
.../geoserver/monitor/MonitorServletRequest.java | 13 +
.../monitor/MonitorServletRequestTest.java | 63 ++++
src/extension/monitor/hibernate/pom.xml | 2 +-
src/extension/monitor/pom.xml | 10 +-
src/extension/mysql/pom.xml | 2 +-
src/extension/netcdf-out/pom.xml | 2 +-
src/extension/netcdf/pom.xml | 2 +-
src/extension/ogr/ogr-core/pom.xml | 2 +-
src/extension/ogr/ogr-wfs/pom.xml | 2 +-
src/extension/ogr/ogr-wps/pom.xml | 2 +-
src/extension/ogr/pom.xml | 2 +-
src/extension/oracle/pom.xml | 2 +-
src/extension/pom.xml | 2 +-
src/extension/printing/pom.xml | 4 +-
src/extension/querylayer/pom.xml | 2 +-
src/extension/security/cas/pom.xml | 4 +-
src/extension/security/pom.xml | 4 +-
src/extension/security/web/pom.xml | 4 +-
src/extension/security/web/web-cas/pom.xml | 4 +-
src/extension/sqlserver/pom.xml | 2 +-
src/extension/teradata/pom.xml | 2 +-
src/extension/wcs2_0-eo/core/pom.xml | 2 +-
src/extension/wcs2_0-eo/pom.xml | 2 +-
src/extension/wcs2_0-eo/web/pom.xml | 2 +-
src/extension/wps/pom.xml | 2 +-
src/extension/wps/web-wps/pom.xml | 9 +-
.../org/geoserver/wps/web/ProcessStatusPage.java | 4 +-
.../geoserver/wps/web/ProcessStatusPageTest.java | 92 +++++
src/extension/wps/wps-cluster-hazelcast/pom.xml | 2 +-
src/extension/wps/wps-core/pom.xml | 2 +-
.../main/java/org/geoserver/wps/ppio/WFSPPIO.java | 2 +-
.../test/java/org/geoserver/wps/ExecuteTest.java | 53 +++
.../java/org/geoserver/wps/InputLimitsTest.java | 8 +-
.../test/java/org/geoserver/wps/MonkeyProcess.java | 2 +-
.../wps/places-FeatureCollectionLocation.xml | 37 +++
src/extension/xslt/pom.xml | 2 +-
src/gwc/pom.xml | 2 +-
.../org/geoserver/gwc/config/GWCInitializer.java | 3 -
.../gwc/layer/DefaultTileLayerCatalog.java | 5 +-
src/kml/pom.xml | 2 +-
.../decorator/PlacemarkTimeDecoratorFactory.java | 3 +
.../src/test/java/org/geoserver/kml/KMLTest.java | 10 +-
src/main/pom.xml | 2 +-
src/main/src/main/java/applicationContext.xml | 4 +
.../geoserver/GeoserverInitStartupListener.java | 6 +-
.../main/java/org/geoserver/ManifestLoader.java | 25 +-
.../geoserver/catalog/CascadeDeleteVisitor.java | 22 +-
.../geoserver/catalog/CascadeRemovalReporter.java | 8 +-
.../java/org/geoserver/catalog/LayerGroupInfo.java | 143 ++++++++
.../geoserver/catalog/impl/AdvertisedCatalog.java | 2 +-
.../org/geoserver/catalog/impl/CatalogImpl.java | 37 ++-
.../catalog/impl/DefaultCatalogFacade.java | 3 +-
.../geoserver/catalog/impl/LayerGroupInfoImpl.java | 134 +-------
.../org/geoserver/catalog/impl/ProxyUtils.java | 108 ++++--
.../org/geoserver/catalog/impl/ResolvingProxy.java | 25 +-
.../geoserver/catalog/impl/ResourceInfoImpl.java | 10 +-
.../config/CapabilitiesCacheHeadersCallback.java | 208 ++++++++++++
.../java/org/geoserver/config/GeoServerLoader.java | 12 +-
.../geoserver/config/impl/GeoServerInfoImpl.java | 3 +-
.../org/geoserver/config/impl/LoggingInfoImpl.java | 15 +-
.../geoserver/config/util/XStreamPersister.java | 74 +++--
.../security/GeoServerSecurityManager.java | 9 +
.../security/config/LogoutFilterConfig.java | 16 +
.../decorators/DecoratingLayerGroupInfo.java | 14 +-
.../security/decorators/SecuredLayerGroupInfo.java | 1 +
.../security/filter/GeoServerLogoutFilter.java | 8 +-
.../org/geoserver/catalog/template_raster.sld | 22 +-
.../org/geoserver/catalog/StyleGeneratorTest.java | 82 ++++-
.../catalog/impl/CascadeDeleteVisitorTest.java | 22 +-
.../catalog/impl/CascadeRemovalReporterTest.java | 42 ++-
.../catalog/impl/CascadeVisitorAbstractTest.java | 8 +
.../geoserver/catalog/impl/CatalogImplTest.java | 58 +++-
.../org/geoserver/config/GeoServerImplTest.java | 24 ++
src/maven/archetype/pom.xml | 2 +-
src/maven/archetype/webPlugin/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 6 +-
src/maven/archetype/wfsOutputFormat/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 6 +-
src/maven/config/pom.xml | 2 +-
src/maven/pom.xml | 2 +-
src/ows/pom.xml | 2 +-
.../main/java/org/geoserver/ows/Dispatcher.java | 32 +-
src/platform/pom.xml | 2 +-
src/pom.xml | 43 ++-
src/release/RELEASE_NOTES.txt | 10 +-
src/release/bin.xml | 18 +-
src/release/installer/mac/console/pom.xml | 2 +-
src/release/installer/win/GeoServerEXE.nsi | 23 +-
src/release/installer/win/wrapper.conf | 4 +-
src/release/pom.xml | 2 +-
src/rest/pom.xml | 2 +-
src/restconfig/pom.xml | 10 +-
.../geoserver/catalog/rest/CoverageResource.java | 5 +
.../catalog/rest/CoverageStoreResource.java | 4 +
.../geoserver/catalog/rest/DataStoreResource.java | 5 +
.../catalog/rest/FeatureTypeResource.java | 5 +
.../geoserver/catalog/rest/LayerGroupResource.java | 5 +
.../org/geoserver/catalog/rest/LayerResource.java | 4 +
.../geoserver/catalog/rest/WMSLayerResource.java | 5 +
.../geoserver/catalog/rest/WMSStoreResource.java | 5 +
.../service/rest/WCSSettingsResource.java | 20 ++
.../service/rest/WFSSettingsResource.java | 21 ++
.../service/rest/WMSSettingsResource.java | 20 ++
.../service/rest/templates/wcsSettings.ftl | 50 ++-
.../service/rest/templates/wfsSettings.ftl | 52 +--
.../service/rest/templates/wmsSettings.ftl | 60 ++--
.../org/geoserver/catalog/rest/LayerGroupTest.java | 4 +-
.../service/rest/LocalWCSSettingsTest.java | 5 +
.../service/rest/LocalWFSSettingsTest.java | 5 +
.../service/rest/LocalWMSSettingsTest.java | 5 +
.../geoserver/service/rest/WCSSettingsTest.java | 29 +-
.../geoserver/service/rest/WFSSettingsTest.java | 31 +-
.../geoserver/service/rest/WMSSettingsTest.java | 32 +-
src/security/jdbc/pom.xml | 4 +-
.../geoserver/security/jdbc/JDBCRoleService.java | 4 +-
.../geoserver/security/jdbc/JDBCTestSupport.java | 8 +-
.../org/geoserver/security/jdbc/insertroles.sql | 5 +-
.../org/geoserver/security/jdbc/rolesddl.h2.xml | 33 ++
.../org/geoserver/security/jdbc/rolesddl.mysql.xml | 33 ++
.../geoserver/security/jdbc/rolesddl.postgis.xml | 33 ++
.../org/geoserver/security/jdbc/rolesddl.xml | 33 ++
src/security/ldap/pom.xml | 4 +-
src/security/pom.xml | 4 +-
src/wcs/pom.xml | 2 +-
src/wcs1_0/pom.xml | 2 +-
.../response/LegacyServiceExceptionHandler.java | 4 +-
.../org/geoserver/wcs/DescribeCoverageTest.java | 20 +-
src/wcs1_1/pom.xml | 2 +-
src/wcs2_0/pom.xml | 2 +-
src/web/app/pom.xml | 39 ++-
src/web/core/pom.xml | 4 +-
src/web/core/src/main/java/applicationContext.xml | 23 ++
.../org/geoserver/web/GeoServerApplication.java | 17 +-
.../java/org/geoserver/web/GeoServerBasePage.html | 36 +-
.../java/org/geoserver/web/GeoServerBasePage.java | 157 +++++++--
.../java/org/geoserver/web/GeoServerLoginPage.html | 28 +-
.../org/geoserver/web/LoginFormHTMLInclude.java | 69 ++++
.../main/java/org/geoserver/web/LoginFormInfo.java | 100 ++++++
.../java/org/geoserver/web/LogoutFormInfo.java | 81 +++++
.../web/data/layergroup/LayerGroupEditPage.java | 12 +-
.../web/data/layergroup/LayerGroupEntryPanel.java | 7 +-
.../web/data/layergroup/LayerGroupListPanel.java | 13 +-
.../web/data/layergroup/LayerListPanel.java | 17 +-
.../web/data/layergroup/RootLayerEntryPanel.java | 2 +-
.../workspace/WorkspaceEditPage$SettingsPanel.html | 2 +-
.../main/resources/GeoServerApplication.properties | 3 +
.../org/geoserver/web/include_login_form.html | 6 +
.../org/geoserver/web/GeoServerBasePageTest.java | 23 +-
.../geoserver/web/GeoServerSecuredPageTest.java | 41 ++-
.../web/data/layergroup/LayerGroupBaseTest.java | 12 +
.../data/layergroup/LayerGroupEditPageTest.java | 54 +++
src/web/demo/pom.xml | 4 +-
src/web/gwc/pom.xml | 4 +-
src/web/pom.xml | 4 +-
src/web/rest/pom.xml | 4 +-
src/web/security/core/pom.xml | 4 +-
.../security/web/SecurityNamedServiceEditPage.java | 5 +-
.../web/auth/UsernamePasswordDetailsPanelTest.java | 76 +++++
src/web/security/jdbc/pom.xml | 4 +-
src/web/security/ldap/pom.xml | 4 +-
src/web/security/pom.xml | 4 +-
src/web/wcs/pom.xml | 4 +-
src/web/wfs/pom.xml | 4 +-
src/web/wms/pom.xml | 4 +-
.../geoserver/wms/web/data/AbstractStylePage.java | 47 ++-
.../geoserver/wms/web/data/StyleAdminPanel.java | 2 -
.../wms/web/data/StyleEditPageNoLayersTest.java | 73 ++++
.../geoserver/wms/web/data/StyleEditPageTest.java | 12 +
src/wfs/pom.xml | 2 +-
.../wfs/response/WfsExceptionHandler.java | 4 +-
.../vfny/geoserver/wfs/servlets/TestWfsPost.java | 36 ++
.../org/geoserver/wfs/DescribeFeatureTest.java | 140 ++++----
.../org/geoserver/wfs/GetCapabilitiesTest.java | 99 +++++-
.../java/org/geoserver/wfs/TransactionTest.java | 23 ++
.../geoserver/wfs/servlets/TestWfsPostTest.java | 38 ---
.../geoserver/wfs/servlets/TestWfsPostTest.java | 96 ++++++
src/wms/pom.xml | 2 +-
src/wms/src/main/java/applicationContext.xml | 4 +-
.../java/org/geoserver/wms/WMSXStreamLoader.java | 9 +-
.../featureinfo/GML3FeatureInfoOutputFormat.java | 45 +--
.../featureinfo/XML311FeatureInfoOutputFormat.java | 10 +-
.../test/java/org/geoserver/wms/WMSMockData.java | 2 +
.../geoserver/wms/wms_1_1_1/CapabilitiesTest.java | 42 ++-
.../wms/wms_1_1_1/LayerGroupWorkspaceTest.java | 6 +-
.../wms/wms_1_3/CapabilitiesIntegrationTest.java | 46 ++-
.../wms/wms_1_3/GetFeatureInfoIntegrationTest.java | 21 ++
.../wms/wms_1_3/LayerGroupWorkspaceTest.java | 7 +-
466 files changed, 8916 insertions(+), 2611 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/geoserver.git
More information about the debian-science-commits
mailing list