This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch jakartaee9-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit 53613104e78fea33adb8a6ed53dbc7b70aea54ed
Author: Jean-Louis Monteiro <jlmonte...@tomitribe.com>
AuthorDate: Fri Jan 22 09:53:57 2021 +0100
Align with Jakarta EE Branch (aka master)
---
pom.xml | 14 +-
.../org/apache/openejb/cts/DeploymentImpl.java | 5 +-
src/test/resources/ts.jtx | 40 +++
.../openejb/tck/commands/JavaTestCommand.groovy | 16 +-
.../openejb/tck/commands/SetupCommand.groovy | 3 +
src/test/tomee-plume/conf/catalina.policy | 275 +++++++++++++++++++++
src/test/tomee-plume/conf/context.xml | 4 +
src/test/tomee-plume/conf/server.xml | 3 +-
src/test/tomee-plume/conf/system.properties | 10 +
src/test/tomee-plus/conf/jaspic-providers.xml | 38 +--
src/test/tomee-plus/conf/server.xml | 1 +
src/test/tomee-plus/conf/system.properties | 6 +-
src/test/tomee/conf/jaspic-providers.xml | 42 ----
src/test/tomee/conf/server.xml | 1 +
src/test/tomee/conf/system.properties | 6 +-
15 files changed, 363 insertions(+), 101 deletions(-)
diff --git a/pom.xml b/pom.xml
index 62bff0f..39e5f58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
<tomcat.version>10.0.0-M10</tomcat.version>
- <johnzon.version>1.2.9-SNAPSHOT</johnzon.version>
+ <johnzon.version>1.2.9</johnzon.version>
<derby.version>10.14.2.0</derby.version>
<!--
@@ -106,7 +106,7 @@
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
- <version>4.0.0-RC2</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
@@ -141,14 +141,6 @@
<artifactId>geronimo-connector</artifactId>
<version>3.1.4</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jsonp-strict</artifactId>
- <version>${johnzon.version}</version>
- <classifier>jakarta</classifier>
- </dependency>
-
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
@@ -851,7 +843,7 @@
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<excludeTransitive>true</excludeTransitive>
-
<includeArtifactIds>tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,johnzon-jsonp-strict</includeArtifactIds>
+
<includeArtifactIds>tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient</includeArtifactIds>
</configuration>
</execution>
</executions>
diff --git a/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
b/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
index 970cb59..d4895a2 100644
--- a/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
+++ b/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
@@ -60,8 +60,7 @@ public class DeploymentImpl implements TSDeploymentInterface2
{
Properties overrides = new Properties();
String containerJavaHome = System.getProperty("container.java.home");
String containerJavaVersion =
System.getProperty("container.java.version");
- String containerJavaOpts = System.getProperty("container.java.opts",
"-Dopenejb.deployer.jndiname=openejb/DeployerBusinessRemote");
- // String containerJavaOpts =
System.getProperty("container.java.opts",
"-Djava.security.properties=conf/security.properties
-Dopenejb.deployer.jndiname=openejb/DeployerBusinessRemote");
+ String containerJavaOpts = System.getProperty("container.java.opts");
if (containerJavaVersion != null) {
overrides.put("java.version", containerJavaVersion);
}
@@ -71,7 +70,7 @@ public class DeploymentImpl implements TSDeploymentInterface2
{
}
if (containerJavaOpts != null) {
- overrides.put("java.opts", containerJavaOpts);
+ overrides.put("java.opts", containerJavaOpts + "
-Dopenejb.deployer.jndiname=openejb/DeployerBusinessRemote");
}
final RemoteServer remoteServer = new RemoteServer(overrides, 250,
true);
diff --git a/src/test/resources/ts.jtx b/src/test/resources/ts.jtx
index bdfec8d..cefd02b 100644
--- a/src/test/resources/ts.jtx
+++ b/src/test/resources/ts.jtx
@@ -14,6 +14,46 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#
+########################################################################################################################
+#
+# Apache TomEE excludes
+#
+# This complements what's already provided in the CTS by default when
challenges are accepted.
+
+################
+# Servlet
+################
+
+# TCK has a bug when formatting the HTTP request
+# It's been fixed in Jakarta EE 9 with
https://github.com/eclipse-ee4j/jakartaee-tck/commit/ae4c10127a41b08e51969e25d6bffe7ace753981
+# The following 2 tests won't pass unless we force at the JVM level
-Dline.separator=\r\n
+# They already pass on Jakarta EE 9 with TomEE 9
+com/sun/ts/tests/servlet/api/javax_servlet_http/part/URLClient.java#getHeadersTest
+com/sun/ts/tests/servlet/api/javax_servlet_http/part/URLClient.java#getHeaderTest
+com/sun/ts/tests/servlet/api/javax_servlet_http/part/URLClient.java#getInputStreamTest
+com/sun/ts/tests/servlet/api/javax_servlet_http/part/URLClient.java#getPartsTest
+com/sun/ts/tests/servlet/api/javax_servlet_http/part/URLClient.java#getPartsTest1
+com/sun/ts/tests/servlet/api/javax_servlet_http/part/URLClient.java#getPartTest
+com/sun/ts/tests/servlet/api/javax_servlet_http/part/URLClient.java#getPartTest1
+com/sun/ts/tests/servlet/api/javax_servlet_http/part1/URLClient.java#getHeadersTest
+com/sun/ts/tests/servlet/api/javax_servlet_http/part1/URLClient.java#getHeaderTest
+com/sun/ts/tests/servlet/api/javax_servlet_http/part1/URLClient.java#getInputStreamTest
+com/sun/ts/tests/servlet/api/javax_servlet_http/part1/URLClient.java#getPartsTest
+com/sun/ts/tests/servlet/api/javax_servlet_http/part1/URLClient.java#getPartsTest1
+com/sun/ts/tests/servlet/api/javax_servlet_http/part1/URLClient.java#getPartTest
+com/sun/ts/tests/servlet/api/javax_servlet_http/part1/URLClient.java#getPartTest1
+
+# TCK has a bug with the context path
+# It's been fixed already in Jakarta EE 9 with
https://github.com/eclipse-ee4j/jakartaee-tck/pull/126
+com/sun/ts/tests/servlet/spec/security/denyUncovered/Client.java#testAccessToMethodAllowed
+com/sun/ts/tests/servlet/spec/security/denyUncovered/Client.java#testAllMethodsAllowedAnno
+com/sun/ts/tests/servlet/spec/security/denyUncovered/Client.java#testDenySomeUncovered
+com/sun/ts/tests/servlet/spec/security/denyUncovered/Client.java#testExcludeAuthConstraint
+com/sun/ts/tests/servlet/spec/security/denyUncovered/Client.java#testPartialDDServlet
+
+# End Apache TomEE excludes
+########################################################################################################################
+
# Exclude list for CTS 8
################
diff --git a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
index 084576b..8352e08 100644
--- a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
+++ b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
@@ -227,10 +227,22 @@ class JavaTestCommand
def containerJavaVersion = get('container.java.version')
if (containerJavaVersion != null) {
log.info("Using java version (container)
${containerJavaVersion}")
- jvmarg(value:
"-Dcontainer.java.version=${containerJavaVersion}")
}
- def containerJavaOpts = get('container.java.opts')
+ def containerJavaOpts = get('container.java.opts', "")
+ if (options.contains('security')) {
+ log.info("Enabling server security manager")
+
+ // -Djava.security.properties=conf/security.properties
+ containerJavaOpts += "-Djava.security.manager
-Djava.security.policy==${project.basedir}/${openejbHome}/conf/catalina.policy"
+ }
+ if (options.contains('websocket')) {
+ log.info("Enabling Tomcat WebSockets configuration")
+ containerJavaOpts +=
"-Dorg.apache.tomcat.websocket.DISABLE_BUILTIN_EXTENSIONS=true " +
+
"-Dorg.apache.tomcat.websocket.ALLOW_UNSUPPORTED_EXTENSIONS=true " +
+
"-Dorg.apache.tomcat.websocket.STRICT_SPEC_COMPLIANCE=true " +
+
"-Dorg.apache.tomcat.websocket.DEFAULT_PROCESS_PERIOD=0"
+ }
if (containerJavaOpts != null) {
log.info("Using java opts (container)
${containerJavaOpts}")
jvmarg(value: "-Dcontainer.java.opts=${containerJavaOpts}")
diff --git a/src/test/script/openejb/tck/commands/SetupCommand.groovy
b/src/test/script/openejb/tck/commands/SetupCommand.groovy
index 2e5eb08..67399f4 100644
--- a/src/test/script/openejb/tck/commands/SetupCommand.groovy
+++ b/src/test/script/openejb/tck/commands/SetupCommand.groovy
@@ -342,6 +342,9 @@ class SetupCommand
fileset(dir:
"${javaeeCtsHome}/dist/com/sun/ts/tests/common/connector/whitebox/multianno") {
include(name: "whitebox*.rar")
}
+ fileset(dir:
"${javaeeCtsHome}/dist/com/sun/ts/tests/common/connector/whitebox/permissiondd")
{
+ include(name: "whitebox*.rar")
+ }
}
}
diff --git a/src/test/tomee-plume/conf/catalina.policy
b/src/test/tomee-plume/conf/catalina.policy
new file mode 100644
index 0000000..c18010f
--- /dev/null
+++ b/src/test/tomee-plume/conf/catalina.policy
@@ -0,0 +1,275 @@
+// 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.
+
+// ============================================================================
+// catalina.policy - Security Policy Permissions for Tomcat
+//
+// This file contains a default set of security policies to be enforced (by the
+// JVM) when Catalina is executed with the "-security" option. In addition
+// to the permissions granted here, the following additional permissions are
+// granted to each web application:
+//
+// * Read access to the web application's document root directory
+// * Read, write and delete access to the web application's working directory
+// ============================================================================
+
+
+// ========== SYSTEM CODE PERMISSIONS =========================================
+
+
+// These permissions apply to javac
+grant codeBase "file:${java.home}/lib/-" {
+ permission java.security.AllPermission;
+};
+
+// These permissions apply to all shared system extensions
+grant codeBase "file:${java.home}/jre/lib/ext/-" {
+ permission java.security.AllPermission;
+};
+
+// These permissions apply to javac when ${java.home} points at $JAVA_HOME/jre
+grant codeBase "file:${java.home}/../lib/-" {
+ permission java.security.AllPermission;
+};
+
+// These permissions apply to all shared system extensions when
+// ${java.home} points at $JAVA_HOME/jre
+grant codeBase "file:${java.home}/lib/ext/-" {
+ permission java.security.AllPermission;
+};
+
+
+// ========== CATALINA CODE PERMISSIONS =======================================
+
+
+// These permissions apply to the daemon code
+grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {
+ permission java.security.AllPermission;
+};
+
+// These permissions apply to the logging API
+// Note: If tomcat-juli.jar is in ${catalina.base} and not in ${catalina.home},
+// update this section accordingly.
+// grant codeBase "file:${catalina.base}/bin/tomcat-juli.jar" {..}
+grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
+ permission java.io.FilePermission
+
"${java.home}${file.separator}lib${file.separator}logging.properties", "read";
+
+ permission java.io.FilePermission
+
"${catalina.base}${file.separator}conf${file.separator}logging.properties",
"read";
+ permission java.io.FilePermission
+ "${catalina.base}${file.separator}logs", "read, write";
+ permission java.io.FilePermission
+ "${catalina.base}${file.separator}logs${file.separator}*", "read,
write, delete";
+
+ permission java.lang.RuntimePermission "shutdownHooks";
+ permission java.lang.RuntimePermission "getClassLoader";
+ permission java.lang.RuntimePermission "setContextClassLoader";
+
+ permission java.lang.management.ManagementPermission "monitor";
+
+ permission java.util.logging.LoggingPermission "control";
+
+ permission java.util.PropertyPermission
"java.util.logging.config.class", "read";
+ permission java.util.PropertyPermission
"java.util.logging.config.file", "read";
+ permission java.util.PropertyPermission
"org.apache.juli.AsyncLoggerPollInterval", "read";
+ permission java.util.PropertyPermission
"org.apache.juli.AsyncMaxRecordCount", "read";
+ permission java.util.PropertyPermission
"org.apache.juli.AsyncOverflowDropType", "read";
+ permission java.util.PropertyPermission
"org.apache.juli.ClassLoaderLogManager.debug", "read";
+ permission java.util.PropertyPermission "catalina.base", "read";
+
+ // Note: To enable per context logging configuration, permit read
access to
+ // the appropriate file. Be sure that the logging configuration is
+ // secure before enabling such access.
+ // E.g. for the examples web application (uncomment and unwrap
+ // the following to be on a single line):
+ // permission java.io.FilePermission "${catalina.base}${file.separator}
+ // webapps${file.separator}examples${file.separator}WEB-INF
+ // ${file.separator}classes${file.separator}logging.properties",
"read";
+};
+
+// These permissions apply to the server startup code
+grant codeBase "file:${catalina.home}/bin/bootstrap.jar" {
+ permission java.security.AllPermission;
+};
+
+// These permissions apply to the servlet API classes
+// and those that are shared across all class loaders
+// located in the "lib" directory
+grant codeBase "file:${catalina.home}/lib/-" {
+ permission java.security.AllPermission;
+};
+
+
+// If using a per instance lib directory, i.e. ${catalina.base}/lib,
+// then the following permission will need to be uncommented
+// grant codeBase "file:${catalina.base}/lib/-" {
+// permission java.security.AllPermission;
+// };
+
+
+// ========== WEB APPLICATION PERMISSIONS =====================================
+
+
+// These permissions are granted by default to all web applications
+// In addition, a web application will be given a read FilePermission
+// for all files and directories in its document root.
+grant {
+ // Required for JNDI lookup of named JDBC DataSource's and
+ // javamail named MimePart DataSource used to send mail
+ permission java.util.PropertyPermission "java.home", "read";
+ permission java.util.PropertyPermission "java.naming.*", "read";
+ permission java.util.PropertyPermission "javax.sql.*", "read";
+
+ // OS Specific properties to allow read access
+ permission java.util.PropertyPermission "os.name", "read";
+ permission java.util.PropertyPermission "os.version", "read";
+ permission java.util.PropertyPermission "os.arch", "read";
+ permission java.util.PropertyPermission "file.separator", "read";
+ permission java.util.PropertyPermission "path.separator", "read";
+ permission java.util.PropertyPermission "line.separator", "read";
+
+ // JVM properties to allow read access
+ permission java.util.PropertyPermission "java.version", "read";
+ permission java.util.PropertyPermission "java.vendor", "read";
+ permission java.util.PropertyPermission "java.vendor.url", "read";
+ permission java.util.PropertyPermission "java.class.version", "read";
+ permission java.util.PropertyPermission "java.specification.version",
"read";
+ permission java.util.PropertyPermission "java.specification.vendor",
"read";
+ permission java.util.PropertyPermission "java.specification.name", "read";
+
+ permission java.util.PropertyPermission "java.vm.specification.version",
"read";
+ permission java.util.PropertyPermission "java.vm.specification.vendor",
"read";
+ permission java.util.PropertyPermission "java.vm.specification.name",
"read";
+ permission java.util.PropertyPermission "java.vm.version", "read";
+ permission java.util.PropertyPermission "java.vm.vendor", "read";
+ permission java.util.PropertyPermission "java.vm.name", "read";
+
+ // Required for OpenJMX
+ permission java.lang.RuntimePermission "getAttribute";
+
+ // Allow read of JAXP compliant XML parser debug
+ permission java.util.PropertyPermission "jaxp.debug", "read";
+
+ // All JSPs need to be able to read this package
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.tomcat";
+
+ // Precompiled JSPs need access to these packages.
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.jasper.el";
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.jasper.runtime";
+ permission java.lang.RuntimePermission
+ "accessClassInPackage.org.apache.jasper.runtime.*";
+
+ // Applications using WebSocket need to be able to access these packages
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.tomcat.websocket";
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.tomcat.websocket.server";
+};
+
+
+// The Manager application needs access to the following packages to support
the
+// session display functionality. It also requires the custom Tomcat
+// DeployXmlPermission to enable the use of META-INF/context.xml
+// These settings support the following configurations:
+// - default CATALINA_HOME == CATALINA_BASE
+// - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE
+// - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME
+grant codeBase "file:${catalina.base}/webapps/manager/-" {
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina";
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.ha.session";
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.manager";
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.manager.util";
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.util";
+ permission org.apache.catalina.security.DeployXmlPermission "manager";
+};
+grant codeBase "file:${catalina.home}/webapps/manager/-" {
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina";
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.ha.session";
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.manager";
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.manager.util";
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.util";
+ permission org.apache.catalina.security.DeployXmlPermission "manager";
+};
+
+// The Host Manager application needs the custom Tomcat DeployXmlPermission to
+// enable the use of META-INF/context.xml
+// These settings support the following configurations:
+// - default CATALINA_HOME == CATALINA_BASE
+// - CATALINA_HOME != CATALINA_BASE, per instance Host Manager in CATALINA_BASE
+// - CATALINA_HOME != CATALINA_BASE, shared Host Manager in CATALINA_HOME
+grant codeBase "file:${catalina.base}/webapps/host-manager/-" {
+ permission org.apache.catalina.security.DeployXmlPermission "host-manager";
+};
+grant codeBase "file:${catalina.home}/webapps/host-manager/-" {
+ permission org.apache.catalina.security.DeployXmlPermission "host-manager";
+};
+
+
+// You can assign additional permissions to particular web applications by
+// adding additional "grant" entries here, based on the code base for that
+// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files.
+//
+// Different permissions can be granted to JSP pages, classes loaded from
+// the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/
+// directory, or even to individual jar files in the /WEB-INF/lib/ directory.
+//
+// For instance, assume that the standard "examples" application
+// included a JDBC driver that needed to establish a network connection to the
+// corresponding database and used the scrape taglib to get the weather from
+// the NOAA web server. You might create a "grant" entries like this:
+//
+// The permissions granted to the context root directory apply to JSP pages.
+// grant codeBase "file:${catalina.base}/webapps/examples/-" {
+// permission java.net.SocketPermission "dbhost.mycompany.com:5432",
"connect";
+// permission java.net.SocketPermission "*.noaa.gov:80", "connect";
+// };
+//
+// The permissions granted to the context WEB-INF/classes directory
+// grant codeBase "file:${catalina.base}/webapps/examples/WEB-INF/classes/-" {
+// };
+//
+// The permission granted to your JDBC driver
+// grant codeBase
"jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar!/-" {
+// permission java.net.SocketPermission "dbhost.mycompany.com:5432",
"connect";
+// };
+// The permission granted to the scrape taglib
+// grant codeBase
"jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/scrape.jar!/-" {
+// permission java.net.SocketPermission "*.noaa.gov:80", "connect";
+// };
+
+// To grant permissions for web applications using packed WAR files, use the
+// Tomcat specific WAR url scheme.
+//
+// The permissions granted to the entire web application
+// grant codeBase "war:file:${catalina.base}/webapps/examples.war*/-" {
+// };
+//
+// The permissions granted to a specific JAR
+// grant codeBase
"war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" {
+// };
+
+// ================ Apache TomEE ============== (To be refined)
+grant codeBase "jar:file:${catalina.home}/lib/*!/-" {
+ permission java.security.AllPermission;
+};
+grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
+ permission java.security.AllPermission;
+};
+grant codeBase "file:${catalina.base}/lib/-" {
+ permission java.security.AllPermission;
+};
+grant {
+ // "standard" properties that can be read by anyone
+ permission java.security.AllPermission ;
+};
\ No newline at end of file
diff --git a/src/test/tomee-plume/conf/context.xml
b/src/test/tomee-plume/conf/context.xml
index 484d69a..5d42cfe 100644
--- a/src/test/tomee-plume/conf/context.xml
+++ b/src/test/tomee-plume/conf/context.xml
@@ -38,4 +38,8 @@
jaspicCallbackHandlerClass="org.apache.openejb.cts.CallbackHandlerImpl"
/>
-->
+
+ <Environment name="myUrl" value="http://google.com";
+ type="java.net.URL" override="false"/>
+
</Context>
diff --git a/src/test/tomee-plume/conf/server.xml
b/src/test/tomee-plume/conf/server.xml
index 554c927..5dd67c5 100644
--- a/src/test/tomee-plume/conf/server.xml
+++ b/src/test/tomee-plume/conf/server.xml
@@ -70,6 +70,7 @@
-->
<Connector port="%webcontainer.default.port%" protocol="HTTP/1.1"
connectionTimeout="20000"
+ allowTrace="true"
allowedTrailerHeaders="myTrailer, myTrailer2"
redirectPort="%webcontainer.default.ssl.port%">
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
@@ -106,7 +107,7 @@
<!-- You should set jvmRoute to support load-balancing via AJP ie :
<Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-->
- <Engine name="Catalina" defaultHost="localhost">
+ <Engine name="Catalina" defaultHost="localhost"
backgroundProcessorDelay="1">
<!--For clustering, please take a look at documentation at:
/docs/cluster-howto.html (simple how to)
diff --git a/src/test/tomee-plume/conf/system.properties
b/src/test/tomee-plume/conf/system.properties
index 1538831..89d57ed 100644
--- a/src/test/tomee-plume/conf/system.properties
+++ b/src/test/tomee-plume/conf/system.properties
@@ -20,6 +20,7 @@
org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR=false
org.apache.tomcat.websocket.DISABLE_BUILTIN_EXTENSIONS=true
org.apache.tomcat.websocket.ALLOW_UNSUPPORTED_EXTENSIONS=true
org.apache.tomcat.websocket.DEFAULT_PROCESS_PERIOD=0
+org.apache.tomcat.websocket.STRICT_SPEC_COMPLIANCE=true
user.language=en
user.country=US
@@ -72,6 +73,9 @@ openejb.vendor.config = glassfish
openejb.crosscontext=true
#openejb.web.xml.major=3
jsp_config_general_web.openejb.web.xml.major=2
+org.apache.taglibs.standard.xml.accessExternalEntity=all
+javax.xml.accessExternalDTD=all
+javax.xml.accessExternalStylesheet=all
# javax.persistence.provider=org.eclipse.persistence.jpa.PersistenceProvider
# javax.persistence.transactionType=
@@ -98,6 +102,9 @@ old-dd-whitebox-tx.rar.moduleId=oldwhitebox-tx
old-dd-whitebox-xa-param.rar.moduleId=oldwhitebox-xa-param
old-dd-whitebox-xa.rar.moduleId=oldwhitebox-xa
+RESOURCE.global/jdbc/DB3|PortNumber=%derby.server.port%
+RESOURCE.defaultdsrepeatable|PortNumber=%derby.server.port%
+RESOURCE.defaultdsrepeatable1|PortNumber=%derby.server.port%
compds.JdbcDriver=org.apache.derby.jdbc.ClientDriver
compds.JdbcUrl=jdbc:derby://localhost:%derby.server.port%/derbydb;create=true
@@ -142,6 +149,9 @@ app/env/appds.Password=cts
openejb.classloader.forced-load = com.sun.ts.tests.
openejb.classloader.forced-skip=com.sun.ts.tests.jaspic.tssv.
+cxf.jaxrs.provider-comparator=org.apache.openejb.server.cxf.rs.CxfRsHttpListener$DefaultProviderComparator
+openejb.jaxrs.fail-on-constrainedto=false
+
# not sure why we have to duplicate this one here
log.file.location=%user.dir%/%openejb.home%/logs
vendor.authconfig.factory=org.apache.catalina.authenticator.jaspic.AuthConfigFactoryImpl
diff --git a/src/test/tomee-plus/conf/jaspic-providers.xml
b/src/test/tomee-plus/conf/jaspic-providers.xml
index e618759..73d24c6 100644
--- a/src/test/tomee-plus/conf/jaspic-providers.xml
+++ b/src/test/tomee-plus/conf/jaspic-providers.xml
@@ -419,44 +419,10 @@
</provider>
<provider name="any"
-
className="com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProvider"
- layer="SOAP"
- appContext="null"
- description="TestSuite JSR 196 Config Provider">
- <property name="AuthStatus_SEND_SUCCESS"
- value="false" />
- <property name="requestPolicy"
- value="USER_NAME_PASSWORD" />
- </provider>
- <provider name="any"
-
className="com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProvider"
- layer="SOAP"
- appContext="Catalina/localhost /Hello_web/Hello"
- description="TestSuite JSR 196 Config Provider">
- <property name="AuthStatus_SEND_SUCCESS"
- value="false" />
- <property name="requestPolicy"
- value="USER_NAME_PASSWORD" />
- </provider>
- <provider name="any"
-
className="com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProviderServlet"
+
className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
layer="HttpServlet"
appContext="Catalina/localhost /spitests_servlet_web"
- description="Registration for TSAuthConfigProviderServlet using
spitests_servlet_web">
- <property name="AuthStatus_SEND_SUCCESS"
- value="true" />
- <property name="requestPolicy"
- value="USER_NAME_PASSWORD" />
- </provider>
- <provider name="any"
-
className="com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProviderServlet"
- layer="HttpServlet"
- appContext="Catalina/localhost
/spitests_servlet_web/WrapperServlet"
- description="Registration for TSAuthConfigProviderServlet using
spitests_servlet_web">
- <property name="AuthStatus_SEND_SUCCESS"
- value="true" />
- <property name="requestPolicy"
- value="USER_NAME_PASSWORD" />
+ description="any">
</provider>
</jaspic-providers>
diff --git a/src/test/tomee-plus/conf/server.xml
b/src/test/tomee-plus/conf/server.xml
index 3b80e3e..beaefb0 100644
--- a/src/test/tomee-plus/conf/server.xml
+++ b/src/test/tomee-plus/conf/server.xml
@@ -70,6 +70,7 @@
-->
<Connector port="%webcontainer.default.port%" protocol="HTTP/1.1"
connectionTimeout="20000"
+ allowTrace="true"
redirectPort="%webcontainer.default.ssl.port%"/>
<!-- A "Connector" using the shared thread pool-->
<!--
diff --git a/src/test/tomee-plus/conf/system.properties
b/src/test/tomee-plus/conf/system.properties
index d57a359..4a7ca43 100644
--- a/src/test/tomee-plus/conf/system.properties
+++ b/src/test/tomee-plus/conf/system.properties
@@ -17,9 +17,6 @@
org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true
org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR=false
-org.apache.tomcat.websocket.DISABLE_BUILTIN_EXTENSIONS=true
-org.apache.tomcat.websocket.ALLOW_UNSUPPORTED_EXTENSIONS=true
-org.apache.tomcat.websocket.DEFAULT_PROCESS_PERIOD=0
user.language=en
user.country=US
@@ -135,6 +132,9 @@ app/env/appds.Password=cts
openejb.classloader.forced-load = com.sun.ts.tests.
openejb.classloader.forced-skip=com.sun.ts.tests.jaspic.tssv.
+cxf.jaxrs.provider-comparator=org.apache.openejb.server.cxf.rs.CxfRsHttpListener$DefaultProviderComparator
+openejb.jaxrs.fail-on-constrainedto=false
+
# not sure why we have to duplicate this one here
log.file.location=%user.dir%/%openejb.home%/logs
vendor.authconfig.factory=org.apache.catalina.authenticator.jaspic.AuthConfigFactoryImpl
diff --git a/src/test/tomee/conf/jaspic-providers.xml
b/src/test/tomee/conf/jaspic-providers.xml
index e618759..fc0ebe1 100644
--- a/src/test/tomee/conf/jaspic-providers.xml
+++ b/src/test/tomee/conf/jaspic-providers.xml
@@ -417,48 +417,6 @@
appContext="Catalina/localhost
/securityapi_securitycontext_getprincipalsbytype_web"
description="any">
</provider>
-
- <provider name="any"
-
className="com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProvider"
- layer="SOAP"
- appContext="null"
- description="TestSuite JSR 196 Config Provider">
- <property name="AuthStatus_SEND_SUCCESS"
- value="false" />
- <property name="requestPolicy"
- value="USER_NAME_PASSWORD" />
- </provider>
- <provider name="any"
-
className="com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProvider"
- layer="SOAP"
- appContext="Catalina/localhost /Hello_web/Hello"
- description="TestSuite JSR 196 Config Provider">
- <property name="AuthStatus_SEND_SUCCESS"
- value="false" />
- <property name="requestPolicy"
- value="USER_NAME_PASSWORD" />
- </provider>
- <provider name="any"
-
className="com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProviderServlet"
- layer="HttpServlet"
- appContext="Catalina/localhost /spitests_servlet_web"
- description="Registration for TSAuthConfigProviderServlet using
spitests_servlet_web">
- <property name="AuthStatus_SEND_SUCCESS"
- value="true" />
- <property name="requestPolicy"
- value="USER_NAME_PASSWORD" />
- </provider>
- <provider name="any"
-
className="com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProviderServlet"
- layer="HttpServlet"
- appContext="Catalina/localhost
/spitests_servlet_web/WrapperServlet"
- description="Registration for TSAuthConfigProviderServlet using
spitests_servlet_web">
- <property name="AuthStatus_SEND_SUCCESS"
- value="true" />
- <property name="requestPolicy"
- value="USER_NAME_PASSWORD" />
- </provider>
-
</jaspic-providers>
diff --git a/src/test/tomee/conf/server.xml b/src/test/tomee/conf/server.xml
index 3b80e3e..beaefb0 100644
--- a/src/test/tomee/conf/server.xml
+++ b/src/test/tomee/conf/server.xml
@@ -70,6 +70,7 @@
-->
<Connector port="%webcontainer.default.port%" protocol="HTTP/1.1"
connectionTimeout="20000"
+ allowTrace="true"
redirectPort="%webcontainer.default.ssl.port%"/>
<!-- A "Connector" using the shared thread pool-->
<!--
diff --git a/src/test/tomee/conf/system.properties
b/src/test/tomee/conf/system.properties
index 0556ad0..07676c6 100644
--- a/src/test/tomee/conf/system.properties
+++ b/src/test/tomee/conf/system.properties
@@ -17,9 +17,6 @@
org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true
org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR=false
-org.apache.tomcat.websocket.DISABLE_BUILTIN_EXTENSIONS=true
-org.apache.tomcat.websocket.ALLOW_UNSUPPORTED_EXTENSIONS=true
-org.apache.tomcat.websocket.DEFAULT_PROCESS_PERIOD=0
user.language=en
user.country=US
@@ -135,6 +132,9 @@ app/env/appds.Password=cts
openejb.classloader.forced-load = com.sun.ts.tests.
openejb.classloader.forced-skip=org.apache.derby.,com.sun.ts.tests.jaspic.tssv.
+cxf.jaxrs.provider-comparator=org.apache.openejb.server.cxf.rs.CxfRsHttpListener$DefaultProviderComparator
+openejb.jaxrs.fail-on-constrainedto=false
+
# not sure why we have to duplicate this one here
log.file.location=%user.dir%/%openejb.home%/logs
vendor.authconfig.factory=org.apache.catalina.authenticator.jaspic.AuthConfigFactoryImpl
