Upgrade Apache Tomcat for VTN coordinator to 7.0.63. 55/25855/1
authorShigeru Yasuda <s-yasuda@da.jp.nec.com>
Mon, 24 Aug 2015 06:41:41 +0000 (15:41 +0900)
committerShigeru Yasuda <s-yasuda@da.jp.nec.com>
Mon, 24 Aug 2015 06:41:41 +0000 (15:41 +0900)
Other changes:

  * Fixed incorrect configuration for Tomcat access logging.

Change-Id: Ib2e38e3b6e2d95dca8ec2359a23379ffee4ab072
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
coordinator/dist/pom.xml
coordinator/java/tomcat/conf/catalina.properties
coordinator/java/tomcat/conf/server.xml
coordinator/java/tomcat/conf/web.xml

index a31c0fbe150df647f2588d66fc3a9922828b96ab..1c772648806fc9b3ab7d2f52a3973479559e09cf 100644 (file)
@@ -54,7 +54,7 @@
     <vtn.gson.version>2.2.2</vtn.gson.version>
     <vtn.json.version>20090211</vtn.json.version>
     <vtn.log4j.version>1.2.17</vtn.log4j.version>
-    <vtn.tomcat.version>7.0.56</vtn.tomcat.version>
+    <vtn.tomcat.version>7.0.63</vtn.tomcat.version>
     <vtn.commons.codec.version>1.9</vtn.commons.codec.version>
     <vtn.commons.net.version>3.3</vtn.commons.net.version>
     <vtn.postgresql.jdbc.version>9.2-1003-jdbc4</vtn.postgresql.jdbc.version>
index aaa47247cc83eb065009c1c30c0571357b5fc89d..cdc176ffe93593b04d352e91864297aac6a10d61 100644 (file)
@@ -19,8 +19,8 @@
 # passed to checkPackageAccess unless the
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
-
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,\
+org.apache.naming.resources.,org.apache.tomcat.
 #
 # List of comma-separated packages that start with or equal this string
 # will cause a security exception to be thrown when
@@ -31,8 +31,10 @@ package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,o
 # by default, no packages are restricted for definition, and none of
 # the class loaders supplied with the JDK call checkPackageDefinition.
 #
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
+org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
 
+#
 #
 # List of comma-separated paths defining the contents of the "common"
 # classloader. Prefixes should be used to define what is the repository type.
@@ -87,9 +89,10 @@ shared.loader=${catalina.home}/shared/lib,${catalina.home}/shared/lib/*.jar
 # - Jasper JARs
 # - Tomcat JARs
 # - Common non-Tomcat JARs
+# - Test JARs (JUnit, Cobertura and dependencies)
 tomcat.util.scan.DefaultJarScanner.jarsToSkip=\
 bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,\
-annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar,\
+annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar,websocket-api.jar,\
 catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-tribes.jar,\
 jasper.jar,jasper-el.jar,ecj-*.jar,\
 tomcat-api.jar,tomcat-util.jar,tomcat-coyote.jar,tomcat-dbcp.jar,\
@@ -97,16 +100,20 @@ tomcat-jni.jar,tomcat-spdy.jar,\
 tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\
 tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,\
 tomcat-jdbc.jar,\
+tools.jar,\
 commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,\
 commons-dbcp*.jar,commons-digester*.jar,commons-fileupload*.jar,\
 commons-httpclient*.jar,commons-io*.jar,commons-lang*.jar,commons-logging*.jar,\
 commons-math*.jar,commons-pool*.jar,\
-jstl.jar,\
+jstl.jar,taglibs-standard-spec-*.jar,\
 geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\
 ant.jar,ant-junit*.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\
-jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar,\
+jmx-tools.jar,jta*.jar,log4j.jar,log4j-1*.jar,mail*.jar,slf4j*.jar,\
 xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\
-junit.jar,junit-*.jar,ant-launcher.jar
+junit.jar,junit-*.jar,hamcrest*.jar,org.hamcrest*.jar,ant-launcher.jar,\
+cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar,\
+jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,\
+xom-*.jar
 
 # Additional JARs (over and above the default JARs listed above) to skip when
 # scanning for Servlet 3.0 pluggability features. These features include web
@@ -116,7 +123,7 @@ org.apache.catalina.startup.ContextConfig.jarsToSkip=
 
 # Additional JARs (over and above the default JARs listed above) to skip when
 # scanning for TLDs. The list must be a comma separated list of JAR file names.
-org.apache.catalina.startup.TldConfig.jarsToSkip=
+org.apache.catalina.startup.TldConfig.jarsToSkip=tomcat7-websocket.jar
 
 #
 # String cache configuration.
index 34938c4b0020a594c554e52148330064ad6ae3b5..5306b3621066553ad8a4666955d2dd52cd885bd3 100644 (file)
@@ -20,6 +20,7 @@
      Documentation at /docs/config/server.html
  -->
 <Server port="-1">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
   <!--APR library loader. Documentation at /docs/apr.html -->
   <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
 
@@ -69,7 +70,7 @@
         <Valve className="org.apache.catalina.valves.AccessLogValve"
                directory="${vtn.logdir}" prefix="access_log." suffix=".txt"
                fileDateFormat="yyyy-MM" resolveHosts="false"
-               pattern="%{yyyy-MM-dd HH:mm:ss.SSS z}t: %a %u &quot;%r&quot; %s %b %{org.opendaylight.vtn.unc.requestbody}r %{org.opendaylight.vtn.unc.errormessage}" />
+               pattern="%{yyyy-MM-dd HH:mm:ss.SSS z}t: %a %u &quot;%r&quot; %s %b %{org.opendaylight.vtn.unc.requestbody}r %{org.opendaylight.vtn.unc.errormessage}r" />
 
       </Host>
     </Engine>
index 696101a1ac4fe6f1030355df1df61c8d851f4b32..7a4229dfb4babd07d3a368ef066e590e1acea07c 100644 (file)
   <!--                       globalXsltFile[null]                           -->
   <!--                                                                      -->
   <!--   globalXsltFile      Site wide configuration version of             -->
-  <!--                       localXsltFile This argument is expected        -->
-  <!--                       to be a physical file. [null]                  -->
-  <!--                                                                      -->
+  <!--                       localXsltFile. This argument must either be an -->
+  <!--                       absolute or relative (to either                -->
+  <!--                       $CATALINA_BASE/conf or $CATALINA_HOME/conf)    -->
+  <!--                       path that points to a location below either    -->
+  <!--                       $CATALINA_BASE/conf (checked first) or         -->
+  <!--                       $CATALINA_HOME/conf (checked second).[null]    -->
   <!--                                                                      -->
+  <!--   showServerInfo      Should server information be presented in the  -->
+  <!--                       response sent to clients when directory        -->
+  <!--                       listings is enabled? [true]                    -->
 
     <servlet>
         <servlet-name>default</servlet-name>
   <!--                                                                      -->
   <!--   cgiPathPrefix        The CGI search path will start at             -->
   <!--                        webAppRootDir + File.separator + this prefix. -->
-  <!--                        [WEB-INF/cgi]                                 -->
+  <!--                        If not set, then webAppRootDir is used.       -->
+  <!--                        Recommended value: WEB-INF/cgi                -->
   <!--                                                                      -->
   <!--   debug                Debugging detail level for messages logged    -->
   <!--                        by this servlet.  [0]                         -->
 
   <!-- ================== Built In Filter Definitions ===================== -->
 
+  <!-- A filter that sets various security related HTTP Response headers.   -->
+  <!-- This filter supports the following initialization parameters         -->
+  <!-- (default values are in square brackets):                             -->
+  <!--                                                                      -->
+  <!--   hstsEnabled         Should the HTTP Strict Transport Security      -->
+  <!--                       (HSTS) header be added to the response? See    -->
+  <!--                       RFC 6797 for more information on HSTS. [true]  -->
+  <!--                                                                      -->
+  <!--   hstsMaxAgeSeconds   The max age value that should be used in the   -->
+  <!--                       HSTS header. Negative values will be treated   -->
+  <!--                       as zero. [0]                                   -->
+  <!--                                                                      -->
+  <!--   hstsIncludeSubDomains                                              -->
+  <!--                       Should the includeSubDomains parameter be      -->
+  <!--                       included in the HSTS header.                   -->
+  <!--                                                                      -->
+  <!--   antiClickJackingEnabled                                            -->
+  <!--                       Should the anti click-jacking header           -->
+  <!--                       X-Frame-Options be added to every response?    -->
+  <!--                       [true]                                         -->
+  <!--                                                                      -->
+  <!--   antiClickJackingOption                                             -->
+  <!--                       What value should be used for the header. Must -->
+  <!--                       be one of DENY, SAMEORIGIN, ALLOW-FROM         -->
+  <!--                       (case-insensitive). [DENY]                     -->
+  <!--                                                                      -->
+  <!--   antiClickJackingUri IF ALLOW-FROM is used, what URI should be      -->
+  <!--                       allowed? []                                    -->
+  <!--                                                                      -->
+  <!--   blockContentTypeSniffingEnabled                                    -->
+  <!--                       Should the header that blocks content type     -->
+  <!--                       sniffing be added to every response? [true]    -->
+<!--
+    <filter>
+        <filter-name>httpHeaderSecurity</filter-name>
+        <filter-class>org.apache.catalina.filters.HttpHeaderSecurityFilter</filter-class>
+        <async-supported>true</async-supported>
+    </filter>
+-->
+
   <!-- A filter that sets character encoding that is used to decode -->
   <!-- parameters in a POST request -->
 <!--
 
   <!-- ==================== Built In Filter Mappings ====================== -->
 
+  <!-- The mapping for the HTTP header security Filter -->
+<!--
+    <filter-mapping>
+        <filter-name>httpHeaderSecurity</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>
+-->
+
   <!-- The mapping for the Set Character Encoding Filter -->
 <!--
     <filter-mapping>