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/04 16:28:12 UTC
[tomee-tck] branch jakartaee9-tck updated: backport all security
configuration from master because the branch has been created before
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 06966eb backport all security configuration from master because the branch has been created before
06966eb is described below
commit 06966eb59ef8d2251ee3cfd0804c972dcefd678e
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Wed Nov 4 17:27:35 2020 +0100
backport all security configuration from master because the branch has been created before
---
pom.xml | 84 +++-
.../apache/openejb/cts/UnboundIdLdapRunner.java | 99 +++++
.../apache/openejb/tck/util/GeneratePackages.java | 3 +-
src/test/ldap/ldap.ldif | 207 ++++++++++
src/test/resources/testsuite.properties | 14 +-
.../openejb/tck/commands/CommandSupport.groovy | 3 +
.../tomee-plume/conf/ProviderConfiguration.xml | 64 ++++
src/test/tomee-plume/conf/jaspic-providers.xml | 424 +++++++++++++++++++++
src/test/tomee-plume/conf/system.properties | 8 +
src/test/tomee-plume/conf/tomee.xml | 7 +
10 files changed, 908 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 72e37fd..fc89f17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.maven-dependency-plugin>2.9</version.maven-dependency-plugin>
- <version.activemq>5.15.8</version.activemq>
+ <version.activemq>5.15.12</version.activemq>
<version.gmaven-plugin>1.5</version.gmaven-plugin>
</properties>
@@ -104,6 +104,22 @@
<dependency>
<groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <version>${version.activemq}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>3.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>${version.activemq}</version>
<exclusions>
@@ -125,6 +141,11 @@
<artifactId>greenmail-standalone</artifactId>
<version>1.5.10</version>
</dependency>
+ <dependency>
+ <groupId>com.unboundid</groupId>
+ <artifactId>unboundid-ldapsdk</artifactId>
+ <version>5.1.0</version>
+ </dependency>
<!--<dependency>-->
<!--<groupId>com.test</groupId>-->
@@ -142,6 +163,20 @@
<scope>system</scope>
<systemPath>${jakartaee.cts.home}/lib/tsharness.jar</systemPath>
</dependency>
+ <dependency>
+ <groupId>com.sun.javaee.tck</groupId>
+ <artifactId>tssv</artifactId>
+ <version>${jakartaee.tck.version}</version>
+ <scope>system</scope>
+ <systemPath>${jakartaee.cts.home}/lib/tssv.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.javaee.tck</groupId>
+ <artifactId>tsprovider</artifactId>
+ <version>${jakartaee.tck.version}</version>
+ <scope>system</scope>
+ <systemPath>${jakartaee.cts.home}/lib/tsprovider.jar</systemPath>
+ </dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
@@ -205,6 +240,12 @@
<type>jar</type>
<version>${tomee.version}</version>
</dependency>
+ <dependency>
+ <groupId>${openejb.groupId}</groupId>
+ <artifactId>tomee-security</artifactId>
+ <type>jar</type>
+ <version>${tomee.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -254,6 +295,16 @@
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util-scan</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-juli</artifactId>
<version>${tomcat.version}</version>
</dependency>
@@ -312,6 +363,20 @@
</artifactItems>
</configuration>
</execution>
+ <execution>
+ <id>copy-activemq</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${openejb.home}/lib</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ <excludeTransitive>false</excludeTransitive>
+ <includeArtifactIds>hawtbuf,activemq-ra,activemq-broker,activemq-kahadb-store,geronimo-connector</includeArtifactIds>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -642,6 +707,7 @@
<portName>webcontainer.default.clientcert.port</portName>
<portName>webcontainer.default.shutdown.port</portName>
<portName>derby.server.port</portName>
+ <portName>ldap.server.port</portName>
<portName>harness.log.port</portName>
</portNames>
</configuration>
@@ -681,6 +747,18 @@
<mainClass>org.apache.openejb.cts.GreenmailRunner</mainClass>
</configuration>
</execution>
+ <execution>
+ <id>start-ldap</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <cleanupDaemonThreads>false</cleanupDaemonThreads>
+ <mainClass>org.apache.openejb.cts.UnboundIdLdapRunner</mainClass>
+ <arguments>src/test/ldap/ldap.ldif</arguments>
+ </configuration>
+ </execution>
</executions>
</plugin>
@@ -718,7 +796,7 @@
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<excludeTransitive>true</excludeTransitive>
- <includeArtifactIds>hawtbuf,tomcat-websocket,tomcat-util,tomcat-juli,tomcat-api,openejb-lite,activemq-client,activemq-client,tsharness,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer</includeArtifactIds>
+ <includeArtifactIds>hawtbuf,tomcat-websocket,tomcat-util,tomcat-util-scan,tomcat-juli,tomcat-catalina,tomee-security,tomcat-api,openejb-lite,activemq-client,tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer</includeArtifactIds>
</configuration>
</execution>
<execution>
@@ -732,7 +810,7 @@
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<excludeTransitive>true</excludeTransitive>
- <includeArtifactIds>activemq-client,activemq-client,tsharness,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer</includeArtifactIds>
+ <includeArtifactIds>activemq-client,tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer</includeArtifactIds>
</configuration>
</execution>
</executions>
diff --git a/src/main/java/org/apache/openejb/cts/UnboundIdLdapRunner.java b/src/main/java/org/apache/openejb/cts/UnboundIdLdapRunner.java
new file mode 100644
index 0000000..2af6161
--- /dev/null
+++ b/src/main/java/org/apache/openejb/cts/UnboundIdLdapRunner.java
@@ -0,0 +1,99 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 com.unboundid.ldap.listener.InMemoryDirectoryServer;
+import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
+import com.unboundid.ldap.listener.InMemoryListenerConfig;
+import com.unboundid.ldif.LDIFReader;
+import org.apache.openejb.util.Join;
+
+public class UnboundIdLdapRunner {
+
+ private static class LdapThread extends Thread {
+ private static final int SLEEP_INTERVAL = 60000;
+ private final String ldifFile;
+ private final int port;
+
+ public LdapThread(final String ldifFile, final int port) {
+ this.ldifFile = ldifFile;
+ this.port = port;
+ }
+
+ public void run() {
+ System.out.println(String.format("Starting LDAP server with file %s and port %s", ldifFile, port));
+
+ InMemoryDirectoryServer ldapServer = null;
+ try {
+ final InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig("dc=net");
+ final InMemoryListenerConfig listenerConfig = new InMemoryListenerConfig(
+ "LdapForSecurityAPI",
+ null,
+ port,
+ null,
+ null,
+ null);
+
+ config.setListenerConfigs(listenerConfig);
+ ldapServer = new InMemoryDirectoryServer(config);
+
+ ldapServer.importFromLDIF(true, new LDIFReader(ldifFile));
+ ldapServer.startListening();
+
+ } catch (final Exception ex) {
+ throw new IllegalStateException(ex);
+ }
+
+ while (true) {
+ try {
+ Thread.sleep(SLEEP_INTERVAL);
+ } catch (final InterruptedException e) {
+ break;
+ }
+ }
+
+ System.out.println("Embedded ldap thread stopping");
+ }
+
+ }
+
+ public static void main(String[] args) {
+ int port = 11389;
+ String ldifFile = null;
+ if (args.length == 1) { // it's the file
+ ldifFile = args[0];
+ }
+ if (args.length == 2) { // first is URL and second is port
+ try {
+ port = Integer.parseInt(args[1]);
+
+ } catch (final NumberFormatException e) {
+ System.out.println(String.format("Could not convert ports %s. Using the default port %s",
+ Join.join(", ", args), port));
+ }
+ }
+
+ if (ldifFile == null) {
+ throw new IllegalArgumentException("LDIF file is required as first argument");
+ }
+
+ final UnboundIdLdapRunner.LdapThread thread = new UnboundIdLdapRunner.LdapThread(ldifFile, port);
+ thread.setDaemon(true);
+ thread.setName("LdaplServerDaemon");
+ thread.start();
+ }
+}
diff --git a/src/test/java/org/apache/openejb/tck/util/GeneratePackages.java b/src/test/java/org/apache/openejb/tck/util/GeneratePackages.java
index 0816976..b3e14b8 100644
--- a/src/test/java/org/apache/openejb/tck/util/GeneratePackages.java
+++ b/src/test/java/org/apache/openejb/tck/util/GeneratePackages.java
@@ -57,7 +57,8 @@ public class GeneratePackages {
private void print(final Node node, String pad) {
if (node.children.size() == 0) {
- System.out.println(pad + node.name);
+ final String value = pad + node.name;
+ System.out.println("build." + value + " = -Dhttps.protocols=TLSv1.1,TLSv1.2 --env -nc -c -U -w " + value);
} else {
pad += node.name + ".";
for (final Node n : node.children.values()) {
diff --git a/src/test/ldap/ldap.ldif b/src/test/ldap/ldap.ldif
new file mode 100644
index 0000000..3f88156
--- /dev/null
+++ b/src/test/ldap/ldap.ldif
@@ -0,0 +1,207 @@
+dn: dc=net
+objectclass: top
+objectclass: dcObject
+objectclass: organization
+dc: net
+o: net
+
+dn: dc=securityapi,dc=net
+objectclass: top
+objectclass: dcObject
+objectclass: organization
+dc: securityapi
+o: securityapi
+
+dn: ou=caller,dc=securityapi,dc=net
+objectclass: top
+objectclass: organizationalUnit
+ou: caller
+
+dn: uid=tom,ou=caller,dc=securityapi,dc=net
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: tom
+cn: Tom Rahman
+sn: Tom
+userPassword: secret1
+
+dn: uid=emma,ou=caller,dc=securityapi,dc=net
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: emma
+cn: Emma Kosowski
+sn: Emma
+userPassword: secret2
+
+dn: uid=bob,ou=caller,dc=securityapi,dc=net
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: bob
+cn: Bob
+sn: Bob
+userPassword: secret3
+
+dn: ou=subcaller,ou=caller,dc=securityapi,dc=net
+objectclass: top
+objectclass: organizationalUnit
+ou: subcaller
+
+dn: uid=subtom,ou=subcaller,ou=caller,dc=securityapi,dc=net
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: subtom
+cn: SubTom Rahman
+sn: SubTom
+userPassword: secret1
+
+dn: uid=subemma,ou=subcaller,ou=caller,dc=securityapi,dc=net
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: subemma
+cn: SubEmma Kosowski
+sn: SubEmma
+userPassword: secret2
+
+dn: uid=subbob,ou=subcaller,ou=caller,dc=securityapi,dc=net
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: subbob
+cn: SubBob
+sn: SubBob
+userPassword: secret3
+
+dn: ou=group,dc=securityapi,dc=net
+objectclass: top
+objectclass: organizationalUnit
+ou: group
+
+
+dn: cn=Administrator,ou=group,dc=securityapi,dc=net
+objectclass: top
+objectclass: groupOfNames
+cn: Administrator
+member: uid=tom,ou=caller,dc=securityapi,dc=net
+member: uid=emma,ou=caller,dc=securityapi,dc=net
+member: uid=bob,ou=caller,dc=securityapi,dc=net
+
+dn: cn=Manager,ou=group,dc=securityapi,dc=net
+objectclass: top
+objectclass: groupOfNames
+cn: Manager
+member: uid=tom,ou=caller,dc=securityapi,dc=net
+
+dn: cn=Employee,ou=group,dc=securityapi,dc=net
+objectclass: top
+objectclass: groupOfNames
+cn: Employee
+member: uid=emma,ou=caller,dc=securityapi,dc=net
+
+dn: ou=subgroup,ou=group,dc=securityapi,dc=net
+objectclass: top
+objectclass: organizationalUnit
+ou: subgroup
+
+dn: cn=SubAdministrator,ou=subgroup,ou=group,dc=securityapi,dc=net
+objectclass: top
+objectclass: groupOfNames
+cn: SubAdministrator
+member: uid=subtom,ou=subcaller,ou=caller,dc=securityapi,dc=net
+member: uid=subemma,ou=subcaller,ou=caller,dc=securityapi,dc=net
+member: uid=subbob,ou=subcaller,ou=caller,dc=securityapi,dc=net
+member: uid=tom,ou=caller,dc=securityapi,dc=net
+member: uid=emma,ou=caller,dc=securityapi,dc=net
+member: uid=bob,ou=caller,dc=securityapi,dc=net
+
+dn: cn=SubManager,ou=subgroup,ou=group,dc=securityapi,dc=net
+objectclass: top
+objectclass: groupOfNames
+cn: SubManager
+member: uid=subtom,ou=subcaller,ou=caller,dc=securityapi,dc=net
+member: uid=tom,ou=caller,dc=securityapi,dc=net
+
+dn: cn=SubEmployee,ou=subgroup,ou=group,dc=securityapi,dc=net
+objectclass: top
+objectclass: groupOfNames
+cn: SubEmployee
+member: uid=subemma,ou=subcaller,ou=caller,dc=securityapi,dc=net
+
+dn: ou=apps,dc=securityapi,dc=net
+objectclass: top
+objectclass: organizationalUnit
+ou: apps
+
+dn: uid=ldap,ou=apps,dc=securityapi,dc=net
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: ldap
+cn: LDAP app user
+sn: ldap
+userPassword: changeOnInstall
+
+dn: ou=callerx,dc=securityapi,dc=net
+objectclass: top
+objectclass: organizationalUnit
+ou: callerx
+
+dn: uid=tomx,ou=callerx,dc=securityapi,dc=net
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: tomx
+cn: Tomx Rahman
+sn: Tomx
+userPassword: secret1
+
+dn: uid=emmax,ou=callerx,dc=securityapi,dc=net
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: emmax
+cn: Emmax Kosowski
+sn: Emmax
+seeAlso: cn=Administratorx,ou=groupx,dc=securityapi,dc=net
+seeAlso: cn=Employeex,ou=groupx,dc=securityapi,dc=net
+userPassword: secret2
+
+dn: uid=bobx,ou=callerx,dc=securityapi,dc=net
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: bobx
+cn: Bobx
+sn: Bobx
+userPassword: secret3
+
+
+dn: ou=groupx,dc=securityapi,dc=net
+objectclass: top
+objectclass: organizationalUnit
+ou: groupx
+
+dn: cn=Administratorx,ou=groupx,dc=securityapi,dc=net
+objectclass: top
+objectclass: groupOfNames
+cn: Administratorx
+member: uid=tomx,ou=callerx,dc=securityapi,dc=net
+member: uid=emmax,ou=callerx,dc=securityapi,dc=net
+member: uid=bobx,ou=callerx,dc=securityapi,dc=net
+
+dn: cn=Managerx,ou=groupx,dc=securityapi,dc=net
+objectclass: top
+objectclass: groupOfNames
+cn: Managerx
+member: uid=tomx,ou=callerx,dc=securityapi,dc=net
+
+dn: cn=Employeex,ou=groupx,dc=securityapi,dc=net
+objectclass: top
+objectclass: groupOfNames
+cn: Employeex
+member: uid=emmax,ou=callerx,dc=securityapi,dc=net
+
diff --git a/src/test/resources/testsuite.properties b/src/test/resources/testsuite.properties
index 2377be1..499c2df 100644
--- a/src/test/resources/testsuite.properties
+++ b/src/test/resources/testsuite.properties
@@ -24,6 +24,7 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
${ts.home}/lib/saxpath.jar${pathsep}\
${ts.home}/lib/xercesImpl-2.11.0.jar${pathsep}\
${ts.home}/lib/xalan-2.7.2.jar${pathsep}\
+ ${ts.home}/lib/tssv.jar${pathsep}\
${ts.home}/lib/xml-apis-1.4.01.jar \
DISPLAY=${ts.display} \
HOME="${user.home}" \
@@ -40,6 +41,7 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
-Djavax.net.ssl.trustStorePassword=changeit \
-Djava.endorsed.dirs=${s1as.java.endorsed.dirs} \
-Dcom.sun.aas.installRoot=${javaee.home} \
+ -Dcatalina.base=${openejb.home} \
-Dlog.file.location=${log.file.location} \
-Dservlet.is.jsr115.compatible=${servlet.is.jsr115.compatible} \
-Dprovider.configuration.file=${provider.configuration.file} \
@@ -158,10 +160,11 @@ jstl.db.url=${derby.url}
keystores.dir=%basedir%/src/test/keystores
harness.temp.directory=%basedir%/target/harnesstmp/
-log.file.location=${openejb.home}/logs
+log.file.location=%basedir%/${openejb.home}/logs
mailuser1=foo@foo.com
mailHost=localhost
+mailFrom=tomee@foo.com
javamail.password=test
openejb.deployment.passwd=ignored
@@ -226,3 +229,12 @@ javatest.timeout.factor=3.0
imap.port = 3143
smtp.port = 3025
javamail.mailbox = INBOX
+
+# Jaspic
+# vendor.authconfig.factory=com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigFactory
+vendor.authconfig.factory=org.apache.catalina.authenticator.jaspic.AuthConfigFactoryImpl
+provider.configuration.file=%basedir%/%openejb.home%/conf/ProviderConfiguration.xml
+j2eelogin.name=j2ee
+j2eelogin.password=j2ee
+servlet.is.jsr115.compatible=false
+logical.hostname.servlet=Catalina/localhost
\ No newline at end of file
diff --git a/src/test/script/openejb/tck/commands/CommandSupport.groovy b/src/test/script/openejb/tck/commands/CommandSupport.groovy
index 4db6d76..e34b978 100644
--- a/src/test/script/openejb/tck/commands/CommandSupport.groovy
+++ b/src/test/script/openejb/tck/commands/CommandSupport.groovy
@@ -244,6 +244,9 @@ abstract class CommandSupport {
// for jonzon
builder.appendAll("johnzon-*.jar")
+ // tomcat for jaspic auth provider and factory
+ builder.appendAll("tomcat-*.jar")
+
builder.getPath("ts.run.classpath")
// ts.harness.classpath
builder = new PathBuilder(this)
diff --git a/src/test/tomee-plume/conf/ProviderConfiguration.xml b/src/test/tomee-plume/conf/ProviderConfiguration.xml
new file mode 100644
index 0000000..bf295b3
--- /dev/null
+++ b/src/test/tomee-plume/conf/ProviderConfiguration.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ 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
+
+-->
+
+<provider-config
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.oracle.com/xml/ns/jaspic"
+ xsi:schemaLocation="http://java.oracle.com/xml/ns/jaspic provider-configuration.xsd">
+ <provider-config-entry>
+ <provider-class>com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProvider</provider-class>
+ <properties version="1.0">
+ <entry key="AuthStatus_SEND_SUCCESS">false</entry>
+ <entry key="requestPolicy">USER_NAME_PASSWORD</entry>
+ </properties>
+ <message-layer>SOAP</message-layer>
+ <app-context-id>null</app-context-id>
+ <reg-description>TestSuite JSR 196 Config Provider</reg-description>
+ </provider-config-entry>
+ <provider-config-entry>
+ <provider-class>com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProvider</provider-class>
+ <properties version="1.0">
+ <entry key="AuthStatus_SEND_SUCCESS">false</entry>
+ <entry key="requestPolicy">USER_NAME_PASSWORD</entry>
+ </properties>
+ <message-layer>SOAP</message-layer>
+ <app-context-id>localhost /Hello_web/Hello</app-context-id>
+ <reg-description>TestSuite JSR 196 Config Provider</reg-description>
+ </provider-config-entry>
+ <provider-config-entry>
+ <provider-class>com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProviderServlet</provider-class>
+ <properties version="1.0">
+ <entry key="AuthStatus_SEND_SUCCESS">true</entry>
+ <entry key="requestPolicy">USER_NAME_PASSWORD</entry>
+ </properties>
+ <message-layer>HttpServlet</message-layer>
+ <app-context-id>Catalina/localhost /spitests_servlet_web</app-context-id>
+ <reg-description>Registration for TSAuthConfigProviderServlet using spitests_servlet_web</reg-description>
+ </provider-config-entry>
+ <provider-config-entry>
+ <provider-class>com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProviderServlet</provider-class>
+ <properties version="1.0">
+ <entry key="AuthStatus_SEND_SUCCESS">true</entry>
+ <entry key="requestPolicy">USER_NAME_PASSWORD</entry>
+ </properties>
+ <message-layer>HttpServlet</message-layer>
+ <app-context-id>Catalina/localhost /spitests_servlet_web/WrapperServlet</app-context-id>
+ <reg-description>Registration for TSAuthConfigProviderServlet using spitests_servlet_web</reg-description>
+ </provider-config-entry>
+</provider-config>
diff --git a/src/test/tomee-plume/conf/jaspic-providers.xml b/src/test/tomee-plume/conf/jaspic-providers.xml
new file mode 100644
index 0000000..fc0ebe1
--- /dev/null
+++ b/src/test/tomee-plume/conf/jaspic-providers.xml
@@ -0,0 +1,424 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jaspic-providers xmlns="http://tomcat.apache.org/xml"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://tomcat.apache.org/xml jaspic-providers.xsd"
+ version="1.0">
+
+
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_autoapplysession_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_basic_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_customform_base_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_customform_expression_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_form_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_rememberme_test1_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_rememberme_test2_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_rememberme_test3_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_sam_delegation_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_sam_obtainbean_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_workflow_cleansubject_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_workflow_secureresponse_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_workflow_validaterequest_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_workflow_validaterequestduringauthen_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_ham_workflow_validaterequestwithfilter_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_basic_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_customhandler_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_database_basic_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_database_hashalgorithm_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_database_hashalgorithmparam_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_database_invalidcallerquery_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_database_invaliddatasource_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_database_invalidgroupsquery_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_database_invalidhashalgorithmparam_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_database_invalidpriorityuseforexpr_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_database_multi_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_database_notvalidated_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_database_priorityuseforexpr_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_database_priorityuseforexprbean_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_database_useforgroup_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_database_useforvalidation_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_idstorepermission_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_basic_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_binddn_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_groupmemberof_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_groupmemberofnotexist_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_invalidbinddn_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_invalidbinddnpassword_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_invalidcallerbasedn_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_invalidcallernameattr_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_invalidcallersearchbase_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_invalidcallersearchfilter_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_invalidgroupmemberattr_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_invalidgroupnameattr_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_invalidgroupsearchbase_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_invalidgroupsearchfilter_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_invalidsearchscopeexpr_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_invalidurl_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_notvalidated_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_priorityuseforexpr_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_searchscopebothonelevel_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_searchscopebothsubtree_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_searchscopecalleronelevelgroupsubtree_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_searchscopecallersubtreegrouponelevel_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_searchscopeexpr_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_useforgroup_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_ldap_useforvalidation_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_multi_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_multiauthz_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_noidstore_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_useforgroup_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_idstore_useforvalidation_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_securitycontext_authenticate_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_securitycontext_callerdata_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_securitycontext_ejb_web"
+ description="any">
+ </provider>
+ <provider name="any"
+ className="org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider"
+ layer="HttpServlet"
+ appContext="Catalina/localhost /securityapi_securitycontext_getprincipalsbytype_web"
+ description="any">
+ </provider>
+</jaspic-providers>
+
+
+
+
diff --git a/src/test/tomee-plume/conf/system.properties b/src/test/tomee-plume/conf/system.properties
index 91de084..6af8c4f 100644
--- a/src/test/tomee-plume/conf/system.properties
+++ b/src/test/tomee-plume/conf/system.properties
@@ -132,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-plume/conf/tomee.xml b/src/test/tomee-plume/conf/tomee.xml
index cc1619e..ee93c60 100644
--- a/src/test/tomee-plume/conf/tomee.xml
+++ b/src/test/tomee-plume/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