updated data dir after geoserver 2.5.4 first run

.gitignore

@@ -1,3 +1,3 @@
-logs
+logs/geoserver*.log
 temp
 gwc

csw/MD_Metadata.properties

@@ -0,0 +1,10 @@
+@fileIdentifier.CharacterString=if_then_else(isNull(prefixedName), name, prefixedName)
+identificationInfo.AbstractMD_Identification.citation.CI_Citation.title.CharacterString=if_then_else(isNull(title), name, name)
+identificationInfo.AbstractMD_Identification.descriptiveKeywords.MD_Keywords.keyword.CharacterString=keywords
+identificationInfo.AbstractMD_Identification.abstract.CharacterString=abstract
+$dateStamp.Date= if_then_else ( isNull("metadata.date") , 'Unknown', "metadata.date")
+hierarchyLevel.MD_ScopeCode.@codeListValue='http://purl.org/dc/dcmitype/Dataset'
+$contact.CI_ResponsibleParty.individualName.CharacterString='GeoServer'
+distributionInfo.MD_Distribution.transferOptions.MD_DigitalTransferOptions.onLine.CI_OnlineResource%.linkage.URL=list('${url.wfs}','${url.wms}')
+distributionInfo.MD_Distribution.transferOptions.MD_DigitalTransferOptions.onLine.CI_OnlineResource%.protocol.CharacterString=list('OGC:WFS','OGC:WMS')
+distributionInfo.MD_Distribution.transferOptions.MD_DigitalTransferOptions.onLine.CI_OnlineResource%.name.CharacterString=name

csw/Record.properties

@@ -0,0 +1,18 @@
+@identifier.value=if_then_else(isNull(prefixedName), name, prefixedName)
+title.value=if_then_else(isNull(title), name, name)
+creator.value='GeoServer Catalog'
+subject.value=keywords
+abstract.value=abstract
+description.value=description
+date.value="metadata.date"
+type.value='http://purl.org/dc/dcmitype/Dataset'
+references.scheme='OGC:WMS'
+references.value=strConcat('${url.wms}?service=WMS&request=GetMap&layers=', prefixedName)
+#publisher.value=
+#format.value=
+#language.value=
+#coverage.value=
+#source.value=
+#relation.value=
+#rights.value=
+#contributor.value=

global.xml

@@ -21,6 +21,7 @@
     <pngAcceleration>true</pngAcceleration>
     <jpegAcceleration>true</jpegAcceleration>
     <allowNativeMosaic>false</allowNativeMosaic>
+    <allowNativeWarp>false</allowNativeWarp>
   </jai>
   <coverageAccess>
     <maxPoolSize>10</maxPoolSize>
@@ -29,10 +30,9 @@
     <queueType>UNBOUNDED</queueType>
     <imageIOCacheThreshold>10240</imageIOCacheThreshold>
   </coverageAccess>
-  <charset>UTF-8</charset>
-  <numDecimals>8</numDecimals>
-  <onlineResource>http://geoserver.org</onlineResource>
-  <verbose>false</verbose>
-  <verboseExceptions>false</verboseExceptions>
   <updateSequence>0</updateSequence>
-</global>
+  <featureTypeCacheSize>0</featureTypeCacheSize>
+  <globalServices>true</globalServices>
+  <xmlPostRequestLogBufferSize>1024</xmlPostRequestLogBufferSize>
+  <xmlExternalEntitiesEnabled>false</xmlExternalEntitiesEnabled>
+</global>

gwc-gs.xml

@@ -0,0 +1,27 @@
+<GeoServerGWCConfig>
+  <version>1.0.0</version>
+  <directWMSIntegrationEnabled>false</directWMSIntegrationEnabled>
+  <WMSCEnabled>true</WMSCEnabled>
+  <WMTSEnabled>true</WMTSEnabled>
+  <TMSEnabled>true</TMSEnabled>
+  <securityEnabled>false</securityEnabled>
+  <cacheLayersByDefault>false</cacheLayersByDefault>
+  <cacheNonDefaultStyles>false</cacheNonDefaultStyles>
+  <metaTilingX>4</metaTilingX>
+  <metaTilingY>4</metaTilingY>
+  <gutter>0</gutter>
+  <defaultCachingGridSetIds>
+    <string>EPSG:4326</string>
+    <string>EPSG:900913</string>
+  </defaultCachingGridSetIds>
+  <defaultCoverageCacheFormats>
+    <string>image/jpeg</string>
+  </defaultCoverageCacheFormats>
+  <defaultVectorCacheFormats>
+    <string>image/png</string>
+  </defaultVectorCacheFormats>
+  <defaultOtherCacheFormats>
+    <string>image/png</string>
+    <string>image/jpeg</string>
+  </defaultOtherCacheFormats>
+</GeoServerGWCConfig>

logging.xml

@@ -1,5 +1,5 @@
 <logging>
   <level>DEFAULT_LOGGING.properties</level>
-  <location>logs/geoserver.log</location>
-  <stdOutLogging>true</stdOutLogging>
+  <location>/tmp/geoserver.log</location>
+  <stdOutLogging>false</stdOutLogging>
 </logging>

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

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

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

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

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

security/filter/proxy/config.xml

@@ -2,7 +2,7 @@
   <id>-e3457ae:13cce0c47c6:-7fef</id>
   <name>proxy</name>
   <className>org.geoserver.security.filter.GeoServerRequestHeaderAuthenticationFilter</className>
-  <roleSource>Header</roleSource>
+  <roleSource class="org.geoserver.security.config.PreAuthenticatedUserNameFilterConfig$PreAuthenticatedUserNameRoleSource">Header</roleSource>
   <rolesHeaderAttribute>sec-roles</rolesHeaderAttribute>
   <principalHeaderAttribute>sec-username</principalHeaderAttribute>
 </requestHeaderAuthentication>

w3ds.xml

@@ -0,0 +1,8 @@
+<w3ds>
+  <id>w3ds</id>
+  <enabled>false</enabled>
+  <name>W3DS</name>
+  <citeCompliant>false</citeCompliant>
+  <schemaBaseURL>http://schemas.opengis.net</schemaBaseURL>
+  <verbose>false</verbose>
+</w3ds>

wms.xml

@@ -37,6 +37,8 @@ This is a description of your Web Map Server.
     <transparency>0</transparency>
   </watermark>
   <interpolation>Nearest</interpolation>
+  <getFeatureInfoMimeTypeCheckingEnabled>false</getFeatureInfoMimeTypeCheckingEnabled>
+  <getMapMimeTypeCheckingEnabled>false</getMapMimeTypeCheckingEnabled>
   <maxBuffer>25</maxBuffer>
   <maxRequestMemory>65536</maxRequestMemory>
   <maxRenderingTime>60</maxRenderingTime>

wps.xml

@@ -0,0 +1,39 @@
+<wps>
+  <id>WPSInfoImpl--cde8a83:14af8a9cd9b:-7fff</id>
+  <enabled>true</enabled>
+  <name>WPS</name>
+  <versions>
+    <org.geotools.util.Version>
+      <version>1.0.0</version>
+    </org.geotools.util.Version>
+  </versions>
+  <citeCompliant>false</citeCompliant>
+  <schemaBaseURL>http://schemas.opengis.net</schemaBaseURL>
+  <verbose>false</verbose>
+  <connectionTimeout>30.0</connectionTimeout>
+  <resourceExpirationTimeout>300</resourceExpirationTimeout>
+  <maxSynchronousProcesses>8</maxSynchronousProcesses>
+  <maxAsynchronousProcesses>8</maxAsynchronousProcesses>
+  <processGroups>
+    <processGroup>
+      <factoryClass>org.geoserver.wps.DeprecatedProcessFactory</factoryClass>
+      <enabled>true</enabled>
+    </processGroup>
+    <processGroup>
+      <factoryClass>org.geoserver.wps.jts.SpringBeanProcessFactory</factoryClass>
+      <enabled>true</enabled>
+    </processGroup>
+    <processGroup>
+      <factoryClass>org.geotools.process.geometry.GeometryProcessFactory</factoryClass>
+      <enabled>true</enabled>
+    </processGroup>
+    <processGroup>
+      <factoryClass>org.geotools.process.raster.RasterProcessFactory</factoryClass>
+      <enabled>true</enabled>
+    </processGroup>
+    <processGroup>
+      <factoryClass>org.geotools.process.vector.VectorProcessFactory</factoryClass>
+      <enabled>true</enabled>
+    </processGroup>
+  </processGroups>
+</wps>

www/inspire/inspire_vs.xsd

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+08-FEB-2011 Changed Extended Capabilities type name
+31-JAN-2011 Removed language dependent schema implementations
+20-DEC-2010 Removed unnecessary srv namespace declaration.
+					Restored inspire_vs alias
+16-DEC-2010 Switched to INSPIRE Schema
+-->
+<schema xmlns:inspire_vs="http://inspire.ec.europa.eu/schemas/inspire_vs/1.0" xmlns:inspire_com="http://inspire.ec.europa.eu/schemas/common/1.0" xmlns:wms="http://www.opengis.net/wms" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" targetNamespace="http://inspire.ec.europa.eu/schemas/inspire_vs/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.0">
+	<import namespace="http://www.opengis.net/wms" schemaLocation="http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd"/>
+	<import namespace="http://inspire.ec.europa.eu/schemas/common/1.0" schemaLocation="http://inspire.ec.europa.eu/schemas/common/1.0/common.xsd"/>
+	<element name="ExtendedCapabilities" type="inspire_com:ExtendedCapabilitiesType" substitutionGroup="wms:_ExtendedCapabilities"/>
+</schema>