From 40725e47c082681c8af10d786ce6c9e3b964150e Mon Sep 17 00:00:00 2001 From: Francesco Bartoli Date: Fri, 2 Dec 2016 15:21:07 +0100 Subject: [PATCH] Revert "Reverting the last commit which messed the build" This reverts commit d7c0870fdf91e2826e9e78273d15ef3409c296a9, reversing changes made to 66653c0c501126f16d680a49f99ea8499e3441f5. --- pom.xml | 1717 ++++++++--------- .../resources/GeoServerApplication.properties | 10 +- src/main/resources/applicationContext.xml | 286 ++- src/main/webapp/WEB-INF/web.xml | 5 - src/main/webapp/data/global.xml | 12 +- src/main/webapp/data/gwc-gs.xml | 32 +- src/main/webapp/data/logging.xml | 4 +- src/main/webapp/data/security/config.xml | 17 +- .../security/filter/formLogout/config.xml | 1 - .../webapp/data/security/layers.properties | 13 +- .../data/security/usergroup/default/users.xml | 10 +- 11 files changed, 1005 insertions(+), 1102 deletions(-) diff --git a/pom.xml b/pom.xml index fecbbbe..ee17bc3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,880 +1,841 @@ - 4.0.0 - org.opengeo - geonode-geoserver-ext - jar - 2.9-SNAPSHOT - GeoNode GeoServer Extensions - - - - opengeo - OpenGeo Maven Repository - dav:http://repo.opengeo.org - false - - - opengeo - OpenGeo Maven Repository - dav:http://repo.opengeo.org - false - - - - - - - geosolutions - geosolutions repository - http://maven.geo-solutions.it/ - - true - - - true - - - - - boundless - Boundless Maven Repository - https://repo.boundlessgeo.com/main/ - - - - - true - - - true - - - - - osgeo - Open Source Geospatial Foundation Repository - http://download.osgeo.org/webdav/geotools/ - - - - - maven-restlet - Restlet Maven Repository - http://maven.restlet.org - - false - - - - - org.mapfish - http://dev.mapfish.org/maven/repository - - - - - - - org.geoserver - gs-main - ${geoserver.version} - - - - org.geoserver - gs-platform - ${geoserver.version} - - - - org.geoserver - gs-rest - ${geoserver.version} - - - - org.geoserver.web - gs-web-sec-core - ${geoserver.version} - - - - org.geoserver.extension - gs-printing - ${geoserver.version} - - - xerces - xercesImpl - - - - - org.geoserver - gs-restconfig - ${geoserver.version} - - - org.geoserver.extension - gs-web-wps - ${geoserver.version} - - - xerces - xercesImpl - 2.11.0 - - - org.geoserver.extension - gs-excel - ${geoserver.version} - - - - org.geoserver.web - gs-web-app - jar - ${geoserver.version} - runtime - - - net.sf.json-lib - json-lib - - - - - - org.geoserver.importer - gs-importer-core - ${geoserver.version} - runtime - - - - org.geoserver.importer - gs-importer-web - ${geoserver.version} - runtime - - - - org.geoserver.importer - gs-importer-rest - ${geoserver.version} - runtime - - - - - org.geoserver.extension - gs-wps-core - ${geoserver.version} - runtime - - - - org.geotools.xsd - gt-xsd-kml - ${geotools.version} - - - - org.opengeo.geoserver - printng - - 2.9.0 - runtime - - - - org.geotools - gt-metadata - ${geotools.version} - - - - com.google.guava - guava - 17.0 - - - - - net.sf.json-lib - json-lib - 2.2.3 - jdk15 - - - - - org.geotools - gt-process - ${geotools.version} - - - - - org.geoserver.community.backuprestore - gs-backup-restore-core - ${geoserver.version} - - - org.geoserver.community.backuprestore - gs-backup-restore-extension - ${geoserver.version} - - - org.geoserver.community.backuprestore - gs-backup-restore-rest - ${geoserver.version} - - - org.geoserver.community.backuprestore - gs-backup-restore-web - ${geoserver.version} - - - - - org.geoserver.community - gs-sec-oauth2-geonode - ${geoserver.version} - - - - - org.geoserver.community - gs-authkey - ${geoserver.version} - - - - - org.geoserver.community - gs-geofence-server - ${geoserver.version} - - - org.apache.logging.log4j - log4j-slf4j-impl - - - - - - org.hibernate - hibernate-entitymanager - ${hibernate-version} - - - org.hibernate - hibernate-core - ${hibernate-version} - - - org.hibernatespatial - hibernate-spatial - ${hibernate-spatial-version} - - - - org.hibernatespatial - hibernate-spatial-h2-geodb - ${hibernate-spatial-h2-version} - - - - cglib - cglib-nodep - ${cglib.version} - - - cglib - cglib - ${cglib.version} - test - - - asm - asm - ${asm.version} - test - - - - - org.geoserver.community - gs-geogig - ${geoserver.version} - - - - - org.geotools.jdbc - gt-jdbc-spatialite - ${geotools.version} - - - - org.geotools - gt-geopkg - ${geotools.version} - - - - org.geotools - gt-shapefile - ${geotools.version} - - - org.geotools - gt-jdbc - ${geotools.version} - - - org.geotools.jdbc - gt-jdbc-postgis - ${geotools.version} - - - - org.geoserver.extension - gs-h2 - ${geoserver.version} - - - - - junit - junit - 4.11 - test - - - org.geoserver - gs-main - test - tests - ${geoserver.version} - - - org.geoserver.web - gs-web-core - test - tests - ${geoserver.version} - - - com.mockrunner - mockrunner - 0.3.1 - test - - - org.geotools - gt-sample-data - ${geotools.version} - test - - - xmlunit - xmlunit - 1.3 - test - - - org.easymock - easymock - 2.5.2 - test - - - - - commons-beanutils - commons-beanutils - 1.7.0 - - - commons-digester - commons-digester - 1.7 - - - commons-fileupload - commons-fileupload - 1.2.1 - - - commons-io - commons-io - 2.1 - - - commons-codec - commons-codec - 1.9 - - - commons-httpclient - commons-httpclient - 3.1 - - - commons-lang - commons-lang - 2.6 - - - commons-validator - commons-validator - 1.1.4 - - - commons-logging - commons-logging - 1.1.1 - - - commons-pool - commons-pool - 1.5.4 - - - commons-collections - commons-collections - 3.2.2 - - - commons-dbcp - commons-dbcp - 1.4 - - - org.apache.commons - commons-vfs2 - 2.0 - - - org.apache.commons - commons-exec - 1.3 - - - - org.springframework - spring-test - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-jms - ${spring.version} - - - org.springframework - spring-oxm - 3.0.5.RELEASE - - - org.springframework.security - spring-security-core - ${spring.security.version} - - - org.springframework.security - spring-security-ldap - ${spring.security.version} - - - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty - jetty-jndi - ${jetty.version} - - - org.eclipse.jetty - jetty-plus - ${jetty.version} - - - org.eclipse.jetty - jetty-util - ${jetty.version} - - - tomcat - jasper-compiler-jdt - 5.5.15 - - - tomcat - jasper-compiler - 5.5.15 - - - tomcat - jasper-runtime - 5.5.15 - - - - - 3.6.0.Final - 1.1.0 - 1.1.1 - 1.1.1 - 2.2 - 3.1 - 15-SNAPSHOT - 2.9-SNAPSHOT - 4.2.5.RELEASE - 4.0.4.RELEASE - 9.2.13.v20150730 - true - - - - - arcsde - - - org.geoserver.extension - arcsde - ${geoserver.version} - - - - - sdeLibs - - - com.esri - jsde_sdk - ${sde.version} - - - com.esri - jpe_sdk - ${sde.version} - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - true - UTF-8 - ${fork.javac} - ${javac.maxHeapSize} - - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.6 - - UTF-8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.3 - - -XX:MaxPermSize=256m - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.3 - - - assembly.xml - data.xml - - - - - package - - single - - - - - - - org.apache.maven.plugins - maven-war-plugin - - geoserver - ${project.build.directory}/geoserver - **/data/ - **/gs-web-app*.jar - - - - package - - war - - - - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - clean - - - - - - - - maven-eclipse-plugin - 2.4 - - - - org.springframework.ide.eclipse.core.springnature - - - - - - maven-jar-plugin - 2.4 - - - package - - test-jar - - - - - - - true - true - - - core - ${project.build.finalname} - ${project.version} - ${iteration} - ${maven.build.timestamp} - ${build.commit.id} - - - - - - - true - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - true - - - - attach-sources - - jar-no-fork - test-jar-no-fork - - - - - - - - pl.project13.maven - git-commit-id-plugin - 2.1.15 - - - - revision - - - - - build - false - false - false - true - true - - ${git.commit.useNative} - - - - - - - - maven-javadoc-plugin - 2.10.3 - - 1.8 - false - all - true - 256M - UTF-8 - - -Xdoclint:none - true - - - generated - tfmc - GENERATED: - - - todo - tfmc - TODO: - - - task - tfmc - TODO: - - - revisit - tfmc - TODO: - - - source - Xt - Source: - - - tutorial - Xt - Tutorial: - - - - - http://docs.oracle.com/javase/8/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://jscience.org/api/ - http://tsusiatsoftware.net/jts/javadoc - http://docs.geotools.org/latest/javadocs/ - http://xmlgraphics.apache.org/batik/javadoc - http://freemarker.sourceforge.net/docs/api/ - https://ci.apache.org/projects/wicket/apidocs/7.x/ - - - - - - - - - org.apache.maven.wagon - wagon-webdav - 1.0-beta-2 - - - - + 4.0.0 + org.opengeo + geonode-geoserver-ext + jar + 2.9-SNAPSHOT + GeoNode GeoServer Extensions + + + + opengeo + OpenGeo Maven Repository + dav:http://repo.opengeo.org + false + + + opengeo + OpenGeo Maven Repository + dav:http://repo.opengeo.org + false + + + + + + + geosolutions + geosolutions repository + http://maven.geo-solutions.it/ + + true + + + true + + + + + boundless + Boundless Maven Repository + https://repo.boundlessgeo.com/main/ + + + + + true + + + true + + + + + osgeo + Open Source Geospatial Foundation Repository + http://download.osgeo.org/webdav/geotools/ + + + + + maven-restlet + Restlet Maven Repository + http://maven.restlet.org + + false + + + + + org.mapfish + http://dev.mapfish.org/maven/repository + + + + + + + + + org.geoserver + gs-rest + ${geoserver.version} + + + org.geoserver.web + gs-web-sec-core + ${geoserver.version} + + + + + + org.geoserver.extension + gs-printing + ${geoserver.version} + + + xerces + xercesImpl + + + + + org.geoserver + gs-restconfig + ${geoserver.version} + + + org.geoserver.extension + gs-web-wps + ${geoserver.version} + + + xerces + xercesImpl + 2.11.0 + + + org.geoserver.extension + gs-excel + ${geoserver.version} + + + + + org.geoserver.web + gs-web-app + jar + ${geoserver.version} + runtime + + + net.sf.json-lib + json-lib + + + + + + org.geoserver.importer + gs-importer-core + ${geoserver.version} + runtime + + + org.geoserver.importer + gs-importer-web + ${geoserver.version} + runtime + + + + org.geoserver.importer + gs-importer-rest + ${geoserver.version} + runtime + + + + + org.geoserver.extension + gs-wps-core + ${geoserver.version} + runtime + + + + org.geotools.xsd + gt-xsd-kml + ${geotools.version} + + + + org.opengeo.geoserver + printng + + 2.9.0 + runtime + + + + org.geotools + gt-metadata + ${geotools.version} + + + + com.google.guava + guava + 17.0 + + + + + net.sf.json-lib + json-lib + 2.2.3 + jdk15 + + + + + org.geotools + gt-process + ${geotools.version} + + + + + org.geoserver.community.backuprestore + gs-backup-restore-core + ${geoserver.version} + + + org.geoserver.community.backuprestore + gs-backup-restore-extension + ${geoserver.version} + + + org.geoserver.community.backuprestore + gs-backup-restore-rest + ${geoserver.version} + + + org.geoserver.community.backuprestore + gs-backup-restore-web + ${geoserver.version} + + + + + + org.geoserver.community + gs-geogig + ${geoserver.version} + + + + + org.geotools.jdbc + gt-jdbc-spatialite + ${geotools.version} + + + + org.geotools + gt-geopkg + ${geotools.version} + + + + org.geotools + gt-shapefile + ${geotools.version} + + + org.geotools + gt-jdbc + ${geotools.version} + + + org.geotools.jdbc + gt-jdbc-postgis + ${geotools.version} + + + org.geoserver.extension + gs-h2 + ${project.version} + + + + + junit + junit + 4.11 + test + + + org.geoserver + gs-main + test + tests + ${geoserver.version} + + + org.geoserver.web + gs-web-core + test + tests + ${geoserver.version} + + + com.mockrunner + mockrunner + 0.3.1 + test + + + org.geotools + gt-sample-data + ${geotools.version} + test + + + xmlunit + xmlunit + 1.3 + test + + + org.easymock + easymock + 3.1 + + + org.easymock + easymockclassextension + 2.5.2 + + + + commons-beanutils + commons-beanutils + 1.7.0 + + + commons-digester + commons-digester + 1.7 + + + commons-fileupload + commons-fileupload + 1.2.1 + + + commons-io + commons-io + 2.1 + + + commons-codec + commons-codec + 1.9 + + + commons-httpclient + commons-httpclient + 3.1 + + + commons-lang + commons-lang + 2.6 + + + commons-validator + commons-validator + 1.1.4 + + + commons-logging + commons-logging + 1.1.1 + + + commons-pool + commons-pool + 1.5.4 + + + commons-collections + commons-collections + 3.2.2 + + + commons-dbcp + commons-dbcp + 1.4 + + + org.apache.commons + commons-vfs2 + 2.0 + + + org.apache.commons + commons-exec + 1.3 + + + + org.springframework + spring-test + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + + + org.springframework + spring-expression + ${spring.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + + + org.springframework + spring-jdbc + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-jms + ${spring.version} + + + org.springframework + spring-oxm + 3.0.5.RELEASE + + + org.springframework.security + spring-security-core + ${spring.security.version} + + + org.springframework.security + spring-security-ldap + ${spring.security.version} + + + + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-jndi + ${jetty.version} + + + org.eclipse.jetty + jetty-plus + ${jetty.version} + + + org.eclipse.jetty + jetty-util + ${jetty.version} + + + tomcat + jasper-compiler-jdt + 5.5.15 + + + tomcat + jasper-compiler + 5.5.15 + + + tomcat + jasper-runtime + 5.5.15 + + + + + 15-SNAPSHOT + 2.9-SNAPSHOT + 4.2.5.RELEASE + 4.0.4.RELEASE + 9.2.13.v20150730 + true + + + + + arcsde + + + org.geoserver.extension + arcsde + ${geoserver.version} + + + + + sdeLibs + + + com.esri + jsde_sdk + ${sde.version} + + + com.esri + jpe_sdk + ${sde.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.8 + 1.8 + true + UTF-8 + ${fork.javac} + ${javac.maxHeapSize} + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.6 + + UTF-8 + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12.3 + + -XX:MaxPermSize=256m + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.3 + + + assembly.xml + data.xml + + + + + package + + single + + + + + + + org.apache.maven.plugins + maven-war-plugin + + geoserver + ${project.build.directory}/geoserver + **/data/ + **/gs-web-app*.jar + + + + package + + war + + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + + + + clean + + + + + + + + maven-eclipse-plugin + 2.4 + + + + org.springframework.ide.eclipse.core.springnature + + + + + + maven-jar-plugin + 2.4 + + + package + + test-jar + + + + + + + true + true + + + core + ${project.build.finalname} + ${project.version} + ${iteration} + ${maven.build.timestamp} + ${build.commit.id} + + + + + + + true + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + true + + + + attach-sources + + jar-no-fork + test-jar-no-fork + + + + + + + + pl.project13.maven + git-commit-id-plugin + 2.1.15 + + + + revision + + + + + build + false + false + false + true + true + + ${git.commit.useNative} + + + + + + + + maven-javadoc-plugin + 2.10.3 + + 1.8 + false + all + true + 256M + UTF-8 + + -Xdoclint:none + true + + + generated + tfmc + GENERATED: + + + todo + tfmc + TODO: + + + task + tfmc + TODO: + + + revisit + tfmc + TODO: + + + source + Xt + Source: + + + tutorial + Xt + Tutorial: + + + + + http://docs.oracle.com/javase/8/docs/api/ + http://docs.oracle.com/javaee/7/api/ + http://jscience.org/api/ + http://tsusiatsoftware.net/jts/javadoc + http://docs.geotools.org/latest/javadocs/ + http://xmlgraphics.apache.org/batik/javadoc + http://freemarker.sourceforge.net/docs/api/ + https://ci.apache.org/projects/wicket/apidocs/7.x/ + + + + + + + + + org.apache.maven.wagon + wagon-webdav + 1.0-beta-2 + + + + diff --git a/src/main/resources/GeoServerApplication.properties b/src/main/resources/GeoServerApplication.properties index 538e10f..d836687 100644 --- a/src/main/resources/GeoServerApplication.properties +++ b/src/main/resources/GeoServerApplication.properties @@ -1,8 +1,11 @@ +GeoNodeAuthProviderPanel.geonodeSettings=GeoNode Security Settings +GeoNodeAuthFilterPanel.noFilterSettings=There are no user-configurable options for the GeoNode Authentication Filter +GeoNodeAnonymousAuthFilterPanel.noFilterSettings=There are no user-configurable options for the GeoNode Authentication Filter + GeoNodeAuthProviderPanel.short=GeoNode GeoNodeAuthProviderPanel.title=GeoNode Authentication Provider GeoNodeAuthProviderPanel.description=Authentication via Connection to GeoNode Frontend GeoNodeAuthProviderPanel.geonodeBaseUrl=Frontend Site Base URL -GeoNodeAuthProviderPanel.geonodeSettings=GeoNode Filter Settings GeoNodeAuthFilterPanel.short=GeoNode Cookies GeoNodeAuthFilterPanel.title=GeoNode Cookie Handler @@ -10,7 +13,4 @@ GeoNodeAuthFilterPanel.description=Respect Django session cookies in GeoServer GeoNodeAnonymousAuthFilterPanel.short=GeoNode Anonymous GeoNodeAnonymousAuthFilterPanel.title=GeoNode Anonymous authentication handler -GeoNodeAnonymousAuthFilterPanel.description=Required for GeoServer to honor GeoNode security settings for anonymous users -GeoNodeAnonymousAuthFilterPanel.noFilterSettings=There are no user-configurable options for the GeoNode Authentication Filter - -GeoNodeAuthFilterPanel.noFilterSettings=There are no user-configurable options for the GeoNode Authentication Filter \ No newline at end of file +GeoNodeAnonymousAuthFilterPanel.description=Required for GeoServer to honor GeoNode security settings for anonymous users \ No newline at end of file diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml index d8f1532..134eca9 100644 --- a/src/main/resources/applicationContext.xml +++ b/src/main/resources/applicationContext.xml @@ -1,167 +1,133 @@ - - - - - - - - - - /process/batchDownload/launch - - downloadLauncherRestlet - - - - /process/batchDownload/status - - downloadStatusRestlet - - - - /process/batchDownload/download - - downloadReadyRestlet - - - - /process/batchDownload/kill - - downloadKillerRestlet - - - - + - - ThreadFactory allowing for customizing the created - threads (name, priority, etc) - - - Thread priority, value from 1 to 10, defaults to 5, - meaning java.lang.Thread#NORM_PRIORITY - 5 - - - Specify executor threads to be daemon threads so that - they shutdown when the application does - true - - + + + + + + + /process/batchDownload/launch + + downloadLauncherRestlet + + + + /process/batchDownload/status + + downloadStatusRestlet + + + + /process/batchDownload/download + + downloadReadyRestlet + + + + /process/batchDownload/kill + + downloadKillerRestlet + + + + - - An Executor that provides methods to manage termination - and methods that can produce a {@link Progress} - for tracking one or more asynchronous tasks. - - Number of process executor threads in the pool - - - Thread factory for this process executor - - + + ThreadFactory allowing for customizing the created threads (name, priority, etc) + + + Thread priority, value from 1 to 10, defaults to 5, meaning java.lang.Thread#NORM_PRIORITY + 5 + + + Specify executor threads to be daemon threads so that they shutdown when the application does + true + + - - A storage manager is a process collaborator that - abstracts out the process from the place where it can - store temporary files. This one uses a directory inside the GeoServer data - directory as the temp directory - - The GeoServerResourceLoader (defined in geoserver's main - module) where to get the data directory - location from - - - The name of the directory inside the geoserver data dir - to use as the root for processes' temp data - - + + An Executor that provides methods to manage termination and methods that can produce a {@link Progress} + for tracking one or more asynchronous tasks. + + Number of process executor threads in the pool + + + Thread factory for this process executor + + - - Global process manager to issue, query and kill - asynchronous processes - - - factory to create storage managers for each submitted - async process - - - process eviction check period in seconds. Instructs the - controller to check for process eviction - every X seconds - - - Process eviction timeout. Instructs the controller to - remove dead processes (and any data they may be - holding) X MINUTES - - + + A storage manager is a process collaborator that abstracts out the process from the place where it can + store temporary files. This one uses a directory inside the GeoServer data directory as the temp directory + + The GeoServerResourceLoader (defined in geoserver's main module) where to get the data directory + location from + + + The name of the directory inside the geoserver data dir to use as the root for processes' temp data + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Sets some geonode specific metadata properties to WFS - transactions - (such as full user name and email) to be available to the lower level - geotools data access layer. - For the specific case of versioning datastores this data can be used as - part of the commit information - - - + + Global process manager to issue, query and kill asynchronous processes + + + factory to create storage managers for each submitted async process + + + process eviction check period in seconds. Instructs the controller to check for process eviction + every X seconds + + + Process eviction timeout. Instructs the controller to remove dead processes (and any data they may be + holding) X MINUTES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sets some geonode specific metadata properties to WFS transactions + (such as full user name and email) to be available to the lower level geotools data access layer. + For the specific case of versioning datastores this data can be used as part of the commit information + + + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 8cd1796..108f8ec 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -233,11 +233,6 @@ org.geoserver.platform.GeoServerHttpSessionListenerProxy - - - org.springframework.web.context.request.RequestContextListener - - dispatcher diff --git a/src/main/webapp/data/global.xml b/src/main/webapp/data/global.xml index cf0f8a4..3dc75d6 100644 --- a/src/main/webapp/data/global.xml +++ b/src/main/webapp/data/global.xml @@ -7,14 +7,6 @@ http://geoserver.org false false - - - - quietOnNotFound - false - - - false @@ -37,11 +29,9 @@ UNBOUNDED 10240 - 147 + 63 0 true 1024 - false - DEFAULT SKIP_MISCONFIGURED_LAYERS \ No newline at end of file diff --git a/src/main/webapp/data/gwc-gs.xml b/src/main/webapp/data/gwc-gs.xml index 96ac235..bf6fe90 100644 --- a/src/main/webapp/data/gwc-gs.xml +++ b/src/main/webapp/data/gwc-gs.xml @@ -1,23 +1,9 @@ - 1.1.0 + 1.0.0 true true + true true - false - false - false - class org.geowebcache.storage.blobstore.memory.guava.GuavaCacheProvider - - - class org.geowebcache.storage.blobstore.memory.guava.GuavaCacheProvider - - 16 - NULL - 4 - 120 - - - true true 4 @@ -29,20 +15,20 @@ image/png - image/jpeg - image/gif image/png8 + image/gif + image/jpeg image/png - image/jpeg - image/gif image/png8 + image/gif + image/jpeg image/png - image/jpeg - image/gif image/png8 + image/gif + image/jpeg - \ No newline at end of file + diff --git a/src/main/webapp/data/logging.xml b/src/main/webapp/data/logging.xml index aa7b393..b4e4d03 100644 --- a/src/main/webapp/data/logging.xml +++ b/src/main/webapp/data/logging.xml @@ -1,5 +1,5 @@ - PRODUCTION_LOGGING.properties + DEFAULT_LOGGING.properties logs/geoserver.log - false + true \ No newline at end of file diff --git a/src/main/webapp/data/security/config.xml b/src/main/webapp/data/security/config.xml index e876374..e2ed48d 100644 --- a/src/main/webapp/data/security/config.xml +++ b/src/main/webapp/data/security/config.xml @@ -1,36 +1,37 @@ - geonode REST role service + default + geonodeAuthProvider default - geofence pbePasswordEncoder false - geonode-oauth2 + geonodeCookieFilter rememberme form anonymous - + form - + formLogout + geonodeCookieFilter basic - geonode-oauth2 anonymous + geonodeCookieFilter basic - geonode-oauth2 + geonodeCookieFilter basic - geonode-oauth2 + geonodeAnonymousFilter anonymous diff --git a/src/main/webapp/data/security/filter/formLogout/config.xml b/src/main/webapp/data/security/filter/formLogout/config.xml index ac4bae5..3355ae8 100644 --- a/src/main/webapp/data/security/filter/formLogout/config.xml +++ b/src/main/webapp/data/security/filter/formLogout/config.xml @@ -3,5 +3,4 @@ formLogout org.geoserver.security.filter.GeoServerLogoutFilter /web/ - /j_spring_security_logout,/j_spring_security_logout/,/j_spring_oauth2_geonode_logout,/j_spring_oauth2_geonode_logout/ \ No newline at end of file diff --git a/src/main/webapp/data/security/layers.properties b/src/main/webapp/data/security/layers.properties index 7a83045..8ba14c2 100644 --- a/src/main/webapp/data/security/layers.properties +++ b/src/main/webapp/data/security/layers.properties @@ -1,4 +1,9 @@ -#Thu Oct 13 11:53:10 CEST 2016 -*.*.r=GROUP_ADMIN,ROLE_ADMIN,ADMIN -*.*.w=GROUP_ADMIN,ROLE_ADMIN,ADMIN -mode=HIDE +# rule structure is namespace.layer.operation=role1,role2,... +# namespace: a namespace or * to catch them all (in that case, layer should be *) +# layer: a layer/featureType/coverage name or * to catch them all +# operatin: r or w (read or write) +# role list: * to imply all roles, or a list of explicit roles +# The operation will be allowed if the current user has at least one of the +# roles in the rule +*.*.r=* +*.*.w=* \ No newline at end of file diff --git a/src/main/webapp/data/security/usergroup/default/users.xml b/src/main/webapp/data/security/usergroup/default/users.xml index dbcd8fd..fe8304c 100644 --- a/src/main/webapp/data/security/usergroup/default/users.xml +++ b/src/main/webapp/data/security/usergroup/default/users.xml @@ -1,7 +1,7 @@ - - - - - + + + + +