moved to jakarta

SecurityTokenProvider

.classpath

@@ -9,20 +9,24 @@
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

.gitignore

@@ -0,0 +1 @@
+/target/

.project

@@ -10,6 +10,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -19,5 +29,6 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>

.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=11

CHANGELOG.md

@@ -0,0 +1,55 @@
+
+# Changelog
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [v3.0.1-SNAPSHOT] - [2024-02-02]
+
+- authorization endpoints configuration retrieving moved from common scanner to reflection library
+
+
+## [v3.0.0] - [2022-06-06]
+
+- removed common-scope from the dependencies
+
+## [v2.5.0] - [2022-04-20]
+
+- Deprecated AccessTokenProvider, AuthorizationProvider and SecurityTokenProvider [#22871]
+- Added roles to ExternalService Client info
+
+## [v2.4.0] - [2021-05-21]
+
+JWTUmaTokenProvider changed to AccessTokenProvider
+
+## [v2.3.1] - [2021-03-30]
+
+User info returns also email, first name and Last name according to the new UMA token
+
+## [v2.3.0] - [2010-11-17]
+
+support for the new IAM added
+
+## [v2.2.1] - [2019-01-14]
+
+endpoint updated for https
+
+## [v2.1.6] - [2019-01-14]
+
+added ListMapper
+
+## [v2.1.3] - [2019-01-14]
+
+added the support for authorization control library
+
+## [v2.0.2] - [2017-02-27]
+
+added set and reset of scope in AuthorizedTask
+
+## [v2.0.0] - [2016-09-30]
+
+new model for auth2
+
+## [v1.0.0] - [2015-05-18]
+
+First Release

FUNDING.md

@@ -0,0 +1,26 @@
+# Acknowledgments
+
+The projects leading to this software have received funding from a series of European Union programmes including:
+
+- the Sixth Framework Programme for Research and Technological Development
+    - [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260).
+- the Seventh Framework Programme for research, technological development and demonstration 
+    - [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488);
+    - [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019);
+    - [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465);
+    - [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644);
+    - [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754).
+- the H2020 research and innovation programme 
+    - [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024);
+    - [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119);
+    - [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142);
+    - [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182);
+    - [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680);
+    - [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610);
+    - [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001);
+    - [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194);
+    - [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914);
+    - [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091);
+    - [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650);
+    - [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409);
+    - [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042);

LICENSE.md

@@ -0,0 +1,311 @@
+#European Union Public Licence V.1.1
+
+##*EUPL © the European Community 2007*
+
+
+This **European Union Public Licence** (the **“EUPL”**) applies to the Work or Software
+(as defined below) which is provided under the terms of this Licence. Any use of
+the Work, other than as authorised under this Licence is prohibited (to the
+extent such use is covered by a right of the copyright holder of the Work).
+
+The Original Work is provided under the terms of this Licence when the Licensor
+(as defined below) has placed the following notice immediately following the
+copyright notice for the Original Work:
+
+**Licensed under the EUPL V.1.1**
+
+or has expressed by any other mean his willingness to license under the EUPL.
+
+
+
+##1. Definitions
+
+In this Licence, the following terms have the following meaning:
+
+- The Licence: this Licence.
+
+- The Original Work or the Software: the software distributed and/or
+  communicated by the Licensor under this Licence, available as Source Code and
+  also as Executable Code as the case may be.
+
+- Derivative Works: the works or software that could be created by the Licensee,
+  based upon the Original Work or modifications thereof. This Licence does not
+  define the extent of modification or dependence on the Original Work required
+  in order to classify a work as a Derivative Work; this extent is determined by
+  copyright law applicable in the country mentioned in Article 15.
+
+- The Work: the Original Work and/or its Derivative Works.
+
+- The Source Code: the human-readable form of the Work which is the most
+  convenient for people to study and modify.
+
+- The Executable Code: any code which has generally been compiled and which is
+  meant to be interpreted by a computer as a program.
+
+- The Licensor: the natural or legal person that distributes and/or communicates
+  the Work under the Licence.
+
+- Contributor(s): any natural or legal person who modifies the Work under the
+  Licence, or otherwise contributes to the creation of a Derivative Work.
+
+- The Licensee or “You”: any natural or legal person who makes any usage of the
+  Software under the terms of the Licence.
+
+- Distribution and/or Communication: any act of selling, giving, lending,
+  renting, distributing, communicating, transmitting, or otherwise making
+  available, on-line or off-line, copies of the Work or providing access to its
+  essential functionalities at the disposal of any other natural or legal
+  person.
+
+
+
+##2. Scope of the rights granted by the Licence
+
+The Licensor hereby grants You a world-wide, royalty-free, non-exclusive,
+sub-licensable licence to do the following, for the duration of copyright vested
+in the Original Work:
+
+- use the Work in any circumstance and for all usage, reproduce the Work, modify
+- the Original Work, and make Derivative Works based upon the Work, communicate
+- to the public, including the right to make available or display the Work or
+- copies thereof to the public and perform publicly, as the case may be, the
+- Work, distribute the Work or copies thereof, lend and rent the Work or copies
+- thereof, sub-license rights in the Work or copies thereof.
+
+Those rights can be exercised on any media, supports and formats, whether now
+known or later invented, as far as the applicable law permits so.
+
+In the countries where moral rights apply, the Licensor waives his right to
+exercise his moral right to the extent allowed by law in order to make effective
+the licence of the economic rights here above listed.
+
+The Licensor grants to the Licensee royalty-free, non exclusive usage rights to
+any patents held by the Licensor, to the extent necessary to make use of the
+rights granted on the Work under this Licence.
+
+
+
+##3. Communication of the Source Code
+
+The Licensor may provide the Work either in its Source Code form, or as
+Executable Code. If the Work is provided as Executable Code, the Licensor
+provides in addition a machine-readable copy of the Source Code of the Work
+along with each copy of the Work that the Licensor distributes or indicates, in
+a notice following the copyright notice attached to the Work, a repository where
+the Source Code is easily and freely accessible for as long as the Licensor
+continues to distribute and/or communicate the Work.
+
+
+
+##4. Limitations on copyright
+
+Nothing in this Licence is intended to deprive the Licensee of the benefits from
+any exception or limitation to the exclusive rights of the rights owners in the
+Original Work or Software, of the exhaustion of those rights or of other
+applicable limitations thereto.
+
+
+
+##5. Obligations of the Licensee
+
+The grant of the rights mentioned above is subject to some restrictions and
+obligations imposed on the Licensee. Those obligations are the following:
+
+Attribution right: the Licensee shall keep intact all copyright, patent or
+trademarks notices and all notices that refer to the Licence and to the
+disclaimer of warranties. The Licensee must include a copy of such notices and a
+copy of the Licence with every copy of the Work he/she distributes and/or
+communicates. The Licensee must cause any Derivative Work to carry prominent
+notices stating that the Work has been modified and the date of modification.
+
+Copyleft clause: If the Licensee distributes and/or communicates copies of the
+Original Works or Derivative Works based upon the Original Work, this
+Distribution and/or Communication will be done under the terms of this Licence
+or of a later version of this Licence unless the Original Work is expressly
+distributed only under this version of the Licence. The Licensee (becoming
+Licensor) cannot offer or impose any additional terms or conditions on the Work
+or Derivative Work that alter or restrict the terms of the Licence.
+
+Compatibility clause: If the Licensee Distributes and/or Communicates Derivative
+Works or copies thereof based upon both the Original Work and another work
+licensed under a Compatible Licence, this Distribution and/or Communication can
+be done under the terms of this Compatible Licence. For the sake of this clause,
+“Compatible Licence” refers to the licences listed in the appendix attached to
+this Licence. Should the Licensee’s obligations under the Compatible Licence
+conflict with his/her obligations under this Licence, the obligations of the
+Compatible Licence shall prevail.
+
+Provision of Source Code: When distributing and/or communicating copies of the
+Work, the Licensee will provide a machine-readable copy of the Source Code or
+indicate a repository where this Source will be easily and freely available for
+as long as the Licensee continues to distribute and/or communicate the Work.
+
+Legal Protection: This Licence does not grant permission to use the trade names,
+trademarks, service marks, or names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the copyright notice.
+
+
+
+##6. Chain of Authorship
+
+The original Licensor warrants that the copyright in the Original Work granted
+hereunder is owned by him/her or licensed to him/her and that he/she has the
+power and authority to grant the Licence.
+
+Each Contributor warrants that the copyright in the modifications he/she brings
+to the Work are owned by him/her or licensed to him/her and that he/she has the
+power and authority to grant the Licence.
+
+Each time You accept the Licence, the original Licensor and subsequent
+Contributors grant You a licence to their contributions to the Work, under the
+terms of this Licence.
+
+
+
+##7. Disclaimer of Warranty
+
+The Work is a work in progress, which is continuously improved by numerous
+contributors. It is not a finished work and may therefore contain defects or
+“bugs” inherent to this type of software development.
+
+For the above reason, the Work is provided under the Licence on an “as is” basis
+and without warranties of any kind concerning the Work, including without
+limitation merchantability, fitness for a particular purpose, absence of defects
+or errors, accuracy, non-infringement of intellectual property rights other than
+copyright as stated in Article 6 of this Licence.
+
+This disclaimer of warranty is an essential part of the Licence and a condition
+for the grant of any rights to the Work.
+
+
+
+##8. Disclaimer of Liability
+
+Except in the cases of wilful misconduct or damages directly caused to natural
+persons, the Licensor will in no event be liable for any direct or indirect,
+material or moral, damages of any kind, arising out of the Licence or of the use
+of the Work, including without limitation, damages for loss of goodwill, work
+stoppage, computer failure or malfunction, loss of data or any commercial
+damage, even if the Licensor has been advised of the possibility of such
+damage. However, the Licensor will be liable under statutory product liability
+laws as far such laws apply to the Work.
+
+
+
+##9. Additional agreements
+
+While distributing the Original Work or Derivative Works, You may choose to
+conclude an additional agreement to offer, and charge a fee for, acceptance of
+support, warranty, indemnity, or other liability obligations and/or services
+consistent with this Licence. However, in accepting such obligations, You may
+act only on your own behalf and on your sole responsibility, not on behalf of
+the original Licensor or any other Contributor, and only if You agree to
+indemnify, defend, and hold each Contributor harmless for any liability incurred
+by, or claims asserted against such Contributor by the fact You have accepted
+any such warranty or additional liability.
+
+
+
+##10. Acceptance of the Licence
+
+The provisions of this Licence can be accepted by clicking on an icon “I agree”
+placed under the bottom of a window displaying the text of this Licence or by
+affirming consent in any other similar way, in accordance with the rules of
+applicable law. Clicking on that icon indicates your clear and irrevocable
+acceptance of this Licence and all of its terms and conditions.
+
+Similarly, you irrevocably accept this Licence and all of its terms and
+conditions by exercising any rights granted to You by Article 2 of this Licence,
+such as the use of the Work, the creation by You of a Derivative Work or the
+Distribution and/or Communication by You of the Work or copies thereof.
+
+
+
+##11. Information to the public
+
+In case of any Distribution and/or Communication of the Work by means of
+electronic communication by You (for example, by offering to download the Work
+from a remote location) the distribution channel or media (for example, a
+website) must at least provide to the public the information requested by the
+applicable law regarding the Licensor, the Licence and the way it may be
+accessible, concluded, stored and reproduced by the Licensee.
+
+
+
+##12. Termination of the Licence
+
+The Licence and the rights granted hereunder will terminate automatically upon
+any breach by the Licensee of the terms of the Licence.
+
+Such a termination will not terminate the licences of any person who has
+received the Work from the Licensee under the Licence, provided such persons
+remain in full compliance with the Licence.
+
+
+
+##13. Miscellaneous
+
+Without prejudice of Article 9 above, the Licence represents the complete
+agreement between the Parties as to the Work licensed hereunder.
+
+If any provision of the Licence is invalid or unenforceable under applicable
+law, this will not affect the validity or enforceability of the Licence as a
+whole. Such provision will be construed and/or reformed so as necessary to make
+it valid and enforceable.
+
+The European Commission may publish other linguistic versions and/or new
+versions of this Licence, so far this is required and reasonable, without
+reducing the scope of the rights granted by the Licence. New versions of the
+Licence will be published with a unique version number.
+
+All linguistic versions of this Licence, approved by the European Commission,
+have identical value. Parties can take advantage of the linguistic version of
+their choice.
+
+
+
+##14. Jurisdiction
+
+Any litigation resulting from the interpretation of this License, arising
+between the European Commission, as a Licensor, and any Licensee, will be
+subject to the jurisdiction of the Court of Justice of the European Communities,
+as laid down in article 238 of the Treaty establishing the European Community.
+
+Any litigation arising between Parties, other than the European Commission, and
+resulting from the interpretation of this License, will be subject to the
+exclusive jurisdiction of the competent court where the Licensor resides or
+conducts its primary business.
+
+
+
+##15. Applicable Law
+
+This Licence shall be governed by the law of the European Union country where
+the Licensor resides or has his registered office.
+
+This licence shall be governed by the Belgian law if:
+
+- a litigation arises between the European Commission, as a Licensor, and any
+- Licensee; the Licensor, other than the European Commission, has no residence
+- or registered office inside a European Union country.
+
+
+---
+
+
+##Appendix
+
+
+**“Compatible Licences”** according to article 5 EUPL are:
+
+
+- GNU General Public License (GNU GPL) v. 2
+
+- Open Software License (OSL) v. 2.1, v. 3.0
+
+- Common Public License v. 1.0
+
+- Eclipse Public License v. 1.0
+
+- Cecill v. 2.0

README.md

@@ -0,0 +1,46 @@
+# Authorization common library
+
+StorageHub implements the gCube Workspace feature
+
+## Structure of the project
+
+* The source code is present in the src folder. 
+
+## Built With
+
+* [OpenJDK](https://openjdk.java.net/) - The JDK used
+* [Maven](https://maven.apache.org/) - Dependency Management
+
+## Documentation
+
+* Use of this theme is described in the [Wiki](https://wiki.gcube-system.org/gcube/Authorization_Client_Library).
+
+## Change log
+
+See [Releases](https://code-repo.d4science.org/gCubeSystem/authorization-common-library/releases).
+
+## Authors
+
+* **Lucio Lelii** ([ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
+
+
+## License
+
+This project is licensed under the EUPL V.1.1 License - see the [LICENSE.md](LICENSE.md) file for details.
+
+
+## About the gCube Framework
+This software is part of the [gCubeFramework](https://www.gcube-system.org/ "gCubeFramework"): an
+open-source software toolkit used for building and operating Hybrid Data
+Infrastructures enabling the dynamic deployment of Virtual Research Environments
+by favouring the realisation of reuse oriented policies.
+ 
+The projects leading to this software have received funding from a series of European Union programmes including:
+
+- the Sixth Framework Programme for Research and Technological Development
+    - DILIGENT (grant no. 004260);
+- the Seventh Framework Programme for research, technological development and demonstration 
+    - D4Science (grant no. 212488), D4Science-II (grant no.239019), ENVRI (grant no. 283465), EUBrazilOpenBio (grant no. 288754), iMarine(grant no. 283644);
+- the H2020 research and innovation programme 
+    - BlueBRIDGE (grant no. 675680), EGIEngage (grant no. 654142), ENVRIplus (grant no. 654182), Parthenos (grant no. 654119), SoBigData (grant no. 654024),DESIRA (grant no. 818194), ARIADNEplus (grant no. 823914), RISIS2 (grant no. 824091), PerformFish (grant no. 727610), AGINFRAplus (grant no. 731001);
+    

distro/LICENSE

@@ -1 +0,0 @@
-${gcube.license}

distro/README

@@ -1,64 +0,0 @@
-The gCube System - ${name}
---------------------------------------------------
- 
-${description}
- 
- 
-${gcube.description}
- 
-${gcube.funding}
- 
- 
-Version
---------------------------------------------------
- 
-${version} (${buildDate})
- 
-Please see the file named "changelog.xml" in this directory for the release notes.
-
-Authors
---------------------------------------------------
- 
-* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), CNR, Italy
-
-Maintainers
---------------------------------------------------
- 
-* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), CNR, Italy
-
-Download information
---------------------------------------------------
- 
-Source code is available from SVN: 
-    ${scm.url}
- 
-Binaries can be downloaded from the gCube website: 
-   ${gcube.website}
- 
- 
-Installation
---------------------------------------------------
- 
-Installation documentation is available on-line in the gCube Wiki:
-    ${gcube.wikiRoot}  
- 
-Documentation 
---------------------------------------------------
- 
-Documentation is available on-line in the gCube Wiki:
-    ${gcube.wikiRoot} 
- 
-Support 
---------------------------------------------------
- 
-Bugs and support requests can be reported in the gCube issue tracking tool:
-    ${gcube.issueTracking}
- 
- 
-Licensing
---------------------------------------------------
- 
-This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
-
-
-

distro/changelog.xml

@@ -1,14 +0,0 @@
-<ReleaseNotes>
-	<Changeset component="authorization-library-1.0.0" date="2015-05-18">
-		<Change>First Release</Change>
-	</Changeset>
-		<Changeset component="authorization-library-2.0.0" date="2016-09-30">
-		<Change>new model for auth2</Change>
-	</Changeset>
-	<Changeset component="authorization-library-2.0.2" date="2017-02-27">
-		<Change>added set and reset of scope in AuthorizedTask</Change>
-	</Changeset>
-	<Changeset component="authorization-library-2.1.3" date="2019-01-14">
-		<Change>added the support for authorization control library</Change>
-	</Changeset>
-</ReleaseNotes>

distro/descriptor.xml

@@ -1,36 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>servicearchive</id>
-	<formats>
-		<format>tar.gz</format>
-	</formats>
-	<baseDirectory>/</baseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>${distroDirectory}</directory>
-			<outputDirectory>/</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<includes>
-				<include>README</include>
-				<include>LICENSE</include>
-				<include>changelog.xml</include>
-                                <include>profile.xml</include>
-			</includes>
-			<fileMode>755</fileMode>
-			<filtered>true</filtered>
-		</fileSet>
-	</fileSets>
-	<files>
-	<!--	<file>
-			<source>${distroDirectory}/profile.xml</source>
-			<outputDirectory>/</outputDirectory>
-			<filtered>true</filtered>
-		</file>-->
-		<file>
-			<source>target/${build.finalName}.jar</source>
-			<outputDirectory>/${artifactId}</outputDirectory>
-		</file>
-	</files>
-</assembly>

distro/profile.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<ID />
-	<Type>Service</Type>
-	<Profile>
-		<Description>${description}</Description>
-		<Class>Common</Class>
-		<Name>${artifactId}</Name>
-		<Version>1.0.0</Version>
-		<Packages>
-			<Software>
-				<Name>${artifactId}</Name>
-				<Version>${version}</Version>
-				<MavenCoordinates>
-					<groupId>${groupId}</groupId>
-					<artifactId>${artifactId}</artifactId>
-					<version>${version}</version>
-				</MavenCoordinates>
-				<Files>
-					<File>${build.finalName}.jar</File>
-				</Files>
-			</Software>
-		</Packages>
-	</Profile>
-</Resource>
-

pom.xml

@@ -1,31 +1,43 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.common</groupId>
 	<artifactId>common-authorization</artifactId>
-	<version>2.1.5</version>
+	<version>3.0.1-SNAPSHOT</version>
 	<name>authorization service common library</name>
-
 	<parent>
 		<artifactId>maven-parent</artifactId>
 		<groupId>org.gcube.tools</groupId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 	</parent>
+	<scm>
+		<connection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</connection>
+		<developerConnection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</developerConnection>
+		<url>https://code-repo.d4science.org/gCubeSystem/common-authorization</url>
+	</scm>
 
 	<properties>
-		<distroDirectory>distro</distroDirectory>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
 	</properties>
-
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.gcube.distribution</groupId>
+				<artifactId>gcube-bom</artifactId>
+				<version>3.0.1-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<dependencies>
 		<dependency>
-			<groupId>org.gcube.core</groupId>
-			<artifactId>common-scope</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.core</groupId>
-			<artifactId>common-configuration-scanner</artifactId>
-			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<groupId>org.reflections</groupId>
+			<artifactId>reflections</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -33,66 +45,25 @@
 			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
-		
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.5</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
 		</dependency>
 	</dependencies>
-
 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.5</version>
-				<executions>
-					<execution>
-						<id>copy-profile</id>
-						<phase>install</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>target</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${distroDirectory}</directory>
-									<filtering>true</filtering>
-									<includes>
-										<include>profile.xml</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>${distroDirectory}/descriptor.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>servicearchive</id>
-						<phase>install</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 	</build>
-
-</project>
+</project>

src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java

@@ -3,13 +3,6 @@ package org.gcube.common.authorization.library;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.gcube.common.authorization.library.policies.Policy;
 import org.gcube.common.authorization.library.policies.Service2ServicePolicy;
 import org.gcube.common.authorization.library.policies.User2ServicePolicy;
@@ -18,8 +11,13 @@ import org.gcube.common.authorization.library.provider.ContainerInfo;
 import org.gcube.common.authorization.library.provider.ExternalServiceInfo;
 import org.gcube.common.authorization.library.provider.ServiceInfo;
 import org.gcube.common.authorization.library.provider.UserInfo;
-import org.gcube.common.scope.api.ServiceMap;
-import org.gcube.common.scope.impl.DefaultServiceMap;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlElementRefs;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -34,8 +32,7 @@ public class AuthorizationEntry {
 	ClientInfo clientInfo;
 	
 	private String context;
-	@XmlElementRefs({@XmlElementRef(type=DefaultServiceMap.class)})
-	private ServiceMap map;
+	
 	@XmlElementRefs({
 		@XmlElementRef(type = Service2ServicePolicy.class),
 		@XmlElementRef(type = User2ServicePolicy.class),
@@ -66,18 +63,11 @@ public class AuthorizationEntry {
 		return context;
 	}
 		
-	public ServiceMap getMap() {
-		return map;
-	}
 	
 	public String getQualifier() {
 		return qualifier;
 	}
 
-	public void setMap(ServiceMap map) {
-		this.map = map;
-	}
-
 	public List<Policy> getPolicies() {
 		return policies;
 	}
@@ -126,7 +116,7 @@ public class AuthorizationEntry {
 	@Override
 	public String toString() {
 		return "AuthorizationEntry [clientInfo=" + clientInfo + ", context="
-				+ context + ", map=" + map + ", qualifier=" + qualifier
+				+ context + ", qualifier=" + qualifier
 				+ ", policies=" + policies + "]";
 	}
 

src/main/java/org/gcube/common/authorization/library/AuthorizedTasks.java

@@ -1,87 +0,0 @@
-package org.gcube.common.authorization.library;
-
-import java.util.concurrent.Callable;
-
-import org.gcube.common.authorization.library.provider.AuthorizationProvider;
-import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.authorization.library.utils.Caller;
-import org.gcube.common.scope.api.ScopeProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class AuthorizedTasks {
-
-	private static Logger logger= LoggerFactory.getLogger(AuthorizedTasks.class);
-	
-	/**
-	 * Binds a {@link Callable} task to the current scope and user.
-	 * @param task the task
-	 * @return an equivalent {@link Callable} task bound to the current scope and user
-	 */
-	static public <V> Callable<V> bind(final Callable<V> task) {
-		
-		
-		final Caller userCall = AuthorizationProvider.instance.get();
-		
-		final String token = SecurityTokenProvider.instance.get();
-		
-		final String scope = ScopeProvider.instance.get();
-		
-		return new Callable<V>() {
-			@Override
-			public V call() throws Exception {
-				
-				AuthorizationProvider.instance.set(userCall);
-				SecurityTokenProvider.instance.set(token);
-				ScopeProvider.instance.set(scope);
-				
-				try {
-					logger.info("setting on authorized task scope {} and token {}", scope, token);
-					return task.call();
-				}
-				finally {
-					AuthorizationProvider.instance.reset();
-					SecurityTokenProvider.instance.reset();
-					ScopeProvider.instance.reset();
-				}
-				
-			}
-		};
-	}
-	
-	/**
-	 * Binds a {@link Runnable} task to the current scope and user.
-	 * @param task the task
-	 * @return an equivalent {@link Runnable} task bound to the current scope and user
-	 */
-	static public <V> Runnable bind(final Runnable task) {
-		
-		
-		final Caller userCall = AuthorizationProvider.instance.get();
-		
-		final String token = SecurityTokenProvider.instance.get();
-		
-		final String scope = ScopeProvider.instance.get();
-		
-		return new Runnable() {
-			@Override
-			public void run() {
-				AuthorizationProvider.instance.set(userCall);
-				SecurityTokenProvider.instance.set(token);
-				ScopeProvider.instance.set(scope);
-				try {
-					logger.info("setting on authorized task scope {} and token {}", scope, token);
-					task.run();
-				}
-				finally {
-					AuthorizationProvider.instance.reset();
-					SecurityTokenProvider.instance.reset();
-					ScopeProvider.instance.reset();
-				}
-				
-			}
-		};
-	}
-	
-}

src/main/java/org/gcube/common/authorization/library/CalledService.java

@@ -1,8 +1,8 @@
 package org.gcube.common.authorization.library;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/gcube/common/authorization/library/ExternalServiceList.java

@@ -3,13 +3,13 @@ package org.gcube.common.authorization.library;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.gcube.common.authorization.library.utils.MapAdapter;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 
 
 @XmlRootElement

src/main/java/org/gcube/common/authorization/library/Policies.java

@@ -3,16 +3,16 @@ package org.gcube.common.authorization.library;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.gcube.common.authorization.library.policies.Policy;
 import org.gcube.common.authorization.library.policies.Service2ServicePolicy;
 import org.gcube.common.authorization.library.policies.User2ServicePolicy;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlElementRefs;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Policies {

src/main/java/org/gcube/common/authorization/library/QualifiersList.java

@@ -3,13 +3,13 @@ package org.gcube.common.authorization.library;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.gcube.common.authorization.library.utils.MapAdapter;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 
 
 @XmlRootElement

src/main/java/org/gcube/common/authorization/library/endpoints/AuthorizationEndpoint.java

@@ -1,10 +1,10 @@
-package org.gcube.common.authorization.library.enpoints;
+package org.gcube.common.authorization.library.endpoints;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name="authorization-endpoint")
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/gcube/common/authorization/library/endpoints/AuthorizationEndpointScanner.java

@@ -1,21 +1,20 @@
-package org.gcube.common.authorization.library.enpoints;
+package org.gcube.common.authorization.library.endpoints;
 
 import java.net.URL;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
-
-import org.gcube.common.scan.ClasspathScanner;
-import org.gcube.common.scan.ClasspathScannerFactory;
-import org.gcube.common.scan.matchers.NameMatcher;
-import org.gcube.common.scan.resources.ClasspathResource;
+import org.reflections.Reflections;
+import org.reflections.scanners.ResourcesScanner;
+import org.reflections.util.ClasspathHelper;
+import org.reflections.util.ConfigurationBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Unmarshaller;
+
 public class AuthorizationEndpointScanner {
 
 	private static Logger log = LoggerFactory.getLogger(AuthorizationEndpointScanner.class);
@@ -38,17 +37,22 @@ public class AuthorizationEndpointScanner {
 			
 			try {
 
+				ConfigurationBuilder reflectionConf =  new ConfigurationBuilder().addUrls(ClasspathHelper.forJavaClassPath()).addUrls(ClasspathHelper.forClassLoader()).addClassLoader(AuthorizationEndpointScanner.class.getClassLoader()).setScanners(new ResourcesScanner());
+				
+				Reflections reflection = new Reflections(reflectionConf); 
+	
+				Set<String> resources  = reflection.getResources((String input)-> input.endsWith(".authorization"));
+				log.info("loading resources {} ", resources);
+				
 				JAXBContext context = JAXBContext.newInstance(AuthorizationEndpoint.class);
 				Unmarshaller um = context.createUnmarshaller();
 				
 				String defaultInfrastructure = null;
 				int defaultInfraPriority= Integer.MAX_VALUE;
 				
-				for (String r :getEnpointResourceNames()){
-					
-					URL url = Thread.currentThread().getContextClassLoader().getResource(r);
-					
-					
+				for (String resource: resources) {
+					log.info("loading {} ", resource);
+					URL url = Thread.currentThread().getContextClassLoader().getResource(resource);
 					AuthorizationEndpoint endpoint = (AuthorizationEndpoint)um.unmarshal(url);
 					if (defaultInfrastructure==null)
 						defaultInfrastructure = endpoint.getInfrastructure();
@@ -56,7 +60,7 @@ public class AuthorizationEndpointScanner {
 					
 					if (!endpointsMap.containsKey(endpoint.getInfrastructure()) 
 							|| endpointsMap.get(endpoint.getInfrastructure()).getPriority()> endpoint.getPriority()){
-						if (r.startsWith("default") && endpoint.getPriority()<defaultInfraPriority ){
+						if (resource.startsWith("default") && endpoint.getPriority()<defaultInfraPriority ){
 							defaultInfrastructure = endpoint.getInfrastructure();
 							defaultInfraPriority = endpoint.getPriority();
 						}
@@ -64,27 +68,22 @@ public class AuthorizationEndpointScanner {
 					}
 										
 					log.info("loaded endpoint {} ",endpoint.toString());
-				}
+					
+
+			   } 
 				
 				if (endpointsMap.size()==0)
 					throw new Exception("no endpoints retreived");
 				endpoints = new EndpointsContainer(endpointsMap, defaultInfrastructure);
 				log.trace("authorization endpoint retrieving finished");
-			} catch (Exception e) {
-				throw new RuntimeException("could not load authorization endpoints", e);
+				
+			} catch (Throwable e) {
+				log.error("error scanning auth endpoints",e);
+				throw new RuntimeException("could not load auth endpoints", e);
 			}
-			
+
 		}
+		
 		return endpoints;
 	}
-	
-	private static Set<String> getEnpointResourceNames() {
-		
-		ClasspathScanner scanner = ClasspathScannerFactory.scanner();
-		Set<String> names = new HashSet<String>();
-		for (ClasspathResource r : scanner.scan(new NameMatcher(configurationPattern)))
-			names.add(r.name());
-		return names;
-	}
-		
-}
+}			

src/main/java/org/gcube/common/authorization/library/endpoints/EndpointsContainer.java

@@ -1,4 +1,4 @@
-package org.gcube.common.authorization.library.enpoints;
+package org.gcube.common.authorization.library.endpoints;
 
 import java.util.Map;
 

src/main/java/org/gcube/common/authorization/library/policies/ExternalService.java

@@ -1,8 +1,8 @@
 package org.gcube.common.authorization.library.policies;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/gcube/common/authorization/library/policies/Policy.java

@@ -2,10 +2,10 @@ package org.gcube.common.authorization.library.policies;
 
 import java.util.Calendar;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/gcube/common/authorization/library/policies/Role.java

@@ -2,9 +2,9 @@ package org.gcube.common.authorization.library.policies;
 
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/gcube/common/authorization/library/policies/Service2ServicePolicy.java

@@ -2,9 +2,9 @@ package org.gcube.common.authorization.library.policies;
 
 import java.util.Calendar;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/gcube/common/authorization/library/policies/ServiceAccess.java

@@ -3,9 +3,9 @@ package org.gcube.common.authorization.library.policies;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/gcube/common/authorization/library/policies/ServiceEntity.java

@@ -4,9 +4,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/gcube/common/authorization/library/policies/User.java

@@ -2,9 +2,9 @@ package org.gcube.common.authorization.library.policies;
 
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/gcube/common/authorization/library/policies/User2ServicePolicy.java

@@ -2,11 +2,11 @@ package org.gcube.common.authorization.library.policies;
 
 import java.util.Calendar;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlElementRefs;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/gcube/common/authorization/library/policies/UserEntity.java

@@ -3,10 +3,10 @@ package org.gcube.common.authorization.library.policies;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/gcube/common/authorization/library/provider/AuthorizationProvider.java

@@ -1,34 +0,0 @@
-package org.gcube.common.authorization.library.provider;
-
-import org.gcube.common.authorization.library.utils.Caller;
-
-public class AuthorizationProvider {
-
-	public static AuthorizationProvider instance = new AuthorizationProvider();
-		
-	// Thread local variable containing each thread's ID
-    private static final InheritableThreadLocal<Caller> threadAuth =
-        new InheritableThreadLocal<Caller>() {
-    	    	
-    	@Override protected Caller initialValue() {
-                return null;
-        }
-    	
-    };
-	
-	private AuthorizationProvider(){}
-    
-	public Caller get(){
-		Caller info = threadAuth.get();
-		return info;
-	}
-	
-	public void set(Caller info){
-		threadAuth.set(info);
-	}
-	
-	public void reset(){
-		threadAuth.remove();
-	}
-
-}

src/main/java/org/gcube/common/authorization/library/provider/CalledMethodProvider.java

@@ -1,39 +0,0 @@
-package org.gcube.common.authorization.library.provider;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CalledMethodProvider {
-
-public static CalledMethodProvider instance = new CalledMethodProvider();
-	
-	private static Logger logger = LoggerFactory.getLogger(CalledMethodProvider.class);
-	
-	// Thread local variable containing each thread's ID
-    private static final InheritableThreadLocal<String> threadMethod =
-        new InheritableThreadLocal<String>() {
-    	    	
-    	@Override protected String initialValue() {
-                return "UNKNOWN";
-        }
-    	
-    };
-	
-	private CalledMethodProvider(){}
-    
-	public String get(){
-		String calledMethod = threadMethod.get();
-		logger.trace("getting calledMethod as "+calledMethod+" in thread "+Thread.currentThread().getId() );
-		return calledMethod;
-	}
-	
-	public void set(String calledMethod){
-		if (calledMethod==null) return;
-		threadMethod.set(calledMethod);
-		logger.trace("setting calledMethod as "+calledMethod+" in thread "+Thread.currentThread().getId() );
-	}
-	
-	public void reset(){
-		threadMethod.remove();
-	}
-}

src/main/java/org/gcube/common/authorization/library/provider/ClientInfo.java

@@ -3,13 +3,13 @@ package org.gcube.common.authorization.library.provider;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
 import org.gcube.common.authorization.library.ClientType;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlSeeAlso(value={UserInfo.class, ServiceInfo.class, ExternalServiceInfo.class, ContainerInfo.class})

src/main/java/org/gcube/common/authorization/library/provider/ContainerInfo.java

@@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.provider;
 import java.util.Collections;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.gcube.common.authorization.library.ClientType;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ContainerInfo extends ClientInfo{

src/main/java/org/gcube/common/authorization/library/provider/ExternalServiceInfo.java

@@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.provider;
 import java.util.Collections;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.gcube.common.authorization.library.ClientType;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ExternalServiceInfo extends ClientInfo{
@@ -22,10 +22,20 @@ public class ExternalServiceInfo extends ClientInfo{
 	
 	private String generatedBy;
 	
+	private List<String> roles;
+	
 	public ExternalServiceInfo(String id, String generatedBy) {
 		super();
 		this.id = id;
 		this.generatedBy = generatedBy;
+		this.roles = Collections.emptyList();
+	}
+	
+	public ExternalServiceInfo(String id, String generatedBy, List<String> roles) {
+		super();
+		this.id = id;
+		this.generatedBy = generatedBy;
+		this.roles = roles;
 	}
 	
 	protected ExternalServiceInfo() {
@@ -43,7 +53,7 @@ public class ExternalServiceInfo extends ClientInfo{
 
 	@Override
 	public List<String> getRoles() {
-		return Collections.emptyList();
+		return roles;
 	}
 
 	@Override

src/main/java/org/gcube/common/authorization/library/provider/SecurityTokenProvider.java

@@ -1,33 +0,0 @@
-package org.gcube.common.authorization.library.provider;
-
-
-public class SecurityTokenProvider {
-
-	public static SecurityTokenProvider instance = new SecurityTokenProvider();
-	
-	//private static Logger logger = LoggerFactory.getLogger(SecurityTokenProvider.class);
-	
-	// Thread local variable containing each thread's ID
-    private static final InheritableThreadLocal<String> threadToken =
-        new InheritableThreadLocal<String>() {
-    	    	
-    	@Override protected String initialValue() {
-                return null;
-        }
-    	
-    };
-	
-	private SecurityTokenProvider(){}
-    
-	public String get(){
-		return threadToken.get();
-	}
-	
-	public void set(String authorizationToken){
-		threadToken.set(authorizationToken);
-	}
-	
-	public void reset(){
-		threadToken.remove();
-	}
-}

src/main/java/org/gcube/common/authorization/library/provider/ServiceIdentifier.java

@@ -2,9 +2,9 @@ package org.gcube.common.authorization.library.provider;
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/gcube/common/authorization/library/provider/ServiceInfo.java

@@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.provider;
 import java.util.Collections;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.gcube.common.authorization.library.ClientType;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ServiceInfo extends ClientInfo{

src/main/java/org/gcube/common/authorization/library/provider/UserInfo.java

@@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.provider;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.gcube.common.authorization.library.ClientType;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -22,6 +22,11 @@ public class UserInfo extends ClientInfo {
 	private String clientId;
 	private List<String> roles = new ArrayList<String>();
 	
+	private String email;
+	private String firstName;
+	private String lastName;
+	
+	
 	protected UserInfo(){}
 	
 	public UserInfo(String clientId, List<String> roles) {
@@ -30,6 +35,15 @@ public class UserInfo extends ClientInfo {
 		this.roles = roles;
 	}
 	
+	public UserInfo(String clientId, List<String> roles, String email, String firstName, String lastName) {
+		super();
+		this.clientId = clientId;
+		this.roles = roles;
+		this.email = email;
+		this.firstName = firstName;
+		this.lastName = lastName;
+	}
+	
 
 	@Override
 	public String getId() {
@@ -41,6 +55,18 @@ public class UserInfo extends ClientInfo {
 		return roles;
 	}
 
+	public String getEmail() {
+		return email;
+	}
+	
+	public String getFirstName() {
+		return firstName;
+	}
+	
+	public String getLastName() {
+		return lastName;
+	}
+	
 	@Override
 	public int hashCode() {
 		final int prime = 31;

src/main/java/org/gcube/common/authorization/library/utils/AuthorizationEntryList.java

@@ -0,0 +1,30 @@
+package org.gcube.common.authorization.library.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.gcube.common.authorization.library.AuthorizationEntry;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class AuthorizationEntryList {
+	
+	private List<AuthorizationEntry> entries = new ArrayList<AuthorizationEntry>();
+
+	protected AuthorizationEntryList() {}
+	
+	public AuthorizationEntryList(List<AuthorizationEntry> entries) {
+		super();
+		this.entries = entries;
+	}
+
+	public List<AuthorizationEntry> getEntries() {
+		return entries;
+	}
+
+	public void setEntries(List<AuthorizationEntry> entries) {
+		this.entries = entries;
+	}
+	
+}

src/main/java/org/gcube/common/authorization/library/utils/ListMapper.java

@@ -0,0 +1,28 @@
+package org.gcube.common.authorization.library.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class ListMapper {
+
+		private List<String> list = new ArrayList<String>();
+
+		protected ListMapper() {}
+		
+		public ListMapper(List<String> list) {
+			super();
+			this.list = list;
+		}
+
+		public List<String> getList() {
+			return list;
+		}
+
+		public void setList(List<String> list) {
+			this.list = list;
+		}
+		
+}

src/main/java/org/gcube/common/authorization/library/utils/MapAdapter.java

@@ -3,7 +3,7 @@ package org.gcube.common.authorization.library.utils;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 
 public class MapAdapter extends XmlAdapter<MapElements[], Map<String, String>> {

src/main/java/org/gcube/common/authorization/library/utils/MapElement.java

@@ -1,6 +1,6 @@
 package org.gcube.common.authorization.library.utils;
 
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElement;
 
 class MapElements
 {

src/main/java/org/gcube/common/authorization/library/utils/MultiServiceTokenRequest.java

@@ -0,0 +1,35 @@
+package org.gcube.common.authorization.library.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.gcube.common.authorization.library.provider.ServiceInfo;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+public class MultiServiceTokenRequest {
+	
+	private List<String> containerTokens= new ArrayList<String>();
+	
+	private ServiceInfo info;
+	
+	protected MultiServiceTokenRequest() {}
+	
+	public MultiServiceTokenRequest(List<String> containerTokens, ServiceInfo info) {
+		this.containerTokens = containerTokens;
+		this.info = info;
+	}
+
+	public List<String> getContainerTokens() {
+		return containerTokens;
+	}
+
+	public ServiceInfo getInfo() {
+		return info;
+	}
+	
+}

src/main/resources/default.authorization

@@ -1 +1 @@
-<authorization-endpoint priority="10" infrastructure="d4science.research-infrastructures.eu"><host>authorization.d4science.org</host><secure>false</secure><port>80</port></authorization-endpoint>
+<authorization-endpoint priority="10" infrastructure="d4science.research-infrastructures.eu"><host>authorization.d4science.org</host><secure>true</secure><port>443</port></authorization-endpoint>

src/main/resources/gcube.authorization

@@ -1 +1 @@
-<authorization-endpoint priority="10" infrastructure="gcube"><host>auth-d.dev.d4science.org</host><secure>false</secure><port>80</port></authorization-endpoint>
+<authorization-endpoint priority="10" infrastructure="gcube"><host>auth.dev.d4science.org</host><secure>true</secure><port>443</port></authorization-endpoint>

src/main/resources/pre.authorization

@@ -1 +1 @@
-<authorization-endpoint priority="10" infrastructure="pred4s"><host>auth-pre.d4science.org</host><secure>false</secure><port>80</port></authorization-endpoint>
+<authorization-endpoint priority="10" infrastructure="pred4s"><host>auth-pre.d4science.org</host><secure>true</secure><port>443</port></authorization-endpoint>

src/test/java/org/gcube/common/authorization/library/binder/AuthorizationEntryBinder.java

@@ -7,9 +7,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-
 import org.gcube.common.authorization.library.AuthorizationEntry;
 import org.gcube.common.authorization.library.QualifiersList;
 import org.gcube.common.authorization.library.policies.Policy;
@@ -17,6 +14,9 @@ import org.gcube.common.authorization.library.provider.UserInfo;
 import org.junit.Assert;
 import org.junit.Test;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+
 public class AuthorizationEntryBinder {
 	
 	public static JAXBContext getContext() throws JAXBException{

src/test/java/org/gcube/common/authorization/library/binder/EndpointBinder.java

@@ -5,14 +5,14 @@ import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.Map;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-
-import org.gcube.common.authorization.library.enpoints.AuthorizationEndpoint;
-import org.gcube.common.authorization.library.enpoints.AuthorizationEndpointScanner;
+import org.gcube.common.authorization.library.endpoints.AuthorizationEndpoint;
+import org.gcube.common.authorization.library.endpoints.AuthorizationEndpointScanner;
 import org.junit.Assert;
 import org.junit.Test;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+
 public class EndpointBinder {
 
 	

src/test/java/org/gcube/common/authorization/library/policies/SerializationTest.java

@@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.policies;
 import java.io.StringReader;
 import java.io.StringWriter;
 
-import javax.xml.bind.JAXBContext;
-
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import jakarta.xml.bind.JAXBContext;
+
 public class SerializationTest {
 
 	static JAXBContext context;