diff --git a/.gitignore b/.gitignore
index 166086cd389..4c04fd582c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
.classpath
.project
.settings
-src/main/webapp/data
target/
diff --git a/src/main/webapp/data/README.rst b/src/main/webapp/data/README.rst
new file mode 100644
index 00000000000..0b2d7651790
--- /dev/null
+++ b/src/main/webapp/data/README.rst
@@ -0,0 +1,5 @@
+Included Data
+=============
+
+This directory provides an empty GeoServer data directory, as such this directory
+does not contain any published data and is not subject to a data license.
\ No newline at end of file
diff --git a/src/main/webapp/data/geonode/geonode_initialized b/src/main/webapp/data/geonode/geonode_initialized
new file mode 100644
index 00000000000..0d48727ee93
--- /dev/null
+++ b/src/main/webapp/data/geonode/geonode_initialized
@@ -0,0 +1 @@
+This file was created to flag that the GeoNode extensions have been configured in this server.If you delete it, the GeoNode settings will be applied again the next time you restart GeoServer.
\ No newline at end of file
diff --git a/src/main/webapp/data/global.xml b/src/main/webapp/data/global.xml
new file mode 100644
index 00000000000..5db291f8c15
--- /dev/null
+++ b/src/main/webapp/data/global.xml
@@ -0,0 +1,21 @@
+
+
+
+ false
+ true
+ 5
+ 7
+ 0.5
+ 0.75
+ false
+ false
+ false
+ false
+
+ UTF-8
+ 8
+ http://geoserver.org
+ false
+ false
+ 0
+
\ No newline at end of file
diff --git a/src/main/webapp/data/gwc-gs.xml b/src/main/webapp/data/gwc-gs.xml
new file mode 100644
index 00000000000..81e9ce12237
--- /dev/null
+++ b/src/main/webapp/data/gwc-gs.xml
@@ -0,0 +1,28 @@
+
+ 1.0.0
+ false
+ true
+ true
+ true
+ true
+ true
+ 4
+ 4
+ 0
+
+ EPSG:4326
+ EPSG:900913
+
+
+ image/png
+ image/jpeg
+
+
+ image/png
+ image/jpeg
+
+
+ image/png
+ image/jpeg
+
+
\ No newline at end of file
diff --git a/src/main/webapp/data/images/colorpicker.jpg b/src/main/webapp/data/images/colorpicker.jpg
new file mode 100644
index 00000000000..ce6dda7a5ec
Binary files /dev/null and b/src/main/webapp/data/images/colorpicker.jpg differ
diff --git a/src/main/webapp/data/images/delete.png b/src/main/webapp/data/images/delete.png
new file mode 100644
index 00000000000..20076d8086b
Binary files /dev/null and b/src/main/webapp/data/images/delete.png differ
diff --git a/src/main/webapp/data/images/deleteRed.png b/src/main/webapp/data/images/deleteRed.png
new file mode 100644
index 00000000000..ba7ef98d5de
Binary files /dev/null and b/src/main/webapp/data/images/deleteRed.png differ
diff --git a/src/main/webapp/data/images/down.png b/src/main/webapp/data/images/down.png
new file mode 100644
index 00000000000..227ceff66fd
Binary files /dev/null and b/src/main/webapp/data/images/down.png differ
diff --git a/src/main/webapp/data/images/gs.gif b/src/main/webapp/data/images/gs.gif
new file mode 100644
index 00000000000..0879a1a67e4
Binary files /dev/null and b/src/main/webapp/data/images/gs.gif differ
diff --git a/src/main/webapp/data/images/gs.ico b/src/main/webapp/data/images/gs.ico
new file mode 100644
index 00000000000..7d52a168688
Binary files /dev/null and b/src/main/webapp/data/images/gs.ico differ
diff --git a/src/main/webapp/data/images/rasterLegend.png b/src/main/webapp/data/images/rasterLegend.png
new file mode 100644
index 00000000000..97466b112dc
Binary files /dev/null and b/src/main/webapp/data/images/rasterLegend.png differ
diff --git a/src/main/webapp/data/images/up.png b/src/main/webapp/data/images/up.png
new file mode 100644
index 00000000000..3c3f5ea51e7
Binary files /dev/null and b/src/main/webapp/data/images/up.png differ
diff --git a/src/main/webapp/data/logging.xml b/src/main/webapp/data/logging.xml
new file mode 100644
index 00000000000..b4e4d039cc1
--- /dev/null
+++ b/src/main/webapp/data/logging.xml
@@ -0,0 +1,5 @@
+
+ DEFAULT_LOGGING.properties
+ logs/geoserver.log
+ true
+
\ No newline at end of file
diff --git a/src/main/webapp/data/logs/DEFAULT_LOGGING.properties b/src/main/webapp/data/logs/DEFAULT_LOGGING.properties
new file mode 100644
index 00000000000..932904232c9
--- /dev/null
+++ b/src/main/webapp/data/logs/DEFAULT_LOGGING.properties
@@ -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
diff --git a/src/main/webapp/data/logs/GEOSERVER_DEVELOPER_LOGGING.properties b/src/main/webapp/data/logs/GEOSERVER_DEVELOPER_LOGGING.properties
new file mode 100644
index 00000000000..aeb12455b9f
--- /dev/null
+++ b/src/main/webapp/data/logs/GEOSERVER_DEVELOPER_LOGGING.properties
@@ -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
diff --git a/src/main/webapp/data/logs/GEOTOOLS_DEVELOPER_LOGGING.properties b/src/main/webapp/data/logs/GEOTOOLS_DEVELOPER_LOGGING.properties
new file mode 100644
index 00000000000..8cc18029a58
--- /dev/null
+++ b/src/main/webapp/data/logs/GEOTOOLS_DEVELOPER_LOGGING.properties
@@ -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
diff --git a/src/main/webapp/data/logs/PRODUCTION_LOGGING.properties b/src/main/webapp/data/logs/PRODUCTION_LOGGING.properties
new file mode 100644
index 00000000000..6128eb7fbf0
--- /dev/null
+++ b/src/main/webapp/data/logs/PRODUCTION_LOGGING.properties
@@ -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
diff --git a/src/main/webapp/data/logs/VERBOSE_LOGGING.properties b/src/main/webapp/data/logs/VERBOSE_LOGGING.properties
new file mode 100644
index 00000000000..01908fe90dc
--- /dev/null
+++ b/src/main/webapp/data/logs/VERBOSE_LOGGING.properties
@@ -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
diff --git a/src/main/webapp/data/printing/config.yaml b/src/main/webapp/data/printing/config.yaml
new file mode 100644
index 00000000000..d8ac794b944
--- /dev/null
+++ b/src/main/webapp/data/printing/config.yaml
@@ -0,0 +1,173 @@
+#===========================================================================
+# allowed DPIs
+#===========================================================================
+dpis: [75, 150, 300]
+
+#===========================================================================
+# the allowed scales
+#===========================================================================
+scales:
+ - 25000
+ - 50000
+ - 100000
+ - 200000
+ - 500000
+ - 1000000
+ - 2000000
+ - 4000000
+
+#===========================================================================
+# the list of allowed hosts
+#===========================================================================
+hosts:
+ - !localMatch
+ dummy: true
+ - !ipMatch
+ ip: www.camptocamp.org
+ - !dnsMatch
+ host: labs.metacarta.com
+ port: 80
+ - !dnsMatch
+ host: terraservice.net
+ port: 80
+ - !dnsMatch
+ host: sigma.openplans.org
+ - !dnsMatch
+ host: demo.mapfish.org
+
+layouts:
+ Legal:
+ mainPage:
+ pageSize: LEGAL
+ items:
+ - !map
+ spacingAfter: 30
+ width: 440
+ height: 483
+ #===========================================================================
+ A4 portrait:
+ #===========================================================================
+ metaData:
+# title: '${mapTitle}'
+ author: 'MapFish print module'
+ subject: 'Simple layout'
+ keywords: 'map,print'
+ creator: 'MapFish'
+
+ titlePage:
+ pageSize: A4
+ items:
+ - !text
+ spacingAfter: 150
+ - !text
+ font: Helvetica
+ fontSize: 40
+ spacingAfter: 100
+ align: center
+ text: '${layout}'
+ - !image
+ maxWidth: 160
+ maxHeight: 160
+ spacingAfter: 100
+ align: center
+ url: http://trac.mapfish.org/trac/mapfish/attachment/ticket/3/logo_v8_sphere.svg?format=raw
+
+ footer: &commonFooter
+ height: 30
+ items:
+ - !columns
+ config:
+ cells:
+ - paddingBottom: 5
+ items:
+ - !text
+ backgroundColor: #FF0000
+ align: left
+ text: a red box
+ - !text
+ align: right
+ text: 'Page ${pageNum}'
+ - !image
+ align: center
+ maxWidth: 100
+ maxHeight: 30
+ spacingAfter: 200
+ url: 'http://geoserver.org/download/attachments/10158143/pbGS-Bttn228x68.png'
+
+ #-------------------------------------------------------------------------
+ mainPage:
+ pageSize: A4
+ rotation: true
+# header:
+# height: 50
+# items:
+# - !text
+# font: Helvetica
+# fontSize: 30
+# align: right
+# text: '${layout}'
+ items:
+ - !text
+ text: '${mapTitle}'
+ fontSize: 30
+ spacingAfter: 30
+ - !map
+ spacingAfter: 30
+ width: 440
+ height: 483
+ - !columns
+ # columns can have an absolute position. In that case, they need the 3 following fields:
+ absoluteX: 410
+ absoluteY: 310
+ width: 100
+ items:
+ - !scalebar
+ type: bar
+ maxSize: 100
+ barBgColor: white
+ fontSize: 8
+ align: right
+ - !text
+ text: '${comment}'
+ spacingAfter: 30
+ - !attributes
+ source: data
+ spacingAfter: 30
+ columnDefs:
+ id:
+ columnWeight: 2
+ header: !text
+ text: ID
+ backgroundColor: #A0A0A0
+ cell: !text
+ text: '${id}'
+ name:
+ columnWeight: 5
+ header: !text
+ text: Name
+ backgroundColor: #A0A0A0
+ cell: !columns
+ config:
+ cells:
+ - backgroundColor: '${nameBackgroundColor}'
+ borderWidth: 1
+ borderColor: '${nameBorderColor}'
+ items:
+ - !text
+ text: '${name}'
+ icon:
+ columnWeight: 2
+ header: !text
+ text: Symbol
+ backgroundColor: #A0A0A0
+ cell: !image
+ align: center
+ maxWidth: 15
+ maxHeight: 15
+ url: 'http://www.mapfish.org/svn/mapfish/trunk/MapFish/client/mfbase/mapfish/img/${icon}.png'
+ - !text
+ font: Helvetica
+ fontSize: 9
+ align: right
+ text: '1:${scale} ${now MM.dd.yyyy}'
+ footer: *commonFooter
diff --git a/src/main/webapp/data/security/auth/default/config.xml b/src/main/webapp/data/security/auth/default/config.xml
new file mode 100644
index 00000000000..6ebe75cec77
--- /dev/null
+++ b/src/main/webapp/data/security/auth/default/config.xml
@@ -0,0 +1,6 @@
+
+ -745c476c:13baf953e7a:-7ff0
+ default
+ org.geoserver.security.auth.UsernamePasswordAuthenticationProvider
+ default
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/auth/geonodeAuthProvider/config.xml b/src/main/webapp/data/security/auth/geonodeAuthProvider/config.xml
new file mode 100644
index 00000000000..6ae93ae78a7
--- /dev/null
+++ b/src/main/webapp/data/security/auth/geonodeAuthProvider/config.xml
@@ -0,0 +1,6 @@
+
+ -745c476c:13baf953e7a:-7fef
+ geonodeAuthProvider
+ org.geonode.security.GeoNodeAuthenticationProvider
+ http://localhost:8000/
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/config.xml b/src/main/webapp/data/security/config.xml
new file mode 100644
index 00000000000..661246afee3
--- /dev/null
+++ b/src/main/webapp/data/security/config.xml
@@ -0,0 +1,55 @@
+
+ default
+
+ geonodeAuthProvider
+ default
+
+ true
+ pbePasswordEncoder
+ false
+
+
+ contextAsc
+ rememberme
+ geonodeAnonymousFilter
+ anonymous
+ guiException
+ interceptor
+
+
+ contextAsc
+ form
+
+
+ contextAsc
+ formLogout
+
+
+ contextNoAsc
+ basic
+ geonodeAnonymousFilter
+ anonymous
+ exception
+ restInterceptor
+
+
+ contextNoAsc
+ basic
+ exception
+ restInterceptor
+
+
+ contextNoAsc
+ geonodeCookieFilter
+ basic
+ geonodeAnonymousFilter
+ anonymous
+ exception
+ interceptor
+
+
+
+ org.geoserver.security.rememberme.GeoServerTokenBasedRememberMeServices
+ geoserver
+
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/filter/anonymous/config.xml b/src/main/webapp/data/security/filter/anonymous/config.xml
new file mode 100644
index 00000000000..be95b6161ea
--- /dev/null
+++ b/src/main/webapp/data/security/filter/anonymous/config.xml
@@ -0,0 +1,5 @@
+
+ -745c476c:13baf953e7a:-7ff7
+ anonymous
+ org.geoserver.security.filter.GeoServerAnonymousAuthenticationFilter
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/filter/basic/config.xml b/src/main/webapp/data/security/filter/basic/config.xml
new file mode 100644
index 00000000000..f351efcd651
--- /dev/null
+++ b/src/main/webapp/data/security/filter/basic/config.xml
@@ -0,0 +1,6 @@
+
+ -745c476c:13baf953e7a:-7ffb
+ basic
+ org.geoserver.security.filter.GeoServerBasicAuthenticationFilter
+ true
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/filter/contextAsc/config.xml b/src/main/webapp/data/security/filter/contextAsc/config.xml
new file mode 100644
index 00000000000..0c1e6461fda
--- /dev/null
+++ b/src/main/webapp/data/security/filter/contextAsc/config.xml
@@ -0,0 +1,6 @@
+
+ -745c476c:13baf953e7a:-7ff9
+ contextAsc
+ org.geoserver.security.filter.GeoServerSecurityContextPersistenceFilter
+ true
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/filter/contextNoAsc/config.xml b/src/main/webapp/data/security/filter/contextNoAsc/config.xml
new file mode 100644
index 00000000000..97fd872631d
--- /dev/null
+++ b/src/main/webapp/data/security/filter/contextNoAsc/config.xml
@@ -0,0 +1,6 @@
+
+ -745c476c:13baf953e7a:-7ff8
+ contextNoAsc
+ org.geoserver.security.filter.GeoServerSecurityContextPersistenceFilter
+ false
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/filter/exception/config.xml b/src/main/webapp/data/security/filter/exception/config.xml
new file mode 100644
index 00000000000..a9b0b07b6f0
--- /dev/null
+++ b/src/main/webapp/data/security/filter/exception/config.xml
@@ -0,0 +1,6 @@
+
+ -745c476c:13baf953e7a:-7ff2
+ exception
+ org.geoserver.security.filter.GeoServerExceptionTranslationFilter
+ /accessDenied.jsp
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/filter/form/config.xml b/src/main/webapp/data/security/filter/form/config.xml
new file mode 100644
index 00000000000..33fab5d086c
--- /dev/null
+++ b/src/main/webapp/data/security/filter/form/config.xml
@@ -0,0 +1,7 @@
+
+ -745c476c:13baf953e7a:-7ffa
+ form
+ org.geoserver.security.filter.GeoServerUserNamePasswordAuthenticationFilter
+ password
+ username
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/filter/formLogout/config.xml b/src/main/webapp/data/security/filter/formLogout/config.xml
new file mode 100644
index 00000000000..eecc80bcf33
--- /dev/null
+++ b/src/main/webapp/data/security/filter/formLogout/config.xml
@@ -0,0 +1,5 @@
+
+ -745c476c:13baf953e7a:-7ff3
+ formLogout
+ org.geoserver.security.filter.GeoServerLogoutFilter
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/filter/geonodeAnonymousFilter/config.xml b/src/main/webapp/data/security/filter/geonodeAnonymousFilter/config.xml
new file mode 100644
index 00000000000..46245decd79
--- /dev/null
+++ b/src/main/webapp/data/security/filter/geonodeAnonymousFilter/config.xml
@@ -0,0 +1,5 @@
+
+ -745c476c:13baf953e7a:-7fed
+ geonodeAnonymousFilter
+ org.geonode.security.GeoNodeAnonymousProcessingFilter
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/filter/geonodeCookieFilter/config.xml b/src/main/webapp/data/security/filter/geonodeCookieFilter/config.xml
new file mode 100644
index 00000000000..bf0c7439768
--- /dev/null
+++ b/src/main/webapp/data/security/filter/geonodeCookieFilter/config.xml
@@ -0,0 +1,5 @@
+
+ -745c476c:13baf953e7a:-7fee
+ geonodeCookieFilter
+ org.geonode.security.GeoNodeCookieProcessingFilter
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/filter/guiException/config.xml b/src/main/webapp/data/security/filter/guiException/config.xml
new file mode 100644
index 00000000000..936cea51261
--- /dev/null
+++ b/src/main/webapp/data/security/filter/guiException/config.xml
@@ -0,0 +1,7 @@
+
+ -745c476c:13baf953e7a:-7ff1
+ guiException
+ org.geoserver.security.filter.GeoServerExceptionTranslationFilter
+ form
+ /accessDenied.jsp
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/filter/interceptor/config.xml b/src/main/webapp/data/security/filter/interceptor/config.xml
new file mode 100644
index 00000000000..96831025cc7
--- /dev/null
+++ b/src/main/webapp/data/security/filter/interceptor/config.xml
@@ -0,0 +1,7 @@
+
+ -745c476c:13baf953e7a:-7ff5
+ interceptor
+ org.geoserver.security.filter.GeoServerSecurityInterceptorFilter
+ false
+ geoserverMetadataSource
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/filter/rememberme/config.xml b/src/main/webapp/data/security/filter/rememberme/config.xml
new file mode 100644
index 00000000000..cf23b339490
--- /dev/null
+++ b/src/main/webapp/data/security/filter/rememberme/config.xml
@@ -0,0 +1,5 @@
+
+ -745c476c:13baf953e7a:-7ff6
+ rememberme
+ org.geoserver.security.filter.GeoServerRememberMeAuthenticationFilter
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/filter/restInterceptor/config.xml b/src/main/webapp/data/security/filter/restInterceptor/config.xml
new file mode 100644
index 00000000000..800d2abb402
--- /dev/null
+++ b/src/main/webapp/data/security/filter/restInterceptor/config.xml
@@ -0,0 +1,7 @@
+
+ -745c476c:13baf953e7a:-7ff4
+ restInterceptor
+ org.geoserver.security.filter.GeoServerSecurityInterceptorFilter
+ false
+ restFilterDefinitionMap
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/geoserver.jceks b/src/main/webapp/data/security/geoserver.jceks
new file mode 100644
index 00000000000..ef3515e0c56
Binary files /dev/null and b/src/main/webapp/data/security/geoserver.jceks differ
diff --git a/src/main/webapp/data/security/masterpw.info b/src/main/webapp/data/security/masterpw.info
new file mode 100644
index 00000000000..3014edc87fa
--- /dev/null
+++ b/src/main/webapp/data/security/masterpw.info
@@ -0,0 +1,7 @@
+This file was created at 2012/12/18 11:54:51
+
+The generated master password is: PtOK`dgG
+
+Test the master password by logging in as user "root"
+
+This file should be removed after reading !!!.
diff --git a/src/main/webapp/data/security/masterpw.xml b/src/main/webapp/data/security/masterpw.xml
new file mode 100644
index 00000000000..3091bc349cd
--- /dev/null
+++ b/src/main/webapp/data/security/masterpw.xml
@@ -0,0 +1,3 @@
+
+ default
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/masterpw/default/config.xml b/src/main/webapp/data/security/masterpw/default/config.xml
new file mode 100644
index 00000000000..d83182def4c
--- /dev/null
+++ b/src/main/webapp/data/security/masterpw/default/config.xml
@@ -0,0 +1,8 @@
+
+ -745c476c:13baf953e7a:-8000
+ default
+ org.geoserver.security.password.URLMasterPasswordProvider
+ false
+ file:passwd
+ true
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/masterpw/default/passwd b/src/main/webapp/data/security/masterpw/default/passwd
new file mode 100644
index 00000000000..ae9c9526be3
--- /dev/null
+++ b/src/main/webapp/data/security/masterpw/default/passwd
@@ -0,0 +1 @@
+R/7uduWKH5gzbMnER8VtPPpI0klzJhw/
\ No newline at end of file
diff --git a/src/main/webapp/data/security/pwpolicy/default/config.xml b/src/main/webapp/data/security/pwpolicy/default/config.xml
new file mode 100644
index 00000000000..d8cbbecc74d
--- /dev/null
+++ b/src/main/webapp/data/security/pwpolicy/default/config.xml
@@ -0,0 +1,10 @@
+
+ -745c476c:13baf953e7a:-7fff
+ default
+ org.geoserver.security.validation.PasswordValidatorImpl
+ false
+ false
+ false
+ 0
+ -1
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/pwpolicy/master/config.xml b/src/main/webapp/data/security/pwpolicy/master/config.xml
new file mode 100644
index 00000000000..e605d62019a
--- /dev/null
+++ b/src/main/webapp/data/security/pwpolicy/master/config.xml
@@ -0,0 +1,10 @@
+
+ -745c476c:13baf953e7a:-7ffe
+ master
+ org.geoserver.security.validation.PasswordValidatorImpl
+ false
+ false
+ false
+ 8
+ -1
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/rest.properties b/src/main/webapp/data/security/rest.properties
new file mode 100644
index 00000000000..d80a07e5548
--- /dev/null
+++ b/src/main/webapp/data/security/rest.properties
@@ -0,0 +1,18 @@
+# Default REST security configuration.
+#
+# By default this configuration locks down every rest call. The following is an example of a more
+# lax configuration in which read only (GET) access is allowed anonymously:
+#
+#/**;GET=IS_AUTHENTICATED_ANONYMOUSLY
+#/**;POST,DELETE,PUT=ADMIN
+#
+# The following is an example of a configuration that could be used with the restconfig plugin in
+# which only configuration in a specific workspace is restricted:
+#
+#/rest/workspaces/topp*;GET=ADMIN
+#/rest/workspaces/topp/**;GET=ADMIN
+#/**;POST,DELETE,PUT=ADMIN
+#
+#
+/**;GET=ADMIN
+/**;POST,DELETE,PUT=ADMIN
diff --git a/src/main/webapp/data/security/role/default/config.xml b/src/main/webapp/data/security/role/default/config.xml
new file mode 100644
index 00000000000..be7ea11fe7a
--- /dev/null
+++ b/src/main/webapp/data/security/role/default/config.xml
@@ -0,0 +1,10 @@
+
+ -745c476c:13baf953e7a:-7ffc
+ default
+ org.geoserver.security.xml.XMLRoleService
+ roles.xml
+ 10000
+ true
+ ADMIN
+ GROUP_ADMIN
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/role/default/roles.xml b/src/main/webapp/data/security/role/default/roles.xml
new file mode 100644
index 00000000000..aa61406605a
--- /dev/null
+++ b/src/main/webapp/data/security/role/default/roles.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/data/security/role/default/roles.xsd b/src/main/webapp/data/security/role/default/roles.xsd
new file mode 100644
index 00000000000..f7a08fc52b6
--- /dev/null
+++ b/src/main/webapp/data/security/role/default/roles.xsd
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/data/security/services.properties b/src/main/webapp/data/security/services.properties
new file mode 100644
index 00000000000..0273d131829
--- /dev/null
+++ b/src/main/webapp/data/security/services.properties
@@ -0,0 +1,8 @@
+# The format here is service[.method]=ROLE1,...,ROLEN
+# ([method] being optional if you want to apply the rule to all calls to a specific service
+# A user can access a service only if he has one of the specified roles
+# If not specified in this file, a service or method will be considered unsecured
+
+# Uncomment the following config if you want to test securing WFS service
+#wfs.GetFeature=ROLE_WFS_READ
+#wfs.Transaction=ROLE_WFS_WRITE
diff --git a/src/main/webapp/data/security/usergroup/default/config.xml b/src/main/webapp/data/security/usergroup/default/config.xml
new file mode 100644
index 00000000000..c2a29ce07f8
--- /dev/null
+++ b/src/main/webapp/data/security/usergroup/default/config.xml
@@ -0,0 +1,10 @@
+
+ -745c476c:13baf953e7a:-7ffd
+ default
+ org.geoserver.security.xml.XMLUserGroupService
+ users.xml
+ 10000
+ true
+ pbePasswordEncoder
+ default
+
\ 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
new file mode 100644
index 00000000000..d385a483a3c
--- /dev/null
+++ b/src/main/webapp/data/security/usergroup/default/users.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/src/main/webapp/data/security/usergroup/default/users.xsd b/src/main/webapp/data/security/usergroup/default/users.xsd
new file mode 100644
index 00000000000..086b97dbb10
--- /dev/null
+++ b/src/main/webapp/data/security/usergroup/default/users.xsd
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/data/styles/default_line.sld b/src/main/webapp/data/styles/default_line.sld
new file mode 100644
index 00000000000..14c1b724609
--- /dev/null
+++ b/src/main/webapp/data/styles/default_line.sld
@@ -0,0 +1,32 @@
+
+
+
+
+ default_line
+
+
+ Default Line
+ A sample style that draws a line
+
+
+
+
+ rule1
+ Blue Line
+ A solid blue line with a 1 pixel width
+
+
+ #0000FF
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/data/styles/default_point.sld b/src/main/webapp/data/styles/default_point.sld
new file mode 100644
index 00000000000..38123cc2d8c
--- /dev/null
+++ b/src/main/webapp/data/styles/default_point.sld
@@ -0,0 +1,38 @@
+
+
+
+
+ default_point
+
+
+ Default Point
+ A sample style that draws a point
+
+
+
+
+ rule1
+ Red Square
+ A 6 pixel square with a red fill and no stroke
+
+
+
+ square
+
+ #FF0000
+
+
+ 6
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/data/styles/default_polygon.sld b/src/main/webapp/data/styles/default_polygon.sld
new file mode 100644
index 00000000000..5be5e7c6169
--- /dev/null
+++ b/src/main/webapp/data/styles/default_polygon.sld
@@ -0,0 +1,35 @@
+
+
+
+
+ default_polygon
+
+
+ Default Polygon
+ A sample style that draws a polygon
+
+
+
+
+ rule1
+ Gray Polygon with Black Outline
+ A polygon with a gray fill and a 1 pixel black outline
+
+
+ #AAAAAA
+
+
+ #000000
+ 1
+
+
+
+
+
+
+
diff --git a/src/main/webapp/data/styles/default_raster.sld b/src/main/webapp/data/styles/default_raster.sld
new file mode 100644
index 00000000000..77141c8ac11
--- /dev/null
+++ b/src/main/webapp/data/styles/default_raster.sld
@@ -0,0 +1,20 @@
+
+
+
+ raster_layer
+
+ raster
+ A boring default style
+ A sample style for rasters
+
+ Feature
+
+
+ 1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/data/styles/line.xml b/src/main/webapp/data/styles/line.xml
new file mode 100644
index 00000000000..b23eecfc1c7
--- /dev/null
+++ b/src/main/webapp/data/styles/line.xml
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/src/main/webapp/data/styles/point.xml b/src/main/webapp/data/styles/point.xml
new file mode 100644
index 00000000000..2a87021960e
--- /dev/null
+++ b/src/main/webapp/data/styles/point.xml
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/src/main/webapp/data/styles/polygon.xml b/src/main/webapp/data/styles/polygon.xml
new file mode 100644
index 00000000000..cf0c45de63c
--- /dev/null
+++ b/src/main/webapp/data/styles/polygon.xml
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/src/main/webapp/data/styles/raster.sld b/src/main/webapp/data/styles/raster.sld
new file mode 100644
index 00000000000..f25ecb8791a
--- /dev/null
+++ b/src/main/webapp/data/styles/raster.sld
@@ -0,0 +1,29 @@
+
+
+
+
+ default_raster
+
+
+ Default Raster
+ A sample style that draws a raster, good for displaying imagery
+
+
+
+
+ rule1
+ Opaque Raster
+ A raster with 100% opacity
+
+ 1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/data/styles/raster.xml b/src/main/webapp/data/styles/raster.xml
new file mode 100644
index 00000000000..1876e75caad
--- /dev/null
+++ b/src/main/webapp/data/styles/raster.xml
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/src/main/webapp/data/wcs.xml b/src/main/webapp/data/wcs.xml
new file mode 100644
index 00000000000..a651cd5a6b1
--- /dev/null
+++ b/src/main/webapp/data/wcs.xml
@@ -0,0 +1,37 @@
+
+ wcs
+ true
+ My GeoServer WCS
+ My GeoServer WCS
+ http://jira.codehaus.org/secure/BrowseProject.jspa?id=10311
+
+This is a description of your Web Coverage Server.
+
+ NONE
+ NONE
+
+
+ 1.0.0
+
+
+ 1.1.1
+
+
+
+ WCS
+ WMS
+ GEOSERVER
+
+
+ undef
+ http://geoserver.sourceforge.net/html/index.php
+ other
+
+ false
+ http://geoserver.org
+ http://schemas.opengis.net
+ false
+ false
+ 0
+ 0
+
\ No newline at end of file
diff --git a/src/main/webapp/data/wfs.xml b/src/main/webapp/data/wfs.xml
new file mode 100644
index 00000000000..61d78ff29d0
--- /dev/null
+++ b/src/main/webapp/data/wfs.xml
@@ -0,0 +1,64 @@
+
+ wfs
+ true
+ My GeoServer WFS
+ My GeoServer WFS
+ http://jira.codehaus.org/secure/BrowseProject.jspa?id=10311
+
+This is a description of your Web Feature Server.
+
+The GeoServer is a full transactional Web Feature Server, you may wish to limit
+GeoServer to a Basic service level to prevent modificaiton of your geographic
+data.
+
+ NONE
+ NONE
+
+
+ 1.0.0
+
+
+ 1.1.0
+
+
+ 2.0.0
+
+
+
+ WFS
+ WMS
+ GEOSERVER
+
+ false
+ http://geoserver.org
+ http://schemas.opengis.net
+ false
+
+
+ V_20
+
+ URN2
+ false
+
+
+
+ V_10
+
+ XML
+ true
+
+
+
+ V_11
+
+ URN
+ false
+
+
+
+ COMPLETE
+ 1000000
+ false
+ false
+ false
+
\ No newline at end of file
diff --git a/src/main/webapp/data/wms.xml b/src/main/webapp/data/wms.xml
new file mode 100644
index 00000000000..8e9da880e49
--- /dev/null
+++ b/src/main/webapp/data/wms.xml
@@ -0,0 +1,43 @@
+
+ wms
+ true
+ My GeoServer WMS
+ My GeoServer WMS
+ http://jira.codehaus.org/secure/BrowseProject.jspa?id=10311
+
+This is a description of your Web Map Server.
+
+ NONE
+ NONE
+
+
+ 1.1.1
+
+
+ 1.3.0
+
+
+
+ WFS
+ WMS
+ GEOSERVER
+
+ false
+ http://geoserver.org
+ http://schemas.opengis.net
+ false
+
+ true
+ Batik
+
+
+ false
+ BOT_RIGHT
+ 0
+
+ Nearest
+ 25
+ 0
+ 0
+ 0
+
\ No newline at end of file
diff --git a/src/main/webapp/data/workspaces/default.xml b/src/main/webapp/data/workspaces/default.xml
new file mode 100644
index 00000000000..c546bbc8dde
--- /dev/null
+++ b/src/main/webapp/data/workspaces/default.xml
@@ -0,0 +1,4 @@
+
+ WorkspaceInfoImpl-78ff667e:12476299803:-7fff
+ it.geosolutions
+
\ No newline at end of file
diff --git a/src/main/webapp/data/workspaces/it.geosolutions/namespace.xml b/src/main/webapp/data/workspaces/it.geosolutions/namespace.xml
new file mode 100644
index 00000000000..3c91439fad0
--- /dev/null
+++ b/src/main/webapp/data/workspaces/it.geosolutions/namespace.xml
@@ -0,0 +1,5 @@
+
+ NamespaceInfoImpl-78ff667e:12476299803:-8000
+ it.geosolutions
+ http://www.geo-solutions.it
+
\ No newline at end of file
diff --git a/src/main/webapp/data/workspaces/it.geosolutions/workspace.xml b/src/main/webapp/data/workspaces/it.geosolutions/workspace.xml
new file mode 100644
index 00000000000..c546bbc8dde
--- /dev/null
+++ b/src/main/webapp/data/workspaces/it.geosolutions/workspace.xml
@@ -0,0 +1,4 @@
+
+ WorkspaceInfoImpl-78ff667e:12476299803:-7fff
+ it.geosolutions
+
\ No newline at end of file
diff --git a/src/main/webapp/data/workspaces/topp/namespace.xml b/src/main/webapp/data/workspaces/topp/namespace.xml
new file mode 100644
index 00000000000..d3df0b9c12b
--- /dev/null
+++ b/src/main/webapp/data/workspaces/topp/namespace.xml
@@ -0,0 +1,5 @@
+
+ NamespaceInfoImpl-78ff667e:12476299803:-7ffe
+ topp
+ http://www.openplans.org/topp
+
\ No newline at end of file
diff --git a/src/main/webapp/data/workspaces/topp/workspace.xml b/src/main/webapp/data/workspaces/topp/workspace.xml
new file mode 100644
index 00000000000..8a5a01707c2
--- /dev/null
+++ b/src/main/webapp/data/workspaces/topp/workspace.xml
@@ -0,0 +1,4 @@
+
+ WorkspaceInfoImpl-78ff667e:12476299803:-7ffd
+ topp
+
\ No newline at end of file