Skip to content
Permalink
Browse files

added Edit Bulk component with unit tests

  • Loading branch information...
tssmits committed Jun 29, 2019
1 parent 414f87e commit 00ab8b4768ee6dc6d9c5fd43d1eb9ef5ce9614dc
Showing with 8,371 additions and 34 deletions.
  1. +5 −0 .travis.yml
  2. +2 −0 viewer-commons/docker/geoserver/.dockerignore
  3. +2 −0 viewer-commons/docker/geoserver/Dockerfile
  4. +38 −0 viewer-commons/docker/geoserver/docker-compose.yml
  5. +36 −0 viewer-commons/docker/geoserver/docker-entrypoint-initdb.d/z_001_meaningless_unittest_table.sql
  6. +7 −0 viewer-commons/docker/geoserver/docker-env/geoserver.env
  7. +28 −0 viewer-commons/docker/geoserver/geoserver-data/DEFAULT_LOGGING.properties
  8. +40 −0 viewer-commons/docker/geoserver/geoserver-data/GEOSERVER_DEVELOPER_LOGGING.properties
  9. +46 −0 viewer-commons/docker/geoserver/geoserver-data/GEOTOOLS_DEVELOPER_LOGGING.properties
  10. +41 −0 viewer-commons/docker/geoserver/geoserver-data/PRODUCTION_LOGGING.properties
  11. +22 −0 viewer-commons/docker/geoserver/geoserver-data/QUIET_LOGGING.properties
  12. +34 −0 viewer-commons/docker/geoserver/geoserver-data/TEST_LOGGING.properties
  13. +43 −0 viewer-commons/docker/geoserver/geoserver-data/VERBOSE_LOGGING.properties
  14. +17 −0 viewer-commons/docker/geoserver/geoserver-data/controlflow.properties
  15. +10 −0 viewer-commons/docker/geoserver/geoserver-data/csw/MD_Metadata.properties
  16. +18 −0 viewer-commons/docker/geoserver/geoserver-data/csw/Record.properties
  17. 0 viewer-commons/docker/geoserver/geoserver-data/geoserver.log
  18. +66 −0 viewer-commons/docker/geoserver/geoserver-data/global.xml
  19. +42 −0 viewer-commons/docker/geoserver/geoserver-data/gwc-gs.xml
  20. +33 −0 ...-commons/docker/geoserver/geoserver-data/gwc-layers/LayerInfoImpl--7e791a08_16b65703d40_-7fbc.xml
  21. +153 −0 viewer-commons/docker/geoserver/geoserver-data/gwc/geowebcache.xml
  22. 0 viewer-commons/docker/geoserver/geoserver-data/gwc/metadata.properties
  23. 0 viewer-commons/docker/geoserver/geoserver-data/logging.xml
  24. +173 −0 viewer-commons/docker/geoserver/geoserver-data/printing/config.yaml
  25. +6 −0 viewer-commons/docker/geoserver/geoserver-data/security/auth/default/config.xml
  26. +36 −0 viewer-commons/docker/geoserver/geoserver-data/security/config.xml
  27. +5 −0 viewer-commons/docker/geoserver/geoserver-data/security/filter/anonymous/config.xml
  28. +6 −0 viewer-commons/docker/geoserver/geoserver-data/security/filter/basic/config.xml
  29. +6 −0 viewer-commons/docker/geoserver/geoserver-data/security/filter/contextAsc/config.xml
  30. +6 −0 viewer-commons/docker/geoserver/geoserver-data/security/filter/contextNoAsc/config.xml
  31. +5 −0 viewer-commons/docker/geoserver/geoserver-data/security/filter/exception/config.xml
  32. +7 −0 viewer-commons/docker/geoserver/geoserver-data/security/filter/form/config.xml
  33. +6 −0 viewer-commons/docker/geoserver/geoserver-data/security/filter/formLogout/config.xml
  34. +7 −0 viewer-commons/docker/geoserver/geoserver-data/security/filter/interceptor/config.xml
  35. +5 −0 viewer-commons/docker/geoserver/geoserver-data/security/filter/rememberme/config.xml
  36. +7 −0 viewer-commons/docker/geoserver/geoserver-data/security/filter/restInterceptor/config.xml
  37. +7 −0 viewer-commons/docker/geoserver/geoserver-data/security/filter/roleFilter/config.xml
  38. +6 −0 viewer-commons/docker/geoserver/geoserver-data/security/filter/sslFilter/config.xml
  39. BIN viewer-commons/docker/geoserver/geoserver-data/security/geoserver.jceks
  40. +3 −0 viewer-commons/docker/geoserver/geoserver-data/security/layers.properties
  41. +1 −0 viewer-commons/docker/geoserver/geoserver-data/security/masterpw.digest
  42. +3 −0 viewer-commons/docker/geoserver/geoserver-data/security/masterpw.xml
  43. +8 −0 viewer-commons/docker/geoserver/geoserver-data/security/masterpw/default/config.xml
  44. +1 −0 viewer-commons/docker/geoserver/geoserver-data/security/masterpw/default/passwd
  45. +10 −0 viewer-commons/docker/geoserver/geoserver-data/security/pwpolicy/default/config.xml
  46. +10 −0 viewer-commons/docker/geoserver/geoserver-data/security/pwpolicy/master/config.xml
  47. +18 −0 viewer-commons/docker/geoserver/geoserver-data/security/rest.properties
  48. +10 −0 viewer-commons/docker/geoserver/geoserver-data/security/role/default/config.xml
  49. +13 −0 viewer-commons/docker/geoserver/geoserver-data/security/role/default/roles.xml
  50. +102 −0 viewer-commons/docker/geoserver/geoserver-data/security/role/default/roles.xsd
  51. +8 −0 viewer-commons/docker/geoserver/geoserver-data/security/services.properties
  52. +10 −0 viewer-commons/docker/geoserver/geoserver-data/security/usergroup/default/config.xml
  53. +7 −0 viewer-commons/docker/geoserver/geoserver-data/security/usergroup/default/users.xml
  54. +7 −0 viewer-commons/docker/geoserver/geoserver-data/security/usergroup/default/users.xml.orig
  55. +85 −0 viewer-commons/docker/geoserver/geoserver-data/security/usergroup/default/users.xsd
  56. +3 −0 viewer-commons/docker/geoserver/geoserver-data/security/version.properties
  57. +86 −0 viewer-commons/docker/geoserver/geoserver-data/styles/default_generic.sld
  58. +39 −0 viewer-commons/docker/geoserver/geoserver-data/styles/default_line.sld
  59. +45 −0 viewer-commons/docker/geoserver/geoserver-data/styles/default_point.sld
  60. +43 −0 viewer-commons/docker/geoserver/geoserver-data/styles/default_polygon.sld
  61. +20 −0 viewer-commons/docker/geoserver/geoserver-data/styles/default_raster.sld
  62. +9 −0 viewer-commons/docker/geoserver/geoserver-data/styles/generic.xml
  63. +9 −0 viewer-commons/docker/geoserver/geoserver-data/styles/line.xml
  64. +9 −0 viewer-commons/docker/geoserver/geoserver-data/styles/point.xml
  65. +9 −0 viewer-commons/docker/geoserver/geoserver-data/styles/polygon.xml
  66. +9 −0 viewer-commons/docker/geoserver/geoserver-data/styles/raster.xml
  67. +32 −0 viewer-commons/docker/geoserver/geoserver-data/user_projections/epsg.properties
  68. +5 −0 viewer-commons/docker/geoserver/geoserver-data/workspaces/default.xml
  69. +6 −0 viewer-commons/docker/geoserver/geoserver-data/workspaces/flamingo/namespace.xml
  70. +38 −0 viewer-commons/docker/geoserver/geoserver-data/workspaces/flamingo/postgis/datastore.xml
  71. +62 −0 ...r/geoserver/geoserver-data/workspaces/flamingo/postgis/meaningless_unittest_table/featuretype.xml
  72. +15 −0 .../docker/geoserver/geoserver-data/workspaces/flamingo/postgis/meaningless_unittest_table/layer.xml
  73. +5 −0 viewer-commons/docker/geoserver/geoserver-data/workspaces/flamingo/workspace.xml
  74. +47 −0 viewer-commons/docker/geoserver/geoserver-data/wps.xml
  75. +12 −11 viewer-config-persistence/src/test/java/nl/b3p/viewer/util/TestUtil.java
  76. +1 −0 viewer/pom.xml
  77. +419 −0 viewer/src/main/java/nl/b3p/viewer/stripes/EditBulkFeatureActionBean.java
  78. +76 −0 viewer/src/main/java/nl/b3p/viewer/util/AuditTrailLogger.java
  79. +9 −0 viewer/src/main/resources/ViewerResources.properties
  80. +11 −2 viewer/src/main/resources/ViewerResources_en.properties
  81. +2 −0 viewer/src/main/webapp/WEB-INF/jsp/app.jsp
  82. +7 −1 viewer/src/main/webapp/viewer-html/README.md
  83. +42 −0 viewer/src/main/webapp/viewer-html/common/ajax/EditBulkFeature.js
  84. +30 −6 viewer/src/main/webapp/viewer-html/components/Edit.js
  85. +80 −0 viewer/src/main/webapp/viewer-html/components/EditBulk-config.js
  86. +291 −0 viewer/src/main/webapp/viewer-html/components/EditBulk.js
  87. +1 −1 viewer/src/main/webapp/viewer-html/components/Merge.js
  88. +151 −0 viewer/src/main/webapp/viewer-html/components/SelectedFeatures.js
  89. +1 −1 viewer/src/main/webapp/viewer-html/components/Split.js
  90. +12 −0 viewer/src/main/webapp/viewer-html/components/components.json
  91. +31 −0 viewer/src/main/webapp/viewer-html/karma.conf.js
  92. +4,966 −0 viewer/src/main/webapp/viewer-html/package-lock.json
  93. +15 −4 viewer/src/main/webapp/viewer-html/package.json
  94. +106 −0 viewer/src/main/webapp/viewer-html/spec/components/SelectedFeatures.spec.js
  95. +11 −0 viewer/src/main/webapp/viewer-html/spec/support/jasmine.json
  96. +3 −1 viewer/src/test/java/nl/b3p/viewer/ViewerIntegrationTest.java
  97. +16 −7 viewer/src/test/java/nl/b3p/viewer/image/{WMS.java → WMSTest.java}
  98. +113 −0 viewer/src/test/java/nl/b3p/viewer/stripes/EditBulkFeatureActionBeanTest.java
  99. +45 −0 viewer/src/test/java/nl/b3p/viewer/util/DockerGeoserverTestUtil.java
  100. +38 −0 viewer/src/test/java/nl/b3p/viewer/util/ServiceAvailableChecker.java
  101. +56 −0 viewer/src/test/java/nl/b3p/viewer/util/docker/DockerGeoserverHelper.java
  102. +68 −0 viewer/src/test/java/nl/b3p/viewer/util/docker/DockerGeoserverHelperTest.java
@@ -10,12 +10,16 @@ addons:
apt:
packages:
- haveged
- nodejs
# - git-lfs should be installed on trusty images

services:
- haveged
- docker

before_install:
- docker-compose -f viewer-commons/docker/geoserver/docker-compose.yml up -d
- npm install -g wait-on
- unset _JAVA_OPTIONS
- echo $JAVA_HOME
- export PAGER=cat
@@ -52,6 +56,7 @@ before_script:
script:
- ulimit -a
- free -m
- wait-on -t 120000 http-get://localhost:8600/geoserver && echo "docker geoserver is up" || true
# execute unit tests
- mvn -e clean test -B
# run integration tests on all modules except viewer-admin
@@ -0,0 +1,2 @@
*
!docker-entrypoint-initdb.d
@@ -0,0 +1,2 @@
FROM mdillon/postgis:11
COPY ./docker-entrypoint-initdb.d/ /docker-entrypoint-initdb.d/
@@ -0,0 +1,38 @@
version: "3"

volumes:
pgdata:
geoserver-data:

services:
db:
build:
context: .
environment:
POSTGRES_PASSWORD: flamingo
POSTGRES_USER: flamingo
POSTGRES_DB: flamingo
ports:
- 25223:5432
restart: on-failure
volumes:
- pgdata:/var/lib/postgresql/data
healthcheck:
test: "exit 0"

geoserver:
image: kartoza/geoserver:2.15.0
volumes:
- ./geoserver-data:/opt/geoserver/data_dir
ports:
- "8600:8080"
restart: on-failure
env_file:
- ./docker-env/geoserver.env
depends_on:
- db
healthcheck:
test: curl --fail -s http://localhost:8080/ || exit 1
interval: 1m30s
timeout: 10s
retries: 3
@@ -0,0 +1,36 @@
CREATE TABLE public.meaningless_unittest_table (
id serial constraint meaningless_unittest_table_pk primary key,
codeword character varying NOT NULL,
amount integer DEFAULT 0 NOT NULL
);

SELECT AddGeometryColumn('public', 'meaningless_unittest_table', 'geom', 28992, 'POINT', 2);

ALTER TABLE public.meaningless_unittest_table OWNER TO flamingo;

INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (1, 'alpha', 1, st_pointfromtext('POINT(100 100)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (2, 'bravo', 2, st_pointfromtext('POINT(200 200)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (3, 'charlie', 3, st_pointfromtext('POINT(300 300)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (4, 'delta', 4, st_pointfromtext('POINT(400 400)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (5, 'echo', 5, st_pointfromtext('POINT(500 500)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (6, 'foxtrot', 6, st_pointfromtext('POINT(600 600)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (7, 'golf', 7, st_pointfromtext('POINT(700 700)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (8, 'hotel', 8, st_pointfromtext('POINT(800 800)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (9, 'india', 9, st_pointfromtext('POINT(900 900)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (10, 'juliet', 10, st_pointfromtext('POINT(1000 1000)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (11, 'kilo', 11, st_pointfromtext('POINT(1100 1100)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (12, 'lima', 12, st_pointfromtext('POINT(1200 1200)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (13, 'mike', 13, st_pointfromtext('POINT(1300 1300)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (14, 'november', 14, st_pointfromtext('POINT(1400 1400)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (15, 'oscar', 15, st_pointfromtext('POINT(1500 1500)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (16, 'papa', 16, st_pointfromtext('POINT(1600 1600)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (17, 'quebec', 17, st_pointfromtext('POINT(1700 1700)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (18, 'romeo', 18, st_pointfromtext('POINT(1800 1800)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (19, 'sierra', 19, st_pointfromtext('POINT(1900 1900)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (20, 'tango', 20, st_pointfromtext('POINT(2000 2000)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (21, 'uniform', 21, st_pointfromtext('POINT(2100 2100)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (22, 'victor', 22, st_pointfromtext('POINT(2200 2200)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (23, 'whiskey', 23, st_pointfromtext('POINT(2300 2300)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (24, 'x-ray', 24, st_pointfromtext('POINT(2400 2400)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (25, 'yankee', 25, st_pointfromtext('POINT(2500 2500)', 28992));
INSERT INTO public.meaningless_unittest_table (id, codeword, amount, geom) VALUES (26, 'zulu', 26, st_pointfromtext('POINT(2600 2600)', 28992));
@@ -0,0 +1,7 @@
GEOSERVER_DATA_DIR=/opt/geoserver/data_dir
ENABLE_JSONP=true
MAX_FILTER_RULES=20
OPTIMIZE_LINE_WIDTH=false
FOOTPRINTS_DATA_DIR=/opt/footprints_dir
GEOWEBCACHE_CACHE_DIR=/opt/geoserver/data_dir/gwc
GEOSERVER_ADMIN_PASSWORD=myawesomegeoserver
@@ -0,0 +1,28 @@
## This log4j configuration file needs to stay here, and is used as the default logging setup
## during data_dir upgrades and in case the chosen logging config isn't available.

log4j.rootLogger=WARN, geoserverlogfile, stdout

log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %p [%c{2}] - %m%n


log4j.appender.geoserverlogfile=org.apache.log4j.RollingFileAppender
# Keep three backup files.
log4j.appender.geoserverlogfile.MaxBackupIndex=3
# Pattern to output: date priority [category] - message
log4j.appender.geoserverlogfile.layout=org.apache.log4j.PatternLayout
log4j.appender.geoserverlogfile.layout.ConversionPattern=%d %p [%c{2}] - %m%n

log4j.category.log4j=FATAL

log4j.category.org.geotools=WARN
log4j.category.org.geotools.factory=WARN
log4j.category.org.geoserver=INFO
log4j.category.org.vfny.geoserver=INFO

log4j.category.org.springframework=WARN

log4j.category.org.geowebcache=INFO
log4j.category.org.geowebcache.seed.TruncateTask=WARN
@@ -0,0 +1,40 @@
## This log4j configuration file needs to stay here, and is used as the default logging setup
## during data_dir upgrades and in case the chosen logging config isn't available.
##
## As GeoTools uses java.util.logging logging instead of log4j, GeoServer makes
## the following mappings to adjust the log4j levels specified in this file to
## the GeoTools logging system:
##
## Log4J Level java.util.logging Level
## --------------------------------------------
## ALL FINEST
## TRACE FINER
## DEBUG FINE (includes CONFIG)
## INFO INFO
## WARN/ERROR WARNING
## FATAL SEVERE
## OFF OFF

log4j.rootLogger=WARN, geoserverlogfile, stdout

log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %p [%c] - %m%n

log4j.category.log4j=FATAL

log4j.appender.geoserverlogfile=org.apache.log4j.RollingFileAppender
# Keep three backup files.
log4j.appender.geoserverlogfile.MaxBackupIndex=3
# Pattern to output: date priority [category] - message
log4j.appender.geoserverlogfile.layout=org.apache.log4j.PatternLayout
log4j.appender.geoserverlogfile.layout.ConversionPattern=%d %p [%c] - %m%n


log4j.category.org.geotools=WARN
log4j.category.org.geotools.factory=WARN

log4j.category.org.geoserver=TRACE
log4j.category.org.vfny.geoserver=TRACE

log4j.category.org.springframework=WARN
@@ -0,0 +1,46 @@
## This log4j configuration file needs to stay here, and is used as the default logging setup
## during data_dir upgrades and in case the chosen logging config isn't available.
##
## As GeoTools uses java.util.logging logging instead of log4j, GeoServer makes
## the following mappings to adjust the log4j levels specified in this file to
## the GeoTools logging system:
##
## Log4J Level java.util.logging Level
## --------------------------------------------
## ALL FINEST
## TRACE FINER
## DEBUG FINE (includes CONFIG)
## INFO INFO
## WARN/ERROR WARNING
## FATAL SEVERE
## OFF OFF

log4j.rootLogger=WARN, geoserverlogfile, stdout

log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %p [%c] - %m%n

log4j.category.log4j=FATAL

log4j.appender.geoserverlogfile=org.apache.log4j.RollingFileAppender
# Keep three backup files.
log4j.appender.geoserverlogfile.MaxBackupIndex=3
# Pattern to output: date priority [category] - message
log4j.appender.geoserverlogfile.layout=org.apache.log4j.PatternLayout
log4j.appender.geoserverlogfile.layout.ConversionPattern=%d %p [%c] - %m%n


log4j.category.org.geotools=TRACE
# Some more geotools loggers you may be interest in tweaking
log4j.category.org.geotools.factory=TRACE
log4j.category.org.geotools.renderer=DEBUG
log4j.category.org.geotools.data=TRACE
log4j.category.org.geotools.feature=TRACE
log4j.category.org.geotools.filter=TRACE
log4j.category.org.geotools.factory=TRACE

log4j.category.org.geoserver=INFO
log4j.category.org.vfny.geoserver=INFO

log4j.category.org.springframework=WARN
@@ -0,0 +1,41 @@
## This log4j configuration file needs to stay here, and is used as the default logging setup
## during data_dir upgrades and in case the chosen logging config isn't available.
##
## As GeoTools uses java.util.logging logging instead of log4j, GeoServer makes
## the following mappings to adjust the log4j levels specified in this file to
## the GeoTools logging system:
##
## Log4J Level java.util.logging Level
## --------------------------------------------
## ALL FINEST
## TRACE FINER
## DEBUG FINE (includes CONFIG)
## INFO INFO
## WARN/ERROR WARNING
## FATAL SEVERE
## OFF OFF

log4j.rootLogger=WARN, geoserverlogfile, stdout

log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %p [%c{2}] - %m%n


log4j.appender.geoserverlogfile=org.apache.log4j.RollingFileAppender
# Keep three backup files.
log4j.appender.geoserverlogfile.MaxBackupIndex=3
# Pattern to output: date priority [category] - message
log4j.appender.geoserverlogfile.layout=org.apache.log4j.PatternLayout
log4j.appender.geoserverlogfile.layout.ConversionPattern=%d %p [%c{2}] - %m%n

log4j.category.log4j=FATAL

log4j.category.org.geotools=WARN
log4j.category.org.geotools.factory=WARN
log4j.category.org.geoserver=WARN
log4j.category.org.vfny.geoserver=WARN

log4j.category.org.springframework=WARN

log4j.category.org.geowebcache=ERROR
@@ -0,0 +1,22 @@
## This log4j configuration file needs to stay here, and is used as the default logging setup
## during data_dir upgrades and in case the chosen logging config isn't available.
##
## As GeoTools uses java.util.logging logging instead of log4j, GeoServer makes
## the following mappings to adjust the log4j levels specified in this file to
## the GeoTools logging system:
##
## Log4J Level java.util.logging Level
## --------------------------------------------
## ALL FINEST
## TRACE FINER
## DEBUG FINE (includes CONFIG)
## INFO INFO
## ERROR/ERROR ERRORING
## ERROR SEVERE
## OFF OFF

log4j.rootLogger=OFF, stdout

log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %p [%c{2}] - %m%n
@@ -0,0 +1,34 @@
## This log4j configuration file needs to stay here, and is used as the default logging setup
## during data_dir upgrades and in case the chosen logging config isn't available.
##
## As GeoTools uses java.util.logging logging instead of log4j, GeoServer makes
## the following mappings to adjust the log4j levels specified in this file to
## the GeoTools logging system:
##
## Log4J Level java.util.logging Level
## --------------------------------------------
## ALL FINEST
## TRACE FINER
## DEBUG FINE (includes CONFIG)
## INFO INFO
## ERROR/ERROR ERRORING
## ERROR SEVERE
## OFF OFF

log4j.rootLogger=ERROR, stdout

log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %p [%c{2}] - %m%n

GEOTOOLS_DEVELOPER_LOGGING.properties

log4j.category.org.geotools=ERROR
log4j.category.org.geotools.factory=ERROR
log4j.category.org.geoserver=ERROR
log4j.category.org.vfny.geoserver=ERROR

log4j.category.org.springframework=ERROR

# wicket tester
log4j.category.org.apache.wicket.util.tester=INFO
@@ -0,0 +1,43 @@
## This log4j configuration file needs to stay here, and is used as the default logging setup
## during data_dir upgrades and in case the chosen logging config isn't available.
##
## As GeoTools uses java.util.logging logging instead of log4j, GeoServer makes
## the following mappings to adjust the log4j levels specified in this file to
## the GeoTools logging system:
##
## Log4J Level java.util.logging Level
## --------------------------------------------
## ALL FINEST
## TRACE FINER
## DEBUG FINE (includes CONFIG)
## INFO INFO
## WARN/ERROR WARNING
## FATAL SEVERE
## OFF OFF

log4j.rootLogger=WARN, geoserverlogfile, stdout

log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %p [%c{2}] - %m%n

log4j.category.log4j=FATAL

log4j.appender.geoserverlogfile=org.apache.log4j.RollingFileAppender
# Keep three backup files.
log4j.appender.geoserverlogfile.MaxBackupIndex=3
# Pattern to output: date priority [category] - message
log4j.appender.geoserverlogfile.layout=org.apache.log4j.PatternLayout
log4j.appender.geoserverlogfile.layout.ConversionPattern=%d %p [%c{2}] - %m%n


log4j.category.org.geotools=TRACE
log4j.category.org.geotools.factory=TRACE
log4j.category.org.geotools.renderer=DEBUG
log4j.category.org.geoserver=TRACE
log4j.category.org.vfny.geoserver=TRACE

log4j.category.org.springframework=INFO
log4j.category.org.apache.struts=INFO

log4j.category.org.geowebcache=DEBUG
@@ -0,0 +1,17 @@
# if a request waits in queue for more than 60 seconds it's not worth executing,
# the client will likely have given up by then
timeout=60
# don't allow the execution of more than 100 requests total in parallel
ows.global=100
# don't allow more than 10 GetMap in parallel
ows.wms.getmap=10
# don't allow more than 4 outputs with Excel output as it's memory bound
ows.wfs.getfeature.application/msexcel=4
# don't allow a single user to perform more than 6 requests in parallel
# (6 being the Firefox default concurrency level at the time of writing)
user=6
# don't allow the execution of more than 16 tile requests in parallel
# (assuming a server with 4 cores, GWC empirical tests show that throughput
# peaks up at 4 x number of cores. Adjust as appropriate to your system)
ows.gwc=16
user.ows.wps.execute=1000/d;30s

0 comments on commit 00ab8b4

Please sign in to comment.
You can’t perform that action at this time.