You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2020/11/18 21:04:40 UTC
[tomee-tck] branch jakartaee9-tck updated: Pull changes from EE 8
branch
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
The following commit(s) were added to refs/heads/jakartaee9-tck by this push:
new 6d6ddec Pull changes from EE 8 branch
6d6ddec is described below
commit 6d6ddec6b45f6be83bb9347af32b5df797ca07c2
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Wed Nov 18 22:04:24 2020 +0100
Pull changes from EE 8 branch
---
pom.xml | 5 +-
runtests | 2 +-
.../apache/openejb/cts/CallbackHandlerImpl.java | 156 ++++++++
.../cts/TransactionalWorkaroundLeakGuardValve.java | 43 +++
src/test/resources/ts.jtx | 414 +++++++++++----------
src/test/sql/derby/derby.ddl.persistence.sql | 6 +-
src/test/sql/derby/derby.ddl.sql | 2 +-
.../conf}/ProviderConfiguration.xml | 2 +-
.../conf}/jaspic-providers.xml | 42 +++
src/test/tomcat/conf/server.xml | 31 +-
.../tomee-plume/conf/ProviderConfiguration.xml | 2 +-
src/test/tomee-plume/conf/context.xml | 3 +-
src/test/tomee-plume/conf/jaspic-providers.xml | 42 +++
src/test/tomee-plume/conf/server.xml | 5 +-
src/test/tomee-plume/conf/system.properties | 7 +-
.../conf/ProviderConfiguration.xml | 2 +-
src/test/tomee-plus/conf/context.xml | 3 +-
.../conf/jaspic-providers.xml | 42 +++
src/test/tomee-plus/conf/server.xml | 21 +-
src/test/tomee-plus/conf/system.properties | 16 +
src/test/tomee-plus/conf/tomee.xml | 7 +
src/test/tomee/conf/ProviderConfiguration.xml | 2 +-
src/test/tomee/conf/context.xml | 3 +-
src/test/tomee/conf/jaspic-providers.xml | 42 +++
src/test/tomee/conf/server.xml | 21 +-
src/test/tomee/conf/system.properties | 17 +-
src/test/tomee/conf/tomee.xml | 7 +
27 files changed, 697 insertions(+), 248 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7c14beb..7eee0e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>openejb-tck</artifactId>
<name>OpenEJB TCK Harness</name>
- <version>8.0.5-SNAPSHOT</version>
+ <version>8.0.6-SNAPSHOT</version>
<description>
OpenEJB TCK Harness
@@ -916,7 +916,7 @@
<include name="tomcat-websocket*.jar"/>
<include name="tomcat-util*.jar"/>
<include name="tomcat-juli*.jar"/>
- <include name="tomcat-catalina*.jar"/>
+ <include name="catalina.jar"/>
<include name="jaspic-api*.jar"/>
<include name="tomcat-api*.jar"/>
<include name="websocket-api*.jar"/>
@@ -924,6 +924,7 @@
<include name="el-api*.jar"/>
<include name="servlet-api*.jar"/>
<include name="tomee-security*.jar"/>
+ <include name="tomee-catalina*.jar"/>
<include name="geronimo-mail-*.jar"/>
diff --git a/runtests b/runtests
index 0cdd1b4..d7807c4 100755
--- a/runtests
+++ b/runtests
@@ -325,7 +325,7 @@ echo "" # just an empty line
[ ! -z $env ] && export
# printing the content of the 2 main directories
-egrep 'javaee.(ri|cts).home' ~/.m2/settings.xml | perl -pe 's,^ *|<[^>]+>,,g' | while read n; do echo $n; ls -l $n; done
+egrep '(javaee|jakarta).(ri|cts).home' ~/.m2/settings.xml | perl -pe 's,^ *|<[^>]+>,,g' | while read n; do echo $n; ls -l $n; done
# Fire up Maven to do the real work
diff --git a/src/main/java/org/apache/openejb/cts/CallbackHandlerImpl.java b/src/main/java/org/apache/openejb/cts/CallbackHandlerImpl.java
new file mode 100644
index 0000000..6cba847
--- /dev/null
+++ b/src/main/java/org/apache/openejb/cts/CallbackHandlerImpl.java
@@ -0,0 +1,156 @@
+/*
+ * 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.
+ */
+package org.apache.openejb.cts;
+
+import org.apache.catalina.Contained;
+import org.apache.catalina.Container;
+import org.apache.catalina.realm.GenericPrincipal;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.message.callback.CallerPrincipalCallback;
+import javax.security.auth.message.callback.GroupPrincipalCallback;
+import javax.security.auth.message.callback.PasswordValidationCallback;
+import java.io.IOException;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * This is a clone of Tomcat default callback handler but with a better handling of the Generic Principals when more than
+ * one callback is used.
+ *
+ * For instance https://github.com/apache/tomcat/blob/master/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java#L96
+ * keeps adding new Generic Principals even for the same name whereas the authenticator base
+ * https://github.com/apache/tomcat/blob/master/java/org/apache/catalina/authenticator/AuthenticatorBase.java#L956
+ * randomly picks the first one. So it results in random failures
+ *
+ * See https://github.com/eclipse-ee4j/jakartaee-tck/issues/575
+ */
+public class CallbackHandlerImpl implements CallbackHandler, Contained {
+
+ private static final StringManager sm = StringManager.getManager(
+ org.apache.catalina.authenticator.jaspic.CallbackHandlerImpl.class);
+ private final Log log = LogFactory.getLog(org.apache.catalina.authenticator.jaspic.CallbackHandlerImpl.class); // must not be static
+
+ private Container container;
+
+
+ @Override
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+
+ String name = null;
+ Principal principal = null;
+ Subject subject = null;
+ String[] groups = null;
+
+ if (callbacks != null) {
+ // Need to combine data from multiple callbacks so use this to hold
+ // the data
+ // Process the callbacks
+ for (Callback callback : callbacks) {
+ if (callback instanceof CallerPrincipalCallback) {
+ CallerPrincipalCallback cpc = (CallerPrincipalCallback) callback;
+ name = cpc.getName();
+ principal = cpc.getPrincipal();
+ subject = cpc.getSubject();
+ } else if (callback instanceof GroupPrincipalCallback) {
+ GroupPrincipalCallback gpc = (GroupPrincipalCallback) callback;
+ groups = gpc.getGroups();
+ } else if (callback instanceof PasswordValidationCallback) {
+ if (container == null) {
+ log.warn(sm.getString("callbackHandlerImpl.containerMissing", callback.getClass().getName()));
+ } else if (container.getRealm() == null) {
+ log.warn(sm.getString("callbackHandlerImpl.realmMissing",
+ callback.getClass().getName(), container.getName()));
+ } else {
+ PasswordValidationCallback pvc = (PasswordValidationCallback) callback;
+ principal = container.getRealm().authenticate(pvc.getUsername(),
+ String.valueOf(pvc.getPassword()));
+ subject = pvc.getSubject();
+ }
+ } else {
+ log.error(sm.getString("callbackHandlerImpl.jaspicCallbackMissing",
+ callback.getClass().getName()));
+ }
+ }
+
+ // Create the GenericPrincipal
+ Principal gp = getPrincipal(principal, name, groups);
+ if (subject != null && gp != null) {
+
+ // merge if needed
+ String mergeName = gp.getName();
+ List<String> mergeRoles = new ArrayList<>(Arrays.asList(((GenericPrincipal) gp).getRoles()));
+ Principal mergePrincipal = ((GenericPrincipal) gp).getUserPrincipal();
+
+ for (Object oPrincipal : subject.getPrivateCredentials()) {
+ if (!(oPrincipal instanceof GenericPrincipal)) {
+ continue;
+ }
+ final GenericPrincipal privateCredential = (GenericPrincipal) oPrincipal;
+ if (mergeName != null && mergeName.equals(privateCredential.getName())) {
+ mergeRoles.addAll(Arrays.asList(privateCredential.getRoles()));
+ subject.getPrivateCredentials().remove(oPrincipal);
+ }
+ }
+
+ subject.getPrivateCredentials().add(new GenericPrincipal(mergeName, null, mergeRoles, mergePrincipal));
+ }
+ }
+ }
+
+ private Principal getPrincipal(Principal principal, String name, String[] groups) {
+ // If the Principal is cached in the session JASPIC may simply return it
+ if (principal instanceof GenericPrincipal) {
+ return principal;
+ }
+ if (name == null && principal != null) {
+ name = principal.getName();
+ }
+ if (name == null) {
+ return null;
+ }
+ List<String> roles;
+ if (groups == null || groups.length == 0) {
+ roles = Collections.emptyList();
+ } else {
+ roles = Arrays.asList(groups);
+ }
+
+ return new GenericPrincipal(name, null, roles, principal);
+ }
+
+ // Contained interface methods
+ @Override
+ public Container getContainer() {
+ return this.container;
+ }
+
+
+ @Override
+ public void setContainer(Container container) {
+ this.container = container;
+ }
+}
diff --git a/src/main/java/org/apache/openejb/cts/TransactionalWorkaroundLeakGuardValve.java b/src/main/java/org/apache/openejb/cts/TransactionalWorkaroundLeakGuardValve.java
new file mode 100644
index 0000000..8403897
--- /dev/null
+++ b/src/main/java/org/apache/openejb/cts/TransactionalWorkaroundLeakGuardValve.java
@@ -0,0 +1,43 @@
+package org.apache.openejb.cts;
+
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.valves.ValveBase;
+
+import javax.naming.InitialContext;
+import javax.servlet.ServletException;
+import javax.transaction.UserTransaction;
+import java.io.IOException;
+
+/**
+ * This is a workaround for the Transaction tests in JTA
+ * See https://github.com/eclipse-ee4j/jakartaee-tck/issues/573
+ */
+public class TransactionalWorkaroundLeakGuardValve extends ValveBase {
+
+ public TransactionalWorkaroundLeakGuardValve() {
+ this(true);
+ }
+
+ public TransactionalWorkaroundLeakGuardValve(final boolean asyncSupported) {
+ super(asyncSupported);
+ }
+
+ @Override
+ public void invoke(final Request request, final Response response) throws IOException, ServletException {
+
+ // attempt to cleanup the thread if any transaction is started.
+ try {
+ final UserTransaction userTransaction =
+ (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
+ userTransaction.rollback();
+
+ } catch (final Exception e) {
+ // ignore and swallow - nothing else we can do quickly to fix TCK garbage
+
+ } finally {
+ getNext().invoke(request, response);
+ }
+
+ }
+}
diff --git a/src/test/resources/ts.jtx b/src/test/resources/ts.jtx
index 3350967..bdfec8d 100644
--- a/src/test/resources/ts.jtx
+++ b/src/test/resources/ts.jtx
@@ -1,263 +1,275 @@
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+# Copyright (c) 2009, 2019 Oracle and/or its affiliates. All rights reserved.
#
-# $Id: ts.jtx 63334 2011-08-17 12:41:41Z dougd $
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0, which is available at
+# http://www.eclipse.org/legal/epl-2.0.
#
+# This Source Code may also be made available under the following Secondary
+# Licenses when the conditions for such availability set forth in the
+# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+# version 2 with the GNU Classpath Exception, which is available at
+# https://www.gnu.org/software/classpath/license.html.
+#
+# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+#
+
+# Exclude list for CTS 8
################
-# JSF
+# Servlet
################
#
-# Bug ID: 6982305
-#
-# ***** DO NOT UNCOMMENT THIS TEST ******
-#
-# The test code has been commented out in the source, due to a limitation with Javatest we
-# were unable to exclude this Test via this file. The Javatest limitation is a case sensitivity
-# issue.
+# Bug ID: 19815625
#
-#com/sun/ts/tests/jsf/api/javax_faces/application/resourcehandlerwrapper/URLClient.java#resourceHandlerWrapperLibraryExistsTest
+com/sun/ts/tests/servlet/api/javax_servlet_http/httpupgradehandler/URLClient.java#upgradeTest
-#
-# Bug ID: 6930386
-#
-com/sun/ts/tests/jsf/spec/webapp/factoryfinder/URLClient.java#factoryFinderConfig1Test
-com/sun/ts/tests/jsf/spec/webapp/factoryfinder/URLClient.java#factoryFinderConfig2Test
-com/sun/ts/tests/jsf/spec/webapp/factoryfinder/URLClient.java#factoryFinderConfig3Test
-com/sun/ts/tests/jsf/spec/webapp/factoryfinder/URLClient.java#factoryFinderConfig4Test
-#
-# Bug ID: 6938654
-#
-com/sun/ts/tests/jsf/api/javax_faces/component/uiinput/URLClient.java#uiInputValidate3Test
-com/sun/ts/tests/jsf/api/javax_faces/component/uiselectmany/URLClient.java#uiInputValidate3Test
-com/sun/ts/tests/jsf/api/javax_faces/component/uiselectone/URLClient.java#uiInputValidate3Test
-com/sun/ts/tests/jsf/api/javax_faces/component/uiselectboolean/URLClient.java#uiInputValidate3Test
-com/sun/ts/tests/jsf/api/javax_faces/component/html/htmlinputhidden/URLClient.java#uiInputValidate3Test
-com/sun/ts/tests/jsf/api/javax_faces/component/html/htmlinputsecret/URLClient.java#uiInputValidate3Test
-com/sun/ts/tests/jsf/api/javax_faces/component/html/htmlinputtext/URLClient.java#uiInputValidate3Test
-com/sun/ts/tests/jsf/api/javax_faces/component/html/htmlinputtextarea/URLClient.java#uiInputValidate3Test
-com/sun/ts/tests/jsf/api/javax_faces/component/html/htmlselectbooleancheckbox/URLClient.java#uiInputValidate3Test
-com/sun/ts/tests/jsf/api/javax_faces/component/html/htmlselectmanycheckbox/URLClient.java#uiInputValidate3Test
-com/sun/ts/tests/jsf/api/javax_faces/component/html/htmlselectmanylistbox/URLClient.java#uiInputValidate3Test
-com/sun/ts/tests/jsf/api/javax_faces/component/html/htmlselectmanymenu/URLClient.java#uiInputValidate3Test
-com/sun/ts/tests/jsf/api/javax_faces/component/html/htmlselectonelistbox/URLClient.java#uiInputValidate3Test
-com/sun/ts/tests/jsf/api/javax_faces/component/html/htmlselectonemenu/URLClient.java#uiInputValidate3Test
-com/sun/ts/tests/jsf/api/javax_faces/component/html/htmlselectoneradio/URLClient.java#uiInputValidate3Test
+################
+# JSF
+################
#
-# Bug ID: 6969488 (Tests have been removed form workspace, see Bug for more details.)
+# Bug ID: 18117763
#
-com/sun/ts/tests/jsf/api/javax_faces/event/postaddtoviewnonpdlevent/URLClient.java#postAddToViewNonPDLEventCtorTest
-com/sun/ts/tests/jsf/api/javax_faces/event/postaddtoviewnonpdlevent/URLClient.java#postAddToViewNonPDLEventGetComponentTest
-com/sun/ts/tests/jsf/api/javax_faces/event/postaddtoviewnonpdlevent/URLClient.java#postAddToViewNonPDLEventIAETest
-com/sun/ts/tests/jsf/api/javax_faces/event/postaddtoviewnonpdlevent/URLClient.java#postAddToViewNonPDLEventIsApproiateListenerNegativeTest
-com/sun/ts/tests/jsf/api/javax_faces/event/postaddtoviewnonpdlevent/URLClient.java#postAddToViewNonPDLEventIsApproiateListenerPostiveTest
-com/sun/ts/tests/jsf/api/javax_faces/event/postaddtoviewnonpdlevent/URLClient.java#postAddToViewNonPDLEventProcessListenerTest
+com/sun/ts/tests/jsf/spec/render/messages/URLClient.java#messagesRenderEncodeTest
+#
+# Bug ID: 21033845
+#
+com/sun/ts/tests/jsf/spec/flows/multipagewebinf/URLClient.java#facesFlowWebInfEntryExitTest
+com/sun/ts/tests/jsf/spec/flows/multipagewebinf/URLClient.java#facesFlowWebInfScopeTest
################
-# J2EETOOLS
+# JAX-RS
################
#
-# Bug ID: 6422030
-#
-com/sun/ts/tests/j2eetools/deploy/platform/ee/depmanager1/depmanagerClient1.java#testStartRAR_from_standalone
-com/sun/ts/tests/j2eetools/deploy/platform/ee/depmanager1/depmanagerClient1.java#testStopRAR_from_standalone
+# Bug ID: 27645077
+#
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#deleteTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#deleteWithCallbackStringWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#deleteWithCallbackWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#deleteWithGenericTypeResponseWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#deleteWithGenericTypeStringWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#deleteWithResponseClassWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#deleteWithStringClassWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#getTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#getWithCallbackStringWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#getWithCallbackWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#getWithGenericTypeResponseWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#getWithGenericTypeStringWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#getWithResponseClassWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#getWithStringClassWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#headTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#headWithCallbackWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithCallbackStringWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithCallbackStringWithEntityWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithCallbackWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithCallbackWithEntityWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithEntityWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithGenericTypeResponseWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithGenericTypeResponseWithEntityWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithGenericTypeStringWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithGenericTypeStringWithEntityWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithResponseClassWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithResponseClassWithEntityWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithStringClassWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithStringClassWithEntityWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#optionsTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#optionsWithCallbackWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#optionsWithGenericTypeResponseWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#optionsWithGenericTypeStringWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#optionsWithResponseClassWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#optionsWithStringCallbackWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#optionsWithStringClassWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#postTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#postWithCallbackWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#postWithGenericTypeResponseWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#postWithGenericTypeStringWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#postWithResponseClassWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#postWithStringClassWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#putTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#putWithCallbackWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#putWithGenericTypeResponseWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#putWithGenericTypeStringWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#putWithResponseClassWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#putWithStringCallbackWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#putWithStringClassWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#traceTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#traceWithCallbackWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#traceWithGenericTypeResponseWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#traceWithGenericTypeStringWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#traceWithResponseClassWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#traceWithStringCallbackWhileServerWaitTest_from_standalone
+com/sun/ts/tests/jaxrs/jaxrs21/ee/client/executor/async/JAXRSClient.java#traceWithStringClassWhileServerWaitTest_from_standalone
+
+#
+# Bug ID: 27869044
+#
+com/sun/ts/tests/jaxrs/jaxrs21/ee/sse/sseeventsource/JAXRSClient.java#connectionLostForDefault500msTest_from_standalone
+
+#
+# Bug ID: 27941277
+#
+com/sun/ts/tests/jaxrs/api/rs/core/linkbuilder/JAXRSClient.java#buildNoArgsThrowsUriBuilderExceptionTest_from_servlet
+com/sun/ts/tests/jaxrs/api/rs/core/linkbuilder/JAXRSClient.java#buildObjectsThrowsUriBuilderExceptionTest_from_servlet
+com/sun/ts/tests/jaxrs/api/rs/core/linkbuilder/JAXRSClient.java#buildRelativizedThrowsUriBuilderExceptionTest_from_servlet
################
-# EJB30
+# JPA
################
#
-# Bug ID: 6987622
+# Bug ID: 17503702
#
-com/sun/ts/tests/ejb30/lite/basic/mock/Client.java#passByEmpty_from_ejbembed
-com/sun/ts/tests/ejb30/lite/basic/mock/Client.java#passByReason_from_ejbembed
+com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/Client.java#getDeclaredSingularAttributes_from_appmanaged
+com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/Client.java#getDeclaredSingularAttributes_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/Client.java#getDeclaredSingularAttributes_from_pmservlet
+com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/Client.java#getDeclaredSingularAttributes_from_puservlet
+com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/Client.java#getDeclaredSingularAttributes_from_stateful3
+com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/Client.java#getDeclaredSingularAttributes_from_stateless3
#
-# Bug ID: 6915860
+# Bug ID: 17483472
#
-com/sun/ts/tests/ejb30/persistence/criteriaapi/querybuilder/Client.java#nullLiteral_from_appmanaged
-com/sun/ts/tests/ejb30/persistence/criteriaapi/querybuilder/Client.java#nullLiteral_from_appmanagedNoTx
-com/sun/ts/tests/ejb30/persistence/criteriaapi/querybuilder/Client.java#nullLiteral_from_pmservlet
-com/sun/ts/tests/ejb30/persistence/criteriaapi/querybuilder/Client.java#nullLiteral_from_puservlet
-com/sun/ts/tests/ejb30/persistence/criteriaapi/querybuilder/Client.java#nullLiteral_from_stateful3
-com/sun/ts/tests/ejb30/persistence/criteriaapi/querybuilder/Client.java#nullLiteral_from_stateless3
+com/sun/ts/tests/jpa/core/entityManagerFactory/Client.java#createEntityManagerFactoryStringTest_from_appmanaged
+com/sun/ts/tests/jpa/core/entityManagerFactory/Client.java#createEntityManagerFactoryStringTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/entityManagerFactory/Client.java#createEntityManagerFactoryStringTest_from_pmservlet
+com/sun/ts/tests/jpa/core/entityManagerFactory/Client.java#createEntityManagerFactoryStringTest_from_puservlet
+com/sun/ts/tests/jpa/core/entityManagerFactory/Client.java#createEntityManagerFactoryStringTest_from_stateful3
+com/sun/ts/tests/jpa/core/entityManagerFactory/Client.java#createEntityManagerFactoryStringTest_from_stateless3
#
-# Bug ID: 7013229
-#
-com/sun/ts/tests/ejb30/assembly/metainfandlibdir/Client.java#concurrentLookupDataSource
-com/sun/ts/tests/ejb30/assembly/metainfandlibdir/Client.java#concurrentLookupHelloBean
-
+# Bug ID: 27377406
#
-# Bug Id: 12715556
-#
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/bean/Client.java#unlockedSum1_from_ejbembed
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/bean/Client.java#unlockedSum1_from_ejblitejsf
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/bean/Client.java#unlockedSum1_from_ejblitejsp
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/bean/Client.java#unlockedSum1_from_ejbliteservlet
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/bean/Client.java#unlockedSum1_from_ejbliteservlet2
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/bean/Client.java#unlockedSumFromInterceptors1_from_ejbembed
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/bean/Client.java#unlockedSumFromInterceptors1_from_ejblitejsf
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/bean/Client.java#unlockedSumFromInterceptors1_from_ejblitejsp
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/bean/Client.java#unlockedSumFromInterceptors1_from_ejbliteservlet
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/bean/Client.java#unlockedSumFromInterceptors1_from_ejbliteservlet2
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSum1_from_ejbembed
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSum1_from_ejblitejsf
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSum1_from_ejblitejsp
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSum1_from_ejbliteservlet
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSum1_from_ejbliteservlet2
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSum2_from_ejbembed
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSum2_from_ejblitejsf
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSum2_from_ejblitejsp
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSum2_from_ejbliteservlet
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSum2_from_ejbliteservlet2
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/inheritance/Client.java#unlockedSum1_from_ejbembed
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/inheritance/Client.java#unlockedSum1_from_ejblitejsf
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/inheritance/Client.java#unlockedSum1_from_ejblitejsp
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/inheritance/Client.java#unlockedSum1_from_ejbliteservlet
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/inheritance/Client.java#unlockedSum1_from_ejbliteservlet2
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/inheritance/Client.java#unlockedSum2_from_ejbembed
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/inheritance/Client.java#unlockedSum2_from_ejblitejsf
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/inheritance/Client.java#unlockedSum2_from_ejblitejsp
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/inheritance/Client.java#unlockedSum2_from_ejbliteservlet
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/inheritance/Client.java#unlockedSum2_from_ejbliteservlet2
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSumFromInterceptors1_from_ejbembed
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSumFromInterceptors1_from_ejblitejsf
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSumFromInterceptors1_from_ejblitejsp
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSumFromInterceptors1_from_ejbliteservlet
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSumFromInterceptors1_from_ejbliteservlet2
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSumFromInterceptors2_from_ejbembed
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSumFromInterceptors2_from_ejblitejsf
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSumFromInterceptors2_from_ejblitejsp
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSumFromInterceptors2_from_ejbliteservlet
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/annotated/Client.java#unlockedSumFromInterceptors2_from_ejbliteservlet2
+com/sun/ts/tests/jpa/core/query/language/Client.java#resultContainsFetchReference_from_appmanaged
+com/sun/ts/tests/jpa/core/query/language/Client.java#resultContainsFetchReference_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/query/language/Client.java#resultContainsFetchReference_from_pmservlet
+com/sun/ts/tests/jpa/core/query/language/Client.java#resultContainsFetchReference_from_puservlet
+com/sun/ts/tests/jpa/core/query/language/Client.java#resultContainsFetchReference_from_stateful3
+com/sun/ts/tests/jpa/core/query/language/Client.java#resultContainsFetchReference_from_stateless3
#
-# Bug ID: 1280474 (https://bug.oraclecorp.com/pls/bug/webbug_edit.edit_info_top?rptno=12804747&rptno_count=1&pos=1&report_title=&query_id=-1 )
+# Bug ID: 27961853
#
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadClassLevel_from_ejbembed
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadClassLevel_from_ejblitejsf
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadClassLevel_from_ejblitejsp
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadClassLevel_from_ejbliteservlet
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadClassLevel_from_ejbliteservlet2
+com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/Client.java#elementCollectionTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/Client.java#elementCollectionTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/Client.java#elementCollectionTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/Client.java#elementCollectionTest_from_stateless3
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadInherit_from_ejbembed
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadInherit_from_ejblitejsf
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadInherit_from_ejblitejsp
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadInherit_from_ejbliteservlet
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadInherit_from_ejbliteservlet2
-
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadMethodLevel_from_ejbembed
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadMethodLevel_from_ejblitejsf
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadMethodLevel_from_ejblitejsp
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadMethodLevel_from_ejbliteservlet
-com/sun/ts/tests/ejb30/lite/singleton/concurrency/container/accesstimeout/Client.java#longWritesLongReadMethodLevel_from_ejbliteservlet2
-
-
-#################
-# INTEROP
-#################
+################
+# JSON-B
+################
#
-# Bug ID: 16989 (http://java.net/jira/browse/GLASSFISH-16989)
-#
-com/sun/ts/tests/interop/rmiiiop/marshaltests/Client.java#EXTest01_from_appclient
-com/sun/ts/tests/interop/rmiiiop/marshaltests/Client.java#EXTest01_from_ejb
-com/sun/ts/tests/interop/rmiiiop/marshaltests/Client.java#EXTest01_from_jsp
-com/sun/ts/tests/interop/rmiiiop/marshaltests/Client.java#EXTest01_from_servlet
-com/sun/ts/tests/interop/rmiiiop/marshaltests/Client.java#OBVTest05_from_appclient
-com/sun/ts/tests/interop/rmiiiop/marshaltests/Client.java#OBVTest05_from_appclient_reverse
-com/sun/ts/tests/interop/rmiiiop/marshaltests/Client.java#OBVTest05_from_ejb
-com/sun/ts/tests/interop/rmiiiop/marshaltests/Client.java#OBVTest05_from_ejb_reverse
-com/sun/ts/tests/interop/rmiiiop/marshaltests/Client.java#OBVTest05_from_jsp
-com/sun/ts/tests/interop/rmiiiop/marshaltests/Client.java#OBVTest05_from_jsp_reverse
-com/sun/ts/tests/interop/rmiiiop/marshaltests/Client.java#OBVTest05_from_servlet
-com/sun/ts/tests/interop/rmiiiop/marshaltests/Client.java#OBVTest05_from_servlet_reverse
-com/sun/ts/tests/interop/tx/webclient/jsp/URLClient.java#test1
-com/sun/ts/tests/interop/tx/webclient/jsp/URLClient.java#test10
-com/sun/ts/tests/interop/tx/webclient/jsp/URLClient.java#test2
-com/sun/ts/tests/interop/tx/webclient/jsp/URLClient.java#test3
-com/sun/ts/tests/interop/tx/webclient/jsp/URLClient.java#test4
-com/sun/ts/tests/interop/tx/webclient/jsp/URLClient.java#test9
-com/sun/ts/tests/interop/tx/session/stateful/bm/TxNS_GlobalSingle/Client.java#test1
-com/sun/ts/tests/interop/tx/session/stateful/bm/TxNS_GlobalSingle/Client.java#test2
-com/sun/ts/tests/interop/tx/session/stateful/bm/TxRN_GlobalSingle/Client.java#test1
-com/sun/ts/tests/interop/tx/session/stateful/bm/TxRN_GlobalSingle/Client.java#test2
-com/sun/ts/tests/interop/tx/session/stateful/bm/TxBM_GlobalSingle/Client.java#test1
-com/sun/ts/tests/interop/tx/session/stateful/bm/TxBM_GlobalSingle/Client.java#test2
-com/sun/ts/tests/interop/tx/session/stateful/cm/TxN_Single/Client.java#test1
-com/sun/ts/tests/interop/tx/session/stateful/cm/TxNS_Single/Client.java#test1
-com/sun/ts/tests/interop/tx/session/stateful/cm/TxR_Single/Client.java#test1
-com/sun/ts/tests/interop/tx/session/stateful/cm/TxRN_Single/Client.java#test1
-com/sun/ts/tests/interop/tx/session/stateful/cm/TxS_Single/Client.java#test1
+# Bug ID: 27961884
+#
+com/sun/ts/tests/jsonb/customizedmapping/visibility/VisibilityCustomizationTest.java#testCustomVisibilityConfig_from_appclient
+com/sun/ts/tests/jsonb/customizedmapping/visibility/VisibilityCustomizationTest.java#testCustomVisibilityConfig_from_ejb
+com/sun/ts/tests/jsonb/customizedmapping/visibility/VisibilityCustomizationTest.java#testCustomVisibilityConfig_from_jsp
+com/sun/ts/tests/jsonb/customizedmapping/visibility/VisibilityCustomizationTest.java#testCustomVisibilityConfig_from_servlet
#
-# Bug ID: 16661 (http://java.net/jira/browse/GLASSFISH-16661)
+# Bug ID: https://github.com/eclipse-ee4j/jsonb-api/issues/180
#
-com/sun/ts/tests/interop/tx/session/stateful/bm/TxN_GlobalSingle/Client.java#test1
-com/sun/ts/tests/interop/tx/webclient/jsp/URLClient.java#test13
-
-
-################
-# WEBSERVICES13
-################
+com/sun/ts/tests/jsonb/defaultmapping/basictypes/BasicJavaTypesMappingTest.java#testLongMapping_from_appclient
+com/sun/ts/tests/jsonb/defaultmapping/basictypes/BasicJavaTypesMappingTest.java#testLongMapping_from_ejb
+com/sun/ts/tests/jsonb/defaultmapping/basictypes/BasicJavaTypesMappingTest.java#testLongMapping_from_jsp
+com/sun/ts/tests/jsonb/defaultmapping/basictypes/BasicJavaTypesMappingTest.java#testLongMapping_from_servlet
+com/sun/ts/tests/jsonb/defaultmapping/bignumbers/BigNumbersMappingTest.java#testBigNumberMarshalling_from_appclient
+com/sun/ts/tests/jsonb/defaultmapping/bignumbers/BigNumbersMappingTest.java#testBigNumberMarshalling_from_ejb
+com/sun/ts/tests/jsonb/defaultmapping/bignumbers/BigNumbersMappingTest.java#testBigNumberMarshalling_from_jsp
+com/sun/ts/tests/jsonb/defaultmapping/bignumbers/BigNumbersMappingTest.java#testBigNumberMarshalling_from_servlet
#
-# Bug ID: 6962404
+# Bug ID: https://github.com/eclipse-ee4j/jakartaee-tck/issues/102
#
-com/sun/ts/tests/webservices13/ejb/annotations/WSEjbWSRefRespBindAndAddressingCombinedTest/Client.java#VerifyAddrHeadersExistForEnabledNotRequiredPort
-com/sun/ts/tests/webservices13/servlet/WSRespBindAndAddressingTestUsingAnnotations/Client.java#afCltEnabledNotREQSvrEnabledREQrbfSvrEnabledCltEnabledTest
-com/sun/ts/tests/webservices13/servlet/WSRespBindAndAddressingTestUsingDDs/Client.java#afCltEnabledNotREQSvrEnabledREQrbfSvrEnabledCltEnabledTest
-
-################
-# CONNECTOR
-################
+com/sun/ts/tests/jsonb/defaultmapping/dates/DatesMappingTest.java#testGregorianCalendarWithTimeMapping_from_appclient
+com/sun/ts/tests/jsonb/defaultmapping/dates/DatesMappingTest.java#testGregorianCalendarWithTimeMapping_from_ejb
+com/sun/ts/tests/jsonb/defaultmapping/dates/DatesMappingTest.java#testGregorianCalendarWithTimeMapping_from_jsp
+com/sun/ts/tests/jsonb/defaultmapping/dates/DatesMappingTest.java#testGregorianCalendarWithTimeMapping_from_servlet
#
-# Bug ID: 7006428
-#
-com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1.java#testRAtoWorkAssociation_from_ejb
-com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1.java#testRAtoWorkAssociation_from_jsp
-com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1.java#testRAtoWorkAssociation_from_servlet
-com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1.java#testRAtoWorkAssociation_from_ejb
-com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1.java#testRAtoWorkAssociation_from_jsp
-com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1.java#testRAtoWorkAssociation_from_servlet
-com/sun/ts/tests/connector/xa/workmgt/workmgtClient1.java#testRAtoWorkAssociation_from_ejb
-com/sun/ts/tests/connector/xa/workmgt/workmgtClient1.java#testRAtoWorkAssociation_from_jsp
-com/sun/ts/tests/connector/xa/workmgt/workmgtClient1.java#testRAtoWorkAssociation_from_servlet
-
+# Bug ID: https://github.com/eclipse-ee4j/jakartaee-tck/issues/103
+#
+com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumMap_from_appclient
+com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumMap_from_ejb
+com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumMap_from_jsp
+com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumMap_from_servlet
+com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumSet_from_appclient
+com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumSet_from_ejb
+com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumSet_from_jsp
+com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumSet_from_servlet
################
-# JSP
+# Interop
################
#
-# Bug ID: 15161 (http://java.net/jira/browse/GLASSFISH-15161)
+# Bug ID : 27950931
#
-com/sun/ts/tests/jsp/spec/security/secform/Client.java#test12
-
-
-################
-# XA
-################
+com/sun/ts/tests/interop/csiv2/ew_ssl_ssln_upn_ccid/reverse/Client.java#ew_ssl_ssln_upn_ccid_sb_sb_testid3b_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssl_sslr_upn_ccid/reverse/Client.java#ew_ssl_sslr_upn_ccid_sb_sb_testid7a_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssln_ssln_upn_upid/reverse/Client.java#ew_ssln_ssln_upn_upid_wb_sb_testid6_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssln_ssln_upn_upid/reverse/Client.java#ew_ssln_ssln_upn_upid_sb_sb_testid6_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssl_ssln_upn_anonid/reverse/Client.java#ew_ssl_ssln_upn_anonid_wb_sb_testid3_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssl_ssln_upn_anonid/reverse/Client.java#ew_ssl_ssln_upn_anonid_sb_sb_testid3_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssln_ssln_upn_ccid/reverse/Client.java#ew_ssln_ssln_upn_ccid_sb_sb_testid4a_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssl_ssln_upn_upid/reverse/Client.java#ew_ssl_ssln_upn_upid_sb_sb_testid3a_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssl_ssln_upn_upid/reverse/Client.java#ew_ssl_ssln_upn_upid_wb_sb_testid3a_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssl_sslr_upn_anonid/reverse/Client.java#ew_ssl_sslr_upn_anonid_sb_sb_testid8_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssl_sslr_upn_anonid/reverse/Client.java#ew_ssl_sslr_upn_anonid_wb_sb_testid8_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssln_ssln_upn_anonid/reverse/Client.java#ew_ssln_ssln_upn_anonid_sb_sb_testid4_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssln_ssln_upn_anonid/reverse/Client.java#ew_ssln_ssln_upn_anonid_wb_sb_testid4_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssl_sslr_upn_upid/reverse/Client.java#ew_ssl_sslr_upn_upid_wb_sb_testid7_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssl_sslr_upn_upid/reverse/Client.java#ew_ssl_sslr_upn_upid_sb_sb_testid7_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssl_ssln_upn_ccid/reverse/Client.java#ew_ssl_ssln_upn_ccid_wb_sb_testid3b_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssl_sslr_upn_ccid/reverse/Client.java#ew_ssl_sslr_upn_ccid_wb_sb_testid7a_reverse
+com/sun/ts/tests/interop/csiv2/ew_ssln_ssln_upn_ccid/reverse/Client.java#ew_ssln_ssln_upn_ccid_wb_sb_testid4a_reverse
#
-# Bug ID: 6992031
+# Issue : 16661 (https://github.com/javaee/glassfish/issues/16661)
#
-com/sun/ts/tests/xa/ee/tsr/TsrClient.java#testTSRFunctionality1
+com/sun/ts/tests/interop/tx/session/stateful/bm/TxN_GlobalSingle/Client.java#test1
+com/sun/ts/tests/interop/tx/webclient/jsp/URLClient.java#test13
+#
+# Tests excluded for challenge 251826
+#
+com/sun/ts/tests/interop/security/appclient/stateful/Client.java#test1_reverse
+com/sun/ts/tests/interop/security/appclient/stateful/Client.java#test2_reverse
+com/sun/ts/tests/interop/security/appclient/stateful/Client.java#test3_reverse
+com/sun/ts/tests/interop/security/appclient/stateful/Client.java#test4_reverse
+com/sun/ts/tests/interop/security/appclient/stateful/Client.java#test5_reverse
+com/sun/ts/tests/interop/security/appclient/stateful/Client.java#test6_reverse
+com/sun/ts/tests/interop/security/appclient/stateful/Client.java#test7_reverse
+com/sun/ts/tests/interop/security/appclient/stateful/Client.java#test8_reverse
+com/sun/ts/tests/interop/security/appclient/stateless/Client.java#test1_reverse
+com/sun/ts/tests/interop/security/appclient/stateless/Client.java#test2_reverse
+com/sun/ts/tests/interop/security/appclient/stateless/Client.java#test3_reverse
+com/sun/ts/tests/interop/security/appclient/stateless/Client.java#test4_reverse
+com/sun/ts/tests/interop/security/appclient/stateless/Client.java#test5_reverse
+com/sun/ts/tests/interop/security/appclient/stateless/Client.java#test6_reverse
+com/sun/ts/tests/interop/security/appclient/stateless/Client.java#test7_reverse
+com/sun/ts/tests/interop/security/appclient/stateless/Client.java#test8_reverse
+com/sun/ts/tests/interop/security/ejbclient/sfrunas/Client.java#test5_reverse
+com/sun/ts/tests/interop/security/ejbclient/slrunas/Client.java#test5_reverse
+com/sun/ts/tests/interop/security/ejbclient/stateful/Client.java#test5_reverse
+com/sun/ts/tests/interop/security/ejbclient/stateless/Client.java#test5_reverse
################
-# SERVLET
+# Security API
################
#
-# Bug ID: 12680183
+# Tests excluded for challenges 253074 and 250907
+#
+com/sun/ts/tests/securityapi/idstore/noidstore/Client.java#testIdentityStoreValidate_noIDStore
+com/sun/ts/tests/securityapi/ham/sam/delegation/Client.java#testSAMDelegatesHAM
+
#
-com/sun/ts/tests/servlet/spec/annotation/injection/URLClient.java#test1
+# Tests excluded for https://github.com/eclipse-ee4j/jakartaee-platform/issues/139
+com/sun/ts/tests/securityapi/ham/sam/obtainbean/Client.java#testSAMObtainBean
diff --git a/src/test/sql/derby/derby.ddl.persistence.sql b/src/test/sql/derby/derby.ddl.persistence.sql
index dd8b228..8c6306c 100644
--- a/src/test/sql/derby/derby.ddl.persistence.sql
+++ b/src/test/sql/derby/derby.ddl.persistence.sql
@@ -924,4 +924,8 @@ ALTER TABLE COLTAB_EMP_EMBEDED_ADDRESS ADD CONSTRAINT FK_EMPEMBADDRID FOREIGN KE
DROP SEQUENCE SEQGENERATOR RESTRICT;
-CREATE SEQUENCE SEQGENERATOR AS INT START WITH 10;
\ No newline at end of file
+CREATE SEQUENCE SEQGENERATOR AS INT START WITH 10;
+
+
+DROP TABLE OPENJPA_SEQUENCE_TABLE;
+CREATE TABLE OPENJPA_SEQUENCE_TABLE(ID SMALLINT NOT NULL, SEQUENCE_VALUE BIGINT, PRIMARY KEY (ID));
\ No newline at end of file
diff --git a/src/test/sql/derby/derby.ddl.sql b/src/test/sql/derby/derby.ddl.sql
index b2bd297..60f1b95 100644
--- a/src/test/sql/derby/derby.ddl.sql
+++ b/src/test/sql/derby/derby.ddl.sql
@@ -22,7 +22,7 @@ drop table Real_Tab ;
create table Real_Tab (MAX_VAL REAL, MIN_VAL REAL,NULL_VAL REAL) ;
drop table Bit_Tab ;
-create table Bit_Tab (MAX_VAL BOOLEAN, MIN_VAL BOOLEAN, NULL_VAL SMALLINT) ;
+create table Bit_Tab (MAX_VAL SMALLINT, MIN_VAL SMALLINT, NULL_VAL SMALLINT) ;
drop table Smallint_Tab ;
create table Smallint_Tab (MAX_VAL SMALLINT, MIN_VAL SMALLINT, NULL_VAL SMALLINT) ;
diff --git a/src/test/tomee-plus/ProviderConfiguration.xml b/src/test/tomcat/conf/ProviderConfiguration.xml
similarity index 97%
rename from src/test/tomee-plus/ProviderConfiguration.xml
rename to src/test/tomcat/conf/ProviderConfiguration.xml
index bf295b3..e21cbff 100644
--- a/src/test/tomee-plus/ProviderConfiguration.xml
+++ b/src/test/tomcat/conf/ProviderConfiguration.xml
@@ -38,7 +38,7 @@
<entry key="requestPolicy">USER_NAME_PASSWORD</entry>
</properties>
<message-layer>SOAP</message-layer>
- <app-context-id>localhost /Hello_web/Hello</app-context-id>
+ <app-context-id>Catalina/localhost /Hello_web/Hello</app-context-id>
<reg-description>TestSuite JSR 196 Config Provider</reg-description>
</provider-config-entry>
<provider-config-entry>
diff --git a/src/test/tomee-plus/jaspic-providers.xml b/src/test/tomcat/conf/jaspic-providers.xml
similarity index 91%
rename from src/test/tomee-plus/jaspic-providers.xml
rename to src/test/tomcat/conf/jaspic-providers.xml
index fc0ebe1..e618759 100644
--- a/src/test/tomee-plus/jaspic-providers.xml
+++ b/src/test/tomcat/conf/jaspic-providers.xml
@@ -417,6 +417,48 @@
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/tomcat/conf/server.xml b/src/test/tomcat/conf/server.xml
index 991f1a4..102a3a4 100644
--- a/src/test/tomcat/conf/server.xml
+++ b/src/test/tomcat/conf/server.xml
@@ -19,16 +19,13 @@
define subcomponents such as "Valves" at this level.
Documentation at /docs/config/server.html
-->
-<Server port="8005" shutdown="SHUTDOWN">
- <!-- OpenEJB plugin for Tomcat -->
- <Listener className="org.apache.tomee.loader.OpenEJBListener"/>
+<Server port="%webcontainer.default.shutdown.port%" shutdown="SHUTDOWN">
+ <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on"/>
- <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
- <Listener className="org.apache.catalina.core.JasperListener"/>
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener"/>
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
@@ -69,9 +66,12 @@
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL HTTP/1.1 Connector on port 8080
-->
- <Connector port="8080" protocol="HTTP/1.1"
+ <Connector port="%webcontainer.default.port%" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="8443"/>
+ allowedTrailerHeaders="myTrailer, myTrailer2"
+ redirectPort="%webcontainer.default.ssl.port%">
+ <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+ </Connector>
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
@@ -83,13 +83,16 @@
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="8443" protocol="HTTP/1.1" SSLEnabled="true"
- maxThreads="150" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS"
- keystoreFile="conf/clientcert.jks"/>
+ <Connector port="%webcontainer.default.ssl.port%" protocol="HTTP/1.1" SSLEnabled="true">
+ <SSLHostConfig truststoreFile="conf/ssl-truststore">
+ <Certificate certificateKeystoreFile="conf/clientcert.jks"
+ certificateKeystorePassword="changeit"
+ type="RSA" />
+ </SSLHostConfig>
+ </Connector>
<!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443"/>
+ <!-- <Connector port="%tomee.ajp.port%" protocol="AJP/1.3" redirectPort="%tomee.ssl.port%" /> -->
<!-- An Engine represents the entry point (within Catalina) that processes
@@ -112,14 +115,14 @@
<!-- Use the LockOutRealm to prevent attempts to guess user passwords
via a brute-force attack -->
- <Realm className="org.apache.catalina.realm.LockOutRealm">
+ <!--Realm className="org.apache.catalina.realm.LockOutRealm"-->
<!-- This Realm uses the UserDatabase configured in the global JNDI
resources under the key "UserDatabase". Any edits
that are performed against this UserDatabase are immediately
available for use by the Realm. -->
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase"/>
- </Realm>
+ <!--/Realm-->
<Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true">
diff --git a/src/test/tomee-plume/conf/ProviderConfiguration.xml b/src/test/tomee-plume/conf/ProviderConfiguration.xml
index bf295b3..e21cbff 100644
--- a/src/test/tomee-plume/conf/ProviderConfiguration.xml
+++ b/src/test/tomee-plume/conf/ProviderConfiguration.xml
@@ -38,7 +38,7 @@
<entry key="requestPolicy">USER_NAME_PASSWORD</entry>
</properties>
<message-layer>SOAP</message-layer>
- <app-context-id>localhost /Hello_web/Hello</app-context-id>
+ <app-context-id>Catalina/localhost /Hello_web/Hello</app-context-id>
<reg-description>TestSuite JSR 196 Config Provider</reg-description>
</provider-config-entry>
<provider-config-entry>
diff --git a/src/test/tomee-plume/conf/context.xml b/src/test/tomee-plume/conf/context.xml
index 1511fcd..af628d5 100644
--- a/src/test/tomee-plume/conf/context.xml
+++ b/src/test/tomee-plume/conf/context.xml
@@ -29,7 +29,8 @@
<Manager pathname="" />
-->
+ <Valve className="org.apache.openejb.cts.TransactionalWorkaroundLeakGuardValve"/>
<Valve className="org.apache.catalina.authenticator.BasicAuthenticator"
- jaspicCallbackHandlerClass="org.apache.tomee.security.provider.CallbackHandlerImpl"
+ jaspicCallbackHandlerClass="org.apache.openejb.cts.CallbackHandlerImpl"
/>
</Context>
diff --git a/src/test/tomee-plume/conf/jaspic-providers.xml b/src/test/tomee-plume/conf/jaspic-providers.xml
index fc0ebe1..e618759 100644
--- a/src/test/tomee-plume/conf/jaspic-providers.xml
+++ b/src/test/tomee-plume/conf/jaspic-providers.xml
@@ -417,6 +417,48 @@
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-plume/conf/server.xml b/src/test/tomee-plume/conf/server.xml
index 12f0f16..554c927 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"
+ allowedTrailerHeaders="myTrailer, myTrailer2"
redirectPort="%webcontainer.default.ssl.port%">
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
</Connector>
@@ -116,14 +117,14 @@
<!-- Use the LockOutRealm to prevent attempts to guess user passwords
via a brute-force attack -->
- <Realm className="org.apache.catalina.realm.LockOutRealm">
+ <!--Realm className="org.apache.catalina.realm.LockOutRealm"-->
<!-- This Realm uses the UserDatabase configured in the global JNDI
resources under the key "UserDatabase". Any edits
that are performed against this UserDatabase are immediately
available for use by the Realm. -->
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase"/>
- </Realm>
+ <!--/Realm-->
<Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true">
diff --git a/src/test/tomee-plume/conf/system.properties b/src/test/tomee-plume/conf/system.properties
index 6af8c4f..e5931e8 100644
--- a/src/test/tomee-plume/conf/system.properties
+++ b/src/test/tomee-plume/conf/system.properties
@@ -17,6 +17,9 @@
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
@@ -79,9 +82,9 @@ PERSISTENCEUNIT.CTS-EM-NOTX.openjpa.jdbc.SynchronizeMappings=buildSchema(IgnoreE
PERSISTENCEUNIT.CTS-EM-NOTX.openjpa.Compatibility=StrictIdentityValues=true,NonDefaultMappingAllowed=true,ConvertPositionalParametersToNamed=true
PERSISTENCEUNIT.CTS-EM.eclipselink.target-database=Derby
-PERSISTENCEUNIT.CTS-EM.eclipselink.logging.level=ALL
+PERSISTENCEUNIT.CTS-EM.eclipselink.logging.level=INFO
PERSISTENCEUNIT.CTS-EM-NOTX.eclipselink.target-database=Derby
-PERSISTENCEUNIT.CTS-EM-NOTX.eclipselink.logging.level=ALL
+PERSISTENCEUNIT.CTS-EM-NOTX.eclipselink.logging.level=INFO
old-dd-whitebox-notx-param.rar.moduleId=oldwhitebox-notx-param
old-dd-whitebox-notx.rar.moduleId=oldwhitebox-notx
diff --git a/src/test/tomee-plume/conf/ProviderConfiguration.xml b/src/test/tomee-plus/conf/ProviderConfiguration.xml
similarity index 97%
copy from src/test/tomee-plume/conf/ProviderConfiguration.xml
copy to src/test/tomee-plus/conf/ProviderConfiguration.xml
index bf295b3..e21cbff 100644
--- a/src/test/tomee-plume/conf/ProviderConfiguration.xml
+++ b/src/test/tomee-plus/conf/ProviderConfiguration.xml
@@ -38,7 +38,7 @@
<entry key="requestPolicy">USER_NAME_PASSWORD</entry>
</properties>
<message-layer>SOAP</message-layer>
- <app-context-id>localhost /Hello_web/Hello</app-context-id>
+ <app-context-id>Catalina/localhost /Hello_web/Hello</app-context-id>
<reg-description>TestSuite JSR 196 Config Provider</reg-description>
</provider-config-entry>
<provider-config-entry>
diff --git a/src/test/tomee-plus/conf/context.xml b/src/test/tomee-plus/conf/context.xml
index 1511fcd..af628d5 100644
--- a/src/test/tomee-plus/conf/context.xml
+++ b/src/test/tomee-plus/conf/context.xml
@@ -29,7 +29,8 @@
<Manager pathname="" />
-->
+ <Valve className="org.apache.openejb.cts.TransactionalWorkaroundLeakGuardValve"/>
<Valve className="org.apache.catalina.authenticator.BasicAuthenticator"
- jaspicCallbackHandlerClass="org.apache.tomee.security.provider.CallbackHandlerImpl"
+ jaspicCallbackHandlerClass="org.apache.openejb.cts.CallbackHandlerImpl"
/>
</Context>
diff --git a/src/test/tomee-plume/conf/jaspic-providers.xml b/src/test/tomee-plus/conf/jaspic-providers.xml
similarity index 91%
copy from src/test/tomee-plume/conf/jaspic-providers.xml
copy to src/test/tomee-plus/conf/jaspic-providers.xml
index fc0ebe1..e618759 100644
--- a/src/test/tomee-plume/conf/jaspic-providers.xml
+++ b/src/test/tomee-plus/conf/jaspic-providers.xml
@@ -417,6 +417,48 @@
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-plus/conf/server.xml b/src/test/tomee-plus/conf/server.xml
index 3b80e3e..554c927 100644
--- a/src/test/tomee-plus/conf/server.xml
+++ b/src/test/tomee-plus/conf/server.xml
@@ -70,7 +70,10 @@
-->
<Connector port="%webcontainer.default.port%" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="%webcontainer.default.ssl.port%"/>
+ allowedTrailerHeaders="myTrailer, myTrailer2"
+ 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 +85,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/ssl-truststore">
+ <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%" /> -->
@@ -112,14 +117,14 @@
<!-- Use the LockOutRealm to prevent attempts to guess user passwords
via a brute-force attack -->
- <Realm className="org.apache.catalina.realm.LockOutRealm">
+ <!--Realm className="org.apache.catalina.realm.LockOutRealm"-->
<!-- This Realm uses the UserDatabase configured in the global JNDI
resources under the key "UserDatabase". Any edits
that are performed against this UserDatabase are immediately
available for use by the Realm. -->
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase"/>
- </Realm>
+ <!--/Realm-->
<Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true">
diff --git a/src/test/tomee-plus/conf/system.properties b/src/test/tomee-plus/conf/system.properties
index e817bcc..46efb76 100644
--- a/src/test/tomee-plus/conf/system.properties
+++ b/src/test/tomee-plus/conf/system.properties
@@ -15,6 +15,14 @@
# limitations under the License.
#
+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
+
openejb.system.apps=true
openejb.deployments.classpath=true
tomee.remote.support=true
@@ -124,6 +132,14 @@ app/env/appds.UserName=cts
app/env/appds.Password=cts
openejb.classloader.forced-load = com.sun.ts.tests.
+openejb.classloader.forced-skip=com.sun.ts.tests.jaspic.tssv.util.
+
+# 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
+provider.configuration.file=%user.dir%/%openejb.home%/conf/ProviderConfiguration.xml
+j2eelogin.name=j2ee
+j2eelogin.password=j2ee
#
#for n in app/env/appds2; do
diff --git a/src/test/tomee-plus/conf/tomee.xml b/src/test/tomee-plus/conf/tomee.xml
index cc1619e..ee93c60 100644
--- a/src/test/tomee-plus/conf/tomee.xml
+++ b/src/test/tomee-plus/conf/tomee.xml
@@ -50,6 +50,13 @@
<!--</Container>-->
<!-- That should be also specified in the system.properties file of the target environment -->
+ <Resource id="jdbc/securityAPIDB" type="DataSource">
+ JdbcDriver org.apache.derby.jdbc.ClientDriver
+ JdbcUrl jdbc:derby://localhost:%derby.server.port%/derbydb;create=true
+ UserName cts
+ Password cts
+ </Resource>
+
<Resource id="jdbc/DB1" type="DataSource">
JdbcDriver org.apache.derby.jdbc.ClientDriver
JdbcUrl jdbc:derby://localhost:%derby.server.port%/derbydb;create=true
diff --git a/src/test/tomee/conf/ProviderConfiguration.xml b/src/test/tomee/conf/ProviderConfiguration.xml
index bf295b3..e21cbff 100644
--- a/src/test/tomee/conf/ProviderConfiguration.xml
+++ b/src/test/tomee/conf/ProviderConfiguration.xml
@@ -38,7 +38,7 @@
<entry key="requestPolicy">USER_NAME_PASSWORD</entry>
</properties>
<message-layer>SOAP</message-layer>
- <app-context-id>localhost /Hello_web/Hello</app-context-id>
+ <app-context-id>Catalina/localhost /Hello_web/Hello</app-context-id>
<reg-description>TestSuite JSR 196 Config Provider</reg-description>
</provider-config-entry>
<provider-config-entry>
diff --git a/src/test/tomee/conf/context.xml b/src/test/tomee/conf/context.xml
index 1511fcd..af628d5 100644
--- a/src/test/tomee/conf/context.xml
+++ b/src/test/tomee/conf/context.xml
@@ -29,7 +29,8 @@
<Manager pathname="" />
-->
+ <Valve className="org.apache.openejb.cts.TransactionalWorkaroundLeakGuardValve"/>
<Valve className="org.apache.catalina.authenticator.BasicAuthenticator"
- jaspicCallbackHandlerClass="org.apache.tomee.security.provider.CallbackHandlerImpl"
+ jaspicCallbackHandlerClass="org.apache.openejb.cts.CallbackHandlerImpl"
/>
</Context>
diff --git a/src/test/tomee/conf/jaspic-providers.xml b/src/test/tomee/conf/jaspic-providers.xml
index fc0ebe1..e618759 100644
--- a/src/test/tomee/conf/jaspic-providers.xml
+++ b/src/test/tomee/conf/jaspic-providers.xml
@@ -417,6 +417,48 @@
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..554c927 100644
--- a/src/test/tomee/conf/server.xml
+++ b/src/test/tomee/conf/server.xml
@@ -70,7 +70,10 @@
-->
<Connector port="%webcontainer.default.port%" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="%webcontainer.default.ssl.port%"/>
+ allowedTrailerHeaders="myTrailer, myTrailer2"
+ 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 +85,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/ssl-truststore">
+ <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%" /> -->
@@ -112,14 +117,14 @@
<!-- Use the LockOutRealm to prevent attempts to guess user passwords
via a brute-force attack -->
- <Realm className="org.apache.catalina.realm.LockOutRealm">
+ <!--Realm className="org.apache.catalina.realm.LockOutRealm"-->
<!-- This Realm uses the UserDatabase configured in the global JNDI
resources under the key "UserDatabase". Any edits
that are performed against this UserDatabase are immediately
available for use by the Realm. -->
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase"/>
- </Realm>
+ <!--/Realm-->
<Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true">
diff --git a/src/test/tomee/conf/system.properties b/src/test/tomee/conf/system.properties
index 2fcba79..8ccf9af 100644
--- a/src/test/tomee/conf/system.properties
+++ b/src/test/tomee/conf/system.properties
@@ -15,6 +15,14 @@
# limitations under the License.
#
+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
+
openejb.system.apps=true
openejb.deployments.classpath=true
tomee.remote.support=true
@@ -124,7 +132,14 @@ app/env/appds.UserName=cts
app/env/appds.Password=cts
openejb.classloader.forced-load = com.sun.ts.tests.
-openejb.classloader.forced-skip = org.apache.derby.
+openejb.classloader.forced-skip=com.sun.ts.tests.jaspic.tssv.util.
+
+# 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
+provider.configuration.file=%user.dir%/%openejb.home%/conf/ProviderConfiguration.xml
+j2eelogin.name=j2ee
+j2eelogin.password=j2ee
#
#for n in app/env/appds2; do
diff --git a/src/test/tomee/conf/tomee.xml b/src/test/tomee/conf/tomee.xml
index cc1619e..ee93c60 100644
--- a/src/test/tomee/conf/tomee.xml
+++ b/src/test/tomee/conf/tomee.xml
@@ -50,6 +50,13 @@
<!--</Container>-->
<!-- That should be also specified in the system.properties file of the target environment -->
+ <Resource id="jdbc/securityAPIDB" type="DataSource">
+ JdbcDriver org.apache.derby.jdbc.ClientDriver
+ JdbcUrl jdbc:derby://localhost:%derby.server.port%/derbydb;create=true
+ UserName cts
+ Password cts
+ </Resource>
+
<Resource id="jdbc/DB1" type="DataSource">
JdbcDriver org.apache.derby.jdbc.ClientDriver
JdbcUrl jdbc:derby://localhost:%derby.server.port%/derbydb;create=true