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/11 13:32:18 UTC
[tomee-tck] branch master updated (bd375a8 -> 6deff38)
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git.
from bd375a8 Update files for JASPIC
new a16565d Pull configuration files from TCK because we have to update the app name in order to match Tomcat conventions.
new 6fad10b Don't set quite yet the security property with TS AuthConfig
new 6deff38 Update configuration location to our own files instead of TCK default files
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/openejb/cts/DeploymentImpl.java | 3 +-
src/test/resources/testsuite.properties | 2 +-
src/test/tomcat/conf/ProviderConfiguration.xml | 64 +++++++++++++++
src/test/tomcat/conf/provider-configuration.xsd | 95 ++++++++++++++++++++++
.../tomee-plume/conf/ProviderConfiguration.xml | 64 +++++++++++++++
.../tomee-plume/conf/provider-configuration.xsd | 95 ++++++++++++++++++++++
src/test/tomee-plume/conf/system.properties | 2 +-
src/test/tomee-plus/conf/ProviderConfiguration.xml | 64 +++++++++++++++
.../tomee-plus/conf/provider-configuration.xsd | 95 ++++++++++++++++++++++
src/test/tomee-plus/conf/system.properties | 2 +-
src/test/tomee/conf/ProviderConfiguration.xml | 64 +++++++++++++++
src/test/tomee/conf/provider-configuration.xsd | 95 ++++++++++++++++++++++
src/test/tomee/conf/system.properties | 2 +-
13 files changed, 642 insertions(+), 5 deletions(-)
create mode 100644 src/test/tomcat/conf/ProviderConfiguration.xml
create mode 100644 src/test/tomcat/conf/provider-configuration.xsd
create mode 100644 src/test/tomee-plume/conf/ProviderConfiguration.xml
create mode 100644 src/test/tomee-plume/conf/provider-configuration.xsd
create mode 100644 src/test/tomee-plus/conf/ProviderConfiguration.xml
create mode 100644 src/test/tomee-plus/conf/provider-configuration.xsd
create mode 100644 src/test/tomee/conf/ProviderConfiguration.xml
create mode 100644 src/test/tomee/conf/provider-configuration.xsd
[tomee-tck] 01/03: Pull configuration files from TCK because we
have to update the app name in order to match Tomcat conventions.
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit a16565db3ed5b82b16a44fc8e297306c6c9dc4c7
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Wed Nov 11 14:31:01 2020 +0100
Pull configuration files from TCK because we have to update the app name in order to match Tomcat conventions.
---
src/test/tomcat/conf/ProviderConfiguration.xml | 64 +++++++++++++++
src/test/tomcat/conf/provider-configuration.xsd | 95 ++++++++++++++++++++++
.../tomee-plume/conf/ProviderConfiguration.xml | 64 +++++++++++++++
.../tomee-plume/conf/provider-configuration.xsd | 95 ++++++++++++++++++++++
src/test/tomee-plus/conf/ProviderConfiguration.xml | 64 +++++++++++++++
.../tomee-plus/conf/provider-configuration.xsd | 95 ++++++++++++++++++++++
src/test/tomee/conf/ProviderConfiguration.xml | 64 +++++++++++++++
src/test/tomee/conf/provider-configuration.xsd | 95 ++++++++++++++++++++++
8 files changed, 636 insertions(+)
diff --git a/src/test/tomcat/conf/ProviderConfiguration.xml b/src/test/tomcat/conf/ProviderConfiguration.xml
new file mode 100644
index 0000000..ff72155
--- /dev/null
+++ b/src/test/tomcat/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>Catalina/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/tomcat/conf/provider-configuration.xsd b/src/test/tomcat/conf/provider-configuration.xsd
new file mode 100644
index 0000000..9a9f0ad
--- /dev/null
+++ b/src/test/tomcat/conf/provider-configuration.xsd
@@ -0,0 +1,95 @@
+<?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
+
+-->
+
+<!--
+ This schema is for ProviderConfiguration entries that describes the
+ configuration necessary for loading a auth config security provider
+
+ The provider-config element is the root it may have zero or more
+ provider-config-entry
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://java.oracle.com/xml/ns/jaspic"
+ xmlns="http://java.oracle.com/xml/ns/jaspic"
+ elementFormDefault="qualified">
+
+ <xs:element name="provider-config" >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="provider-config-entry"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <!--
+ provider-config-entry contains
+ 1) Optional provider-class name or null
+ 2) optional properties that conform to the syntax defined by
+ http://java.sun.com/dtd/properties.dtd
+ 3) optional message-layer that indicates which message-layer the provider
+ will act on.
+ 4) optional app-context-id the application context id for that specific
+ application the provider is to be used.
+ 5) optional reg-description describes the purpose of the provider.
+ -->
+ <xs:element name="provider-config-entry" >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" ref="provider-class"/>
+ <xs:element minOccurs="0" ref="properties"/>
+ <xs:element minOccurs="0" ref="message-layer"/>
+ <xs:element minOccurs="0" ref="app-context-id"/>
+ <xs:element minOccurs="0" ref="reg-description"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="provider-class" type="xs:string"/>
+ <xs:element name="message-layer" type="xs:string"/>
+ <xs:element name="app-context-id" type="xs:string"/>
+ <xs:element name="reg-description" type="xs:string"/>
+ <xs:element name="properties">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" ref="comment"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="entry"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="attlist.properties"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.properties">
+ <xs:attribute name="version" default="1.0">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="1.0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:attributeGroup>
+ <xs:element name="comment" type="xs:string"/>
+ <xs:element name="entry">
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="attlist.entry"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.entry">
+ <xs:attribute name="key" use="required"/>
+ </xs:attributeGroup>
+</xs:schema>
diff --git a/src/test/tomee-plume/conf/ProviderConfiguration.xml b/src/test/tomee-plume/conf/ProviderConfiguration.xml
new file mode 100644
index 0000000..ff72155
--- /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>Catalina/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/provider-configuration.xsd b/src/test/tomee-plume/conf/provider-configuration.xsd
new file mode 100644
index 0000000..9a9f0ad
--- /dev/null
+++ b/src/test/tomee-plume/conf/provider-configuration.xsd
@@ -0,0 +1,95 @@
+<?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
+
+-->
+
+<!--
+ This schema is for ProviderConfiguration entries that describes the
+ configuration necessary for loading a auth config security provider
+
+ The provider-config element is the root it may have zero or more
+ provider-config-entry
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://java.oracle.com/xml/ns/jaspic"
+ xmlns="http://java.oracle.com/xml/ns/jaspic"
+ elementFormDefault="qualified">
+
+ <xs:element name="provider-config" >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="provider-config-entry"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <!--
+ provider-config-entry contains
+ 1) Optional provider-class name or null
+ 2) optional properties that conform to the syntax defined by
+ http://java.sun.com/dtd/properties.dtd
+ 3) optional message-layer that indicates which message-layer the provider
+ will act on.
+ 4) optional app-context-id the application context id for that specific
+ application the provider is to be used.
+ 5) optional reg-description describes the purpose of the provider.
+ -->
+ <xs:element name="provider-config-entry" >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" ref="provider-class"/>
+ <xs:element minOccurs="0" ref="properties"/>
+ <xs:element minOccurs="0" ref="message-layer"/>
+ <xs:element minOccurs="0" ref="app-context-id"/>
+ <xs:element minOccurs="0" ref="reg-description"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="provider-class" type="xs:string"/>
+ <xs:element name="message-layer" type="xs:string"/>
+ <xs:element name="app-context-id" type="xs:string"/>
+ <xs:element name="reg-description" type="xs:string"/>
+ <xs:element name="properties">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" ref="comment"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="entry"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="attlist.properties"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.properties">
+ <xs:attribute name="version" default="1.0">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="1.0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:attributeGroup>
+ <xs:element name="comment" type="xs:string"/>
+ <xs:element name="entry">
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="attlist.entry"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.entry">
+ <xs:attribute name="key" use="required"/>
+ </xs:attributeGroup>
+</xs:schema>
diff --git a/src/test/tomee-plus/conf/ProviderConfiguration.xml b/src/test/tomee-plus/conf/ProviderConfiguration.xml
new file mode 100644
index 0000000..ff72155
--- /dev/null
+++ b/src/test/tomee-plus/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>Catalina/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-plus/conf/provider-configuration.xsd b/src/test/tomee-plus/conf/provider-configuration.xsd
new file mode 100644
index 0000000..9a9f0ad
--- /dev/null
+++ b/src/test/tomee-plus/conf/provider-configuration.xsd
@@ -0,0 +1,95 @@
+<?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
+
+-->
+
+<!--
+ This schema is for ProviderConfiguration entries that describes the
+ configuration necessary for loading a auth config security provider
+
+ The provider-config element is the root it may have zero or more
+ provider-config-entry
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://java.oracle.com/xml/ns/jaspic"
+ xmlns="http://java.oracle.com/xml/ns/jaspic"
+ elementFormDefault="qualified">
+
+ <xs:element name="provider-config" >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="provider-config-entry"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <!--
+ provider-config-entry contains
+ 1) Optional provider-class name or null
+ 2) optional properties that conform to the syntax defined by
+ http://java.sun.com/dtd/properties.dtd
+ 3) optional message-layer that indicates which message-layer the provider
+ will act on.
+ 4) optional app-context-id the application context id for that specific
+ application the provider is to be used.
+ 5) optional reg-description describes the purpose of the provider.
+ -->
+ <xs:element name="provider-config-entry" >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" ref="provider-class"/>
+ <xs:element minOccurs="0" ref="properties"/>
+ <xs:element minOccurs="0" ref="message-layer"/>
+ <xs:element minOccurs="0" ref="app-context-id"/>
+ <xs:element minOccurs="0" ref="reg-description"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="provider-class" type="xs:string"/>
+ <xs:element name="message-layer" type="xs:string"/>
+ <xs:element name="app-context-id" type="xs:string"/>
+ <xs:element name="reg-description" type="xs:string"/>
+ <xs:element name="properties">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" ref="comment"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="entry"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="attlist.properties"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.properties">
+ <xs:attribute name="version" default="1.0">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="1.0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:attributeGroup>
+ <xs:element name="comment" type="xs:string"/>
+ <xs:element name="entry">
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="attlist.entry"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.entry">
+ <xs:attribute name="key" use="required"/>
+ </xs:attributeGroup>
+</xs:schema>
diff --git a/src/test/tomee/conf/ProviderConfiguration.xml b/src/test/tomee/conf/ProviderConfiguration.xml
new file mode 100644
index 0000000..ff72155
--- /dev/null
+++ b/src/test/tomee/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>Catalina/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/conf/provider-configuration.xsd b/src/test/tomee/conf/provider-configuration.xsd
new file mode 100644
index 0000000..9a9f0ad
--- /dev/null
+++ b/src/test/tomee/conf/provider-configuration.xsd
@@ -0,0 +1,95 @@
+<?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
+
+-->
+
+<!--
+ This schema is for ProviderConfiguration entries that describes the
+ configuration necessary for loading a auth config security provider
+
+ The provider-config element is the root it may have zero or more
+ provider-config-entry
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://java.oracle.com/xml/ns/jaspic"
+ xmlns="http://java.oracle.com/xml/ns/jaspic"
+ elementFormDefault="qualified">
+
+ <xs:element name="provider-config" >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="provider-config-entry"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <!--
+ provider-config-entry contains
+ 1) Optional provider-class name or null
+ 2) optional properties that conform to the syntax defined by
+ http://java.sun.com/dtd/properties.dtd
+ 3) optional message-layer that indicates which message-layer the provider
+ will act on.
+ 4) optional app-context-id the application context id for that specific
+ application the provider is to be used.
+ 5) optional reg-description describes the purpose of the provider.
+ -->
+ <xs:element name="provider-config-entry" >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" ref="provider-class"/>
+ <xs:element minOccurs="0" ref="properties"/>
+ <xs:element minOccurs="0" ref="message-layer"/>
+ <xs:element minOccurs="0" ref="app-context-id"/>
+ <xs:element minOccurs="0" ref="reg-description"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="provider-class" type="xs:string"/>
+ <xs:element name="message-layer" type="xs:string"/>
+ <xs:element name="app-context-id" type="xs:string"/>
+ <xs:element name="reg-description" type="xs:string"/>
+ <xs:element name="properties">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" ref="comment"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="entry"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="attlist.properties"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.properties">
+ <xs:attribute name="version" default="1.0">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="1.0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:attributeGroup>
+ <xs:element name="comment" type="xs:string"/>
+ <xs:element name="entry">
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="attlist.entry"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.entry">
+ <xs:attribute name="key" use="required"/>
+ </xs:attributeGroup>
+</xs:schema>
[tomee-tck] 02/03: Don't set quite yet the security property with
TS AuthConfig
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit 6fad10b78adb0a26be64575fc93fc68c330b5ee2
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Wed Nov 11 14:31:30 2020 +0100
Don't set quite yet the security property with TS AuthConfig
---
src/main/java/org/apache/openejb/cts/DeploymentImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/openejb/cts/DeploymentImpl.java b/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
index 31b1b8e..ff97abe 100644
--- a/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
+++ b/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
@@ -59,7 +59,8 @@ public class DeploymentImpl implements TSDeploymentInterface2 {
Properties overrides = new Properties();
String containerJavaHome = System.getProperty("container.java.home");
String containerJavaVersion = System.getProperty("container.java.version");
- String containerJavaOpts = System.getProperty("container.java.opts", "-Djava.security.properties=conf/security.properties -Dopenejb.deployer.jndiname=openejb/DeployerBusinessRemote");
+ String containerJavaOpts = System.getProperty("container.java.opts", "-Dopenejb.deployer.jndiname=openejb/DeployerBusinessRemote");
+ // String containerJavaOpts = System.getProperty("container.java.opts", "-Djava.security.properties=conf/security.properties -Dopenejb.deployer.jndiname=openejb/DeployerBusinessRemote");
if (containerJavaVersion != null) {
overrides.put("java.version", containerJavaVersion);
}
[tomee-tck] 03/03: Update configuration location to our own files
instead of TCK default files
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit 6deff38ca2bb025e55af75c6fd4f2a032c5b383f
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Wed Nov 11 14:32:00 2020 +0100
Update configuration location to our own files instead of TCK default files
---
src/test/resources/testsuite.properties | 2 +-
src/test/tomee-plume/conf/system.properties | 2 +-
src/test/tomee-plus/conf/system.properties | 2 +-
src/test/tomee/conf/system.properties | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/test/resources/testsuite.properties b/src/test/resources/testsuite.properties
index 6495a96..ed2d388 100644
--- a/src/test/resources/testsuite.properties
+++ b/src/test/resources/testsuite.properties
@@ -232,7 +232,7 @@ javamail.mailbox = INBOX
# Jaspic
vendor.authconfig.factory=org.apache.catalina.authenticator.jaspic.AuthConfigFactoryImpl
-provider.configuration.file=%cts.home%/src/com/sun/ts/tests/jaspic/tssv/config/ProviderConfiguration.xml
+provider.configuration.file=%user.dir%/%openejb.home%/conf/ProviderConfiguration.xml
j2eelogin.name=j2ee
j2eelogin.password=j2ee
servlet.is.jsr115.compatible=false
diff --git a/src/test/tomee-plume/conf/system.properties b/src/test/tomee-plume/conf/system.properties
index 390121a..4af938e 100644
--- a/src/test/tomee-plume/conf/system.properties
+++ b/src/test/tomee-plume/conf/system.properties
@@ -137,7 +137,7 @@ openejb.classloader.forced-skip=com.sun.ts.tests.jaspic.tssv.
# 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=%cts.home%/src/com/sun/ts/tests/jaspic/tssv/config/ProviderConfiguration.xml
+provider.configuration.file=%user.dir%/%openejb.home%/conf/ProviderConfiguration.xml
j2eelogin.name=j2ee
j2eelogin.password=j2ee
diff --git a/src/test/tomee-plus/conf/system.properties b/src/test/tomee-plus/conf/system.properties
index 7793f88..9f0874c 100644
--- a/src/test/tomee-plus/conf/system.properties
+++ b/src/test/tomee-plus/conf/system.properties
@@ -134,7 +134,7 @@ openejb.classloader.forced-skip=com.sun.ts.tests.jaspic.tssv.
# 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=%cts.home%/src/com/sun/ts/tests/jaspic/tssv/config/ProviderConfiguration.xml
+provider.configuration.file=%user.dir%/%openejb.home%/conf/ProviderConfiguration.xml
j2eelogin.name=j2ee
j2eelogin.password=j2ee
diff --git a/src/test/tomee/conf/system.properties b/src/test/tomee/conf/system.properties
index 67c0741..79a9403 100644
--- a/src/test/tomee/conf/system.properties
+++ b/src/test/tomee/conf/system.properties
@@ -134,7 +134,7 @@ openejb.classloader.forced-skip=org.apache.derby.,com.sun.ts.tests.jaspic.tssv.
# 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=%cts.home%/src/com/sun/ts/tests/jaspic/tssv/config/ProviderConfiguration.xml
+provider.configuration.file=%user.dir%/%openejb.home%/conf/ProviderConfiguration.xml
j2eelogin.name=j2ee
j2eelogin.password=j2ee