You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2019/12/16 22:43:04 UTC
[tomee-tck] branch master updated: Adding Tomcat settings,
setting version number
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
The following commit(s) were added to refs/heads/master by this push:
new a7a394b Adding Tomcat settings, setting version number
a7a394b is described below
commit a7a394b93b50e2387b43ddd41ccee7af7c829cad
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Mon Dec 16 22:41:46 2019 +0000
Adding Tomcat settings, setting version number
---
pom.xml | 10 +++++-----
src/test/tomee-plume/conf/context.xml | 31 +++++++++++++++++++++++++++++
src/test/tomee-plume/conf/server.xml | 16 +++++++++------
src/test/tomee-plume/conf/system.properties | 5 +++++
4 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 91d7693..355810b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>openejb-tck</artifactId>
<name>OpenEJB TCK Harness</name>
- <version>8.0.0-SNAPSHOT</version>
+ <version>8.0.1-SNAPSHOT</version>
<description>
OpenEJB TCK Harness
@@ -38,10 +38,10 @@
<properties>
<openejb.groupId>org.apache.tomee</openejb.groupId>
- <openejb.version>8.0.0-SNAPSHOT</openejb.version>
- <tomee.version>8.0.0-SNAPSHOT</tomee.version>
+ <openejb.version>8.0.1-SNAPSHOT</openejb.version>
+ <tomee.version>8.0.1-SNAPSHOT</tomee.version>
- <tomcat.version>9.0.22</tomcat.version>
+ <tomcat.version>9.0.30</tomcat.version>
<derby.version>10.7.1.1</derby.version>
@@ -1029,4 +1029,4 @@
</pluginRepository>
</pluginRepositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/test/tomee-plume/conf/context.xml b/src/test/tomee-plume/conf/context.xml
new file mode 100644
index 0000000..023c798
--- /dev/null
+++ b/src/test/tomee-plume/conf/context.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- The contents of this file will be loaded for each web application -->
+<Context crossContext="true" resourceOnlyServlets="jsp">
+ <CookieProcessor className="org.apache.tomcat.util.http.LegacyCookieProcessor" alwaysAddExpires="true" forwardSlashIsSeparator="false" />
+ <!-- Default set of monitored resources. If one of these changes, the -->
+ <!-- web application will be reloaded. -->
+ <WatchedResource>WEB-INF/web.xml</WatchedResource>
+ <WatchedResource>WEB-INF/tomcat-web.xml</WatchedResource>
+ <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
+
+ <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+ <!--
+ <Manager pathname="" />
+ -->
+</Context>
diff --git a/src/test/tomee-plume/conf/server.xml b/src/test/tomee-plume/conf/server.xml
index 3b80e3e..ec3910b 100644
--- a/src/test/tomee-plume/conf/server.xml
+++ b/src/test/tomee-plume/conf/server.xml
@@ -70,7 +70,9 @@
-->
<Connector port="%webcontainer.default.port%" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="%webcontainer.default.ssl.port%"/>
+ redirectPort="%webcontainer.default.ssl.port%">
+ <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+ </Connector>
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
@@ -82,11 +84,13 @@
This connector uses the JSSE configuration, when using APR, the
connector should be using the OpenSSL style configuration
described in the APR documentation -->
- <Connector port="%webcontainer.default.ssl.port%" protocol="HTTP/1.1" SSLEnabled="true"
- maxThreads="150" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS"
- keystoreFile="conf/clientcert.jks" keystorePass="changeit" keyAlias="cts"
- truststoreFile="conf/ssl-truststore" truststorePass="changeit"/>
+ <Connector port="%webcontainer.default.ssl.port%" protocol="HTTP/1.1" SSLEnabled="true">
+ <SSLHostConfig truststoreFile="conf/cacerts.jks">
+ <Certificate certificateKeystoreFile="conf/clientcert.jks"
+ certificateKeystorePassword="changeit"
+ type="RSA" />
+ </SSLHostConfig>
+ </Connector>
<!-- Define an AJP 1.3 Connector on port 8009 -->
<!-- <Connector port="%tomee.ajp.port%" protocol="AJP/1.3" redirectPort="%tomee.ssl.port%" /> -->
diff --git a/src/test/tomee-plume/conf/system.properties b/src/test/tomee-plume/conf/system.properties
index 690f982..91de084 100644
--- a/src/test/tomee-plume/conf/system.properties
+++ b/src/test/tomee-plume/conf/system.properties
@@ -15,6 +15,11 @@
# limitations under the License.
#
+org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true
+org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR=false
+user.language=en
+user.country=US
+
openejb.system.apps=true
openejb.deployments.classpath=true
tomee.remote.support=true