Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidy for M1 #194

Merged
merged 1 commit into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/.flattened-pom.xml
11 changes: 4 additions & 7 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.8</version>
<version>1.0.9</version>
<relativePath/>
</parent>

Expand Down Expand Up @@ -99,9 +99,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
</properties>

<build>
Expand Down Expand Up @@ -159,12 +156,12 @@
</executions>
</plugin>

<!-- Restricts the Java version to 21 -->
<!-- Restricts the Java version to 17 -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<release>21</release>
<release>17</release>
<compilerArgument>-Xlint:unchecked</compilerArgument>
</configuration>
</plugin>
Expand All @@ -173,7 +170,7 @@
<plugin>
<groupId>org.glassfish.build</groupId>
<artifactId>spec-version-maven-plugin</artifactId>
<version>2.1</version>
<version>2.2</version>
<configuration>
<spec>
<specVersion>3.1</specVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,13 @@
*/
package ee.jakarta.tck.authentication.test.authzpropagation.jacc;

import static java.security.Policy.getPolicy;
import static java.util.logging.Level.SEVERE;

import java.security.CodeSource;
import java.security.Principal;
import java.security.ProtectionDomain;
import java.security.cert.Certificate;
import java.util.logging.Logger;

import javax.security.auth.Subject;

import jakarta.security.jacc.PolicyContext;
import jakarta.security.jacc.PolicyFactory;
import jakarta.security.jacc.WebResourcePermission;
import java.util.logging.Logger;
import javax.security.auth.Subject;

/**
*
Expand All @@ -49,13 +43,9 @@ public static Subject getSubject() {
}

public static boolean hasAccess(String uri, Subject subject) {
return getPolicy().implies(
new ProtectionDomain(
new CodeSource(null, (Certificate[]) null),
null, null,
subject.getPrincipals().toArray(new Principal[subject.getPrincipals().size()])
),
new WebResourcePermission(uri, "GET")
return PolicyFactory.getPolicyFactory().getPolicy().implies(
new WebResourcePermission(uri, "GET"),
subject.getPrincipals()
);
}
}
137 changes: 137 additions & 0 deletions tck/old-tck/source/internal/docs/jaspic/javadoc_assertions.dtd
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<!--
Javadoc Assertion DTD file. This DTD is used to describe assertions taken from javadoc.
-->
<!--

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

-->

<!-- Version 0.2 -->
<!-- By Stephen DiMilla -->
<!-- Last Modification: -->
<!ELEMENT javadoc (next-available-id, previous-id, technology, id, name, version, assertions?)>
<!ELEMENT next-available-id (#PCDATA)>
<!ELEMENT previous-id (#PCDATA)>
<!ELEMENT technology (#PCDATA)>
<!ELEMENT id (#PCDATA)>
<!ELEMENT name (#PCDATA)>
<!ELEMENT version (#PCDATA)>
<!ELEMENT description (#PCDATA)>
<!ELEMENT assertions (assertion+)>
<!ELEMENT assertion (modified?, id, description, keywords?, package, class-interface, (method | field), comment?, depends?)>
<!ATTLIST assertion
required (true | false) #REQUIRED
impl-spec (true | false) #REQUIRED
status (active | deprecated | removed) #REQUIRED
testable (true | false) #REQUIRED
priority (low | medium | high) #IMPLIED
>
<!ELEMENT modified EMPTY>
<!ELEMENT keywords (keyword+)>
<!ELEMENT keyword (#PCDATA)>
<!ELEMENT comment (#PCDATA)>
<!ELEMENT package (#PCDATA)>
<!ELEMENT class-interface (#PCDATA)>
<!ELEMENT method (parameters?, throw?)>
<!ATTLIST method
name CDATA #REQUIRED
return-type CDATA #REQUIRED
>
<!ELEMENT field EMPTY>
<!ATTLIST field
name CDATA #REQUIRED
type CDATA #REQUIRED
>
<!ELEMENT throw (#PCDATA)>
<!ELEMENT depends (depend+)>
<!ELEMENT depend (#PCDATA)>
<!ELEMENT parameters (parameter+)>
<!ELEMENT parameter (#PCDATA)>
<!--



Example Assertion:


<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE javadoc SYSTEM "https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/master/internal/docs/dtd/javadoc_assertions.dtd">
<?xml-stylesheet type="text/xsl" href="https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/master/internal/docs/xsl/javadoc_assertions.dtd"?>
<javadoc>
<next-available-id>205</next-available-id>
<previous-id>100</previous-id>
<technology>JAXRPC</technology>
<id>JAX-RPC 1.0</id>
<name>Java API for XML-based RPC</name>
<version>0.7</version>
<assertions>
<assertion required="true" impl-spec="false" status="active" testable="true">
<id>7</id>
<description/>
<package>javax.xml.rpc</package>
<class-interface>ServiceFactory</class-interface>
<method-field>newInstance</method-field>
<type-returns>javax.xml.rpc.ServiceFactory</type-returns>
<throws>
<throw>javax.xml.rpc.ServiceException</throw>
</throws>
</assertion>
<assertion required="true" impl-spec="false" status="active" testable="true">
<id>8</id>
<description>
Create a Service instance.
</description>
<package>javax.xml.rpc</package>
<class-interface>ServiceFactory</class-interface>
<method-field>createService</method-field>
<type-returns>javax.xml.rpc.Service</type-returns>
<parameters>
<parameter>java.net.URL</parameter>
<parameter>javax.xml.rpc.namespace.QName</parameter>
</parameters>
</assertion>
<assertion required="true" impl-spec="false" status="active" testable="true">
<id>9</id>
<description>If any error in creation of the specified service</description>
<package>javax.xml.rpc</package>
<class-interface>ServiceFactory</class-interface>
<method-field>createService</method-field>
<type-returns>javax.xml.rpc.Service</type-returns>
<parameters>
<parameter>java.net.URL</parameter>
<parameter>javax.xml.rpc.namespace.QName</parameter>
</parameters>
<throws>
<throw>javax.xml.rpc.ServiceException</throw>
</throws>
</assertion>
<assertion required="true" impl-spec="false" status="active" testable="true">
<id>10</id>
<description>
Create a Service instance.
</description>
<package>javax.xml.rpc</package>
<class-interface>ServiceFactory</class-interface>
<method-field>createService</method-field>
<type-returns>javax.xml.rpc.Service</type-returns>
<parameters>
<parameter>javax.xml.rpc.namespace.QName</parameter>
</parameters>
</assertion>
</assertions>
</javadoc>

-->
Loading