Merge branch 'master' of https://code-repo.d4science.org/gCubeSystem/common-scope.git

.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.6">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<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.core.resources.prefs

@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8

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

@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8

CHANGELOG.md

@@ -0,0 +1,10 @@
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+# Changelog for common scope
+
+## [v2.0.0]
+
+- Maps scanned with reflection
+- Dependency to common-configuration-scanner removed
+- Removed ScopePorvider and ScopeBean
+

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,312 @@
+# 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,73 @@
+# common scope
+
+A core gCube library which empower authorization
+
+## Built With
+
+* [OpenJDK](https://openjdk.java.net/) - The JDK used
+* [Maven](https://maven.apache.org/) - Dependency Management
+
+## Documentation
+
+[SmartGears](https://wiki.gcube-system.org/gcube/common-scope)
+
+## Change log
+
+See [Releases](https://code-repo.d4science.org/gCubeSystem/common-scope/releases).
+
+## Authors
+
+* **Luca Frosini** ([ORCID](https://orcid.org/0000-0003-3183-2291)) - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
+* **Lucio Lelii** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
+
+
+## How to Cite this Software
+
+Tell people how to cite this software. 
+* Cite an associated paper?
+* Use a specific BibTeX entry for the software?
+
+
+    @Manual{,
+        title = {Common Smartgears},
+        author = {{Frosini, Luca}, {Lelii, Lucio}},
+        organization = {{ISTI - CNR}, {FAO}},
+        address = {{Pisa, Italy}, {Roma, Italy}},
+        year = 2022,
+        url = {http://www.gcube-system.org/}
+    } 
+
+## 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);
+    - iMarine(grant no. 283644);
+    - EUBrazilOpenBio (grant no. 288754).
+- the H2020 research and innovation programme 
+    - SoBigData (grant no. 654024);
+    - PARTHENOS (grant no. 654119);
+    - EGIEngage (grant no. 654142);
+    - ENVRIplus (grant no. 654182);
+    - BlueBRIDGE (grant no. 675680);
+    - PerformFish (grant no. 727610);
+    - AGINFRAplus (grant no. 731001);
+    - DESIRA (grant no. 818194);
+    - ARIADNEplus (grant no. 823914);
+    - RISIS2 (grant no. 824091);
+
+

distro/LICENSE

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

distro/README

@@ -1,67 +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
---------------------------------------------------
- 
-* Fabio Simeoni (fabio.simeoni@fao.org), FAO of the UN, Italy
-
- 
- 
-Maintainers
------------
- 
-* Lucio Lelii (lucio.lelii@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}/Integration_and_Interoperability_Facilities_Framework:_Client_Libraries_Framework
- 
- 
-Documentation 
---------------------------------------------------
- 
-Documentation is available on-line in the gCube Wiki:
-    ${gcube.wikiRoot}/Integration_and_Interoperability_Facilities_Framework:_Client_Libraries_Framework
- 
- 
-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,15 +0,0 @@
-<ReleaseNotes>
-	<Changeset component="common-scope-1.0.0" date="2012-1-27">
-		<Change>First Release</Change>
-	</Changeset>
-	<Changeset component="common-scope-1.1.0" date="2013-01-11">
-		<Change>Scope can now be propagated in Callable and Runnable tasks via ScopedTasks</Change>
-		<Change>Scopes can now be manipulated through ScopeBean objects</Change>
-		<Change>Scope maps are now versioned and newer versions take precedence at startup</Change>
-		<Change>Scope maps can now be successfully looked up in VRE scopes (bug fix)</Change>
-	</Changeset>
-		<Changeset component="common-scope-1.2.0" date="2013-01-27">
-		<Change>Replaced Google's reflections with common-configuration-scanner</Change>
-		<Change>Lowered log level on scope settings to DEBUG</Change>
-	</Changeset>
-</ReleaseNotes>

distro/descriptor.xml

@@ -1,32 +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>target/${build.finalName}.${project.packaging}</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,120 +1,78 @@
-<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>
-
 	<parent>
 		<artifactId>maven-parent</artifactId>
 		<groupId>org.gcube.tools</groupId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 		<relativePath />
 	</parent>
-
 	<groupId>org.gcube.core</groupId>
 	<artifactId>common-scope</artifactId>
-	<version>1.2.0</version>
+	<version>2.0.0</version>
 	<name>Common Scope</name>
 	<description>Scope-related APIs</description>
-
 	<properties>
-		<distroDirectory>distro</distroDirectory>
+		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.source>11</maven.compiler.source>
 	</properties>
-
 	<scm>
-    	<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
-    	<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
-    	<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
+		<connection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
+		<developerConnection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
+		<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
 	</scm>
-	
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.gcube.distribution</groupId>
+				<artifactId>gcube-bom</artifactId>
+				<version>4.0.0</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<dependencies>
-
 		<dependency>
-			<groupId>org.gcube.core</groupId>
-			<artifactId>common-configuration-scanner</artifactId>
-			<version>1.0.0</version>
+			<groupId>org.reflections</groupId>
+			<artifactId>reflections</artifactId>
 		</dependency>
-		
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
-			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
-		
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>common-security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.2</version>
 			<scope>compile</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
 			<version>1.7.2</version>
 			<scope>test</scope>
 		</dependency>
-		
 	</dependencies>
-
-	<build>
-
-		<plugins>
-
-
-			<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>
-	</build>
-
 </project>

src/main/java/org/gcube/common/scope/api/ScopeProvider.java

@@ -1,34 +0,0 @@
-package org.gcube.common.scope.api;
-
-import org.gcube.common.scope.impl.ScopeProviderScanner;
-
-/**
- * Provides a scope in the caller's context.
- * 
- * @author Fabio Simeoni
- *
- */
-public interface ScopeProvider {
-
-	/**
-	 * Shared {@link ScopeProvider}.
-	 */
-	public static final ScopeProvider instance = ScopeProviderScanner.provider();
-	
-	/**
-	 * Returns the scope in the caller's context.
-	 * @return the scope
-	 */
-	String get();
-
-	/**
-	 * Sets the scope in the caller's context.
-	 * @param scope the scope
-	 */
-	void set(String scope);
-	
-	/**
-	 * Resets the scope in the caller's context.
-	 */
-	void reset();
-}

src/main/java/org/gcube/common/scope/impl/DefaultScopeProvider.java

@@ -1,51 +0,0 @@
-package org.gcube.common.scope.impl;
-
-import org.gcube.common.scope.api.ScopeProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A {@link ScopeProvider} that uses threads as contexts.
- * <p>
- * Relies an an internal {@link InheritableThreadLocal}.
- * 
- * @author Fabio Simeoni
- * @see ScopeProviderScanner
- *
- */
-public class DefaultScopeProvider implements ScopeProvider {
-
-	/** System property for scope */
-	public static final String SCOPE_PROPERTY = "gcube.scope";
-
-	private static Logger log = LoggerFactory.getLogger(DefaultScopeProvider.class);
-	
-	private InheritableThreadLocal<String> scopes = new InheritableThreadLocal<String>();
-
-	protected DefaultScopeProvider() {};
-	
-	@Override
-	public String get() {
-		String scope = scopes.get();
-		if (scope==null)
-			scope = System.getProperty(SCOPE_PROPERTY);
-		return scope;
-	}
-
-	@Override
-	public void set(String scope) {
-		if (scope!=null)
-			log.debug("setting scope {} in thread {}",scope,Thread.currentThread().getId());
-		scopes.set(scope);
-		
-	}
-	
-	@Override
-	public void reset() {
-		log.debug("resetting scope in thread {}",Thread.currentThread().getId());
-		scopes.remove();
-	}
-	
-	
-	
-}

src/main/java/org/gcube/common/scope/impl/DefaultServiceMap.java

@@ -3,12 +3,14 @@ package org.gcube.common.scope.impl;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.gcube.common.scope.api.ServiceMap;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 /**
  * A {@link ServiceMap} with a standard XML binding.
  * 
@@ -16,6 +18,7 @@ import org.gcube.common.scope.api.ServiceMap;
  *
  */
 @XmlRootElement(name="service-map")
+@XmlAccessorType(XmlAccessType.FIELD)
 public class DefaultServiceMap implements ServiceMap {
 
 	@XmlAttribute
@@ -48,5 +51,48 @@ public class DefaultServiceMap implements ServiceMap {
 		return endpoint;
 	}
 
+	@Override
+	public String toString() {
+		return "DefaultServiceMap [scope=" + scope + ", version=" + version + ", services=" + services + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((scope == null) ? 0 : scope.hashCode());
+		result = prime * result + ((services == null) ? 0 : services.hashCode());
+		result = prime * result + ((version == null) ? 0 : version.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		DefaultServiceMap other = (DefaultServiceMap) obj;
+		if (scope == null) {
+			if (other.scope != null)
+				return false;
+		} else if (!scope.equals(other.scope))
+			return false;
+		if (services == null) {
+			if (other.services != null)
+				return false;
+		} else if (!services.equals(other.services))
+			return false;
+		if (version == null) {
+			if (other.version != null)
+				return false;
+		} else if (!version.equals(other.version))
+			return false;
+		return true;
+	}
+
+	
 	
 }

src/main/java/org/gcube/common/scope/impl/ScopeBean.java

@@ -1,139 +0,0 @@
-package org.gcube.common.scope.impl;
-
-
-
-/**
- * A object model of a scope.
- * 
- * @author Fabio Simeoni
- *
- */
-public class ScopeBean {
-
-	/**
-	 * Scope separators used in linear syntax.
-	 */
-	protected static String separator = "/";
-	
-	/**
-	 * Scope types	 *
-	 */
-	public static enum Type implements Comparable<Type> {VRE,VO,INFRASTRUCTURE}
-		
-	/**
-	 * The name of the scope.
-	 */
-	private String name;
-	
-	/**
-	 * The type of the scope.
-	 */
-	private Type type;
-	
-	/**
-	 * The enclosing scope, if any.
-	 */
-	private ScopeBean enclosingScope;
-	
-	
-	/**
-	 * Returns the name of the scope.
-	 * @return the name
-	 */
-	public String name() {
-		return name;
-	}
-
-	/**
-	 * Returns <code>true</code> if the scope has a given {@link Type}.
-	 * @param type the type
-	 * @return <code>true</code> if the scope has the given type, <code>false</code> otherwise
-	 */
-	public boolean is(Type type) {
-		return this.type.equals(type);
-	}
-	
-	/**
-	 * Returns the {@link Type} of the scope.
-	 * @return the type
-	 */
-	public Type type() {
-		return type;
-	}
-	
-	/**
-	 * Returns the enclosing scope, if any.
-	 * @return the enclosing scope, or <code>null</code> if the scope is top-level
-	 */
-	public ScopeBean enclosingScope() {
-		return enclosingScope;
-	}
-	
-	public ScopeBean(String scope) throws IllegalArgumentException {
-		
-		String[] components=scope.split(separator);
-		
-		if (components.length<2 || components.length>4) 
-			throw new IllegalArgumentException("scope "+scope+" is malformed");
-		
-		if(components.length>3) {
-			this.name=components[3];
-			this.enclosingScope = new ScopeBean(separator+components[1]+separator+components[2]);
-			this.type=Type.VRE;
-		}
-		else if (components.length>2) {
-			this.name=components[2];
-			this.enclosingScope=new ScopeBean(separator+components[1]);
-			this.type=Type.VO;
-		}
-		else {
-			this.name=components[1];
-			this.type=Type.INFRASTRUCTURE;
-		}
-			
-	}
-	
-	/**
-	 * Returns the linear expression of the scope.
-	 */
-	public String toString() {
-		return is(Type.INFRASTRUCTURE)?separator+name():
-			   enclosingScope().toString()+separator+name();
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((enclosingScope == null) ? 0 : enclosingScope.hashCode());
-		result = prime * result + ((name == null) ? 0 : name.hashCode());
-		result = prime * result + ((type == null) ? 0 : type.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		ScopeBean other = (ScopeBean) obj;
-		if (enclosingScope == null) {
-			if (other.enclosingScope != null)
-				return false;
-		} else if (!enclosingScope.equals(other.enclosingScope))
-			return false;
-		if (name == null) {
-			if (other.name != null)
-				return false;
-		} else if (!name.equals(other.name))
-			return false;
-		if (type != other.type)
-			return false;
-		return true;
-	}
-	
-	
-}

src/main/java/org/gcube/common/scope/impl/ScopeProviderScanner.java

@@ -1,62 +0,0 @@
-package org.gcube.common.scope.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ServiceLoader;
-
-import org.gcube.common.scope.api.ScopeProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Scans the classpath for a {@link ScopeProvider} implementation.
- * <p>
- * Returns a shared {@link DefaultScopeProvider} by default.
- * 
- * @author Fabio Simeoni
- * @see ScopeProvider
- * @see ScopeProvider#instance
- */
-public class ScopeProviderScanner {
-
-	private static Logger log = LoggerFactory.getLogger(ScopeProviderScanner.class);
-	
-	/**
-	 * Returns the configured provider. 
-	 * @return the provider
-	 */
-	public static ScopeProvider provider() {
-		try {
-
-			ScopeProvider impl = null;
-			
-			ServiceLoader<ScopeProvider> loader = ServiceLoader.load(ScopeProvider.class);
-			
-			Iterator<ScopeProvider> iterator = loader.iterator();
-			List<ScopeProvider> impls = new ArrayList<ScopeProvider>();
-
-			 while(iterator.hasNext())
-				 impls.add(iterator.next());
-					
-			 if (impls.size()==0) {
-				 impl = new DefaultScopeProvider();
-			 }
-			 else if (impls.size()>1)
-				 throw new Exception("mis-configured environment: detected multiple default providers "+impls);
-			 else
-				 impl=impls.get(0);
-				 
-			 log.info("using scope provider "+impl);
-			 
-			 return impl;
-			   
-			
-		} catch (Exception e) {
-			throw new RuntimeException("could not configure scope provider", e);
-		}
-	}
-
-
-	
-}

src/main/java/org/gcube/common/scope/impl/ScopedServiceMap.java

@@ -1,11 +1,11 @@
 package org.gcube.common.scope.impl;
 
-import static org.gcube.common.scope.impl.ScopeBean.Type.*;
-
 import java.util.Map;
 
-import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.common.scope.api.ServiceMap;
+import org.gcube.common.security.ContextBean;
+import org.gcube.common.security.ContextBean.Type;
+import org.gcube.common.security.providers.SecretManagerProvider;
 
 /**
  * A {@link ServiceMap} that forwards requests to {@link ServiceMap}s associated
@@ -45,16 +45,16 @@ public class ScopedServiceMap implements ServiceMap {
 	}
 	
 	//helper
-	private ServiceMap currentMap() {
+	public ServiceMap currentMap() {
 		
-		String currentScope = ScopeProvider.instance.get();
+		String currentScope = SecretManagerProvider.get().getContext();
 		
 		if (currentScope==null)
 			throw new IllegalStateException("current scope is undefined");
 		
-		ScopeBean bean = new ScopeBean(currentScope);
+		ContextBean bean = new ContextBean(currentScope);
 		
-		if(bean.is(VRE))
+		if(bean.is(Type.VRE))
 			currentScope = bean.enclosingScope().toString();
 
 		ServiceMap map = maps.get(currentScope);

src/main/java/org/gcube/common/scope/impl/ScopedTasks.java

@@ -1,70 +0,0 @@
-package org.gcube.common.scope.impl;
-
-import java.util.concurrent.Callable;
-
-import org.gcube.common.scope.api.ScopeProvider;
-
-/**
- * Utility to bind the execution of standard tasks to the current scope.
- * 
- * @author Fabio Simeoni
- *
- */
-public class ScopedTasks {
-
-	/**
-	 * Binds a {@link Callable} task to the current scope.
-	 * @param task the task
-	 * @return an equivalent {@link Callable} task bound to the current scope
-	 */
-	static public <V> Callable<V> bind(final Callable<V> task) {
-		
-		final String callScope = ScopeProvider.instance.get();
-		
-		return new Callable<V>() {
-			@Override
-			public V call() throws Exception {
-				
-				//bind underlying thread to callscope
-				ScopeProvider.instance.set(callScope);
-				
-				try {
-					return task.call();
-					
-				}
-				finally {
-					ScopeProvider.instance.reset();
-				}
-				
-			}
-		};
-	}
-	
-	/**
-	 * Binds a {@link Runnable} task to the current scope.
-	 * @param task the task
-	 * @return an equivalent {@link Runnable} task bound to the current scope
-	 */
-	static public <V> Runnable bind(final Runnable task) {
-		
-		final String callScope = ScopeProvider.instance.get();
-		
-		return new Runnable() {
-			@Override
-			public void run() {
-				
-				//bind underlying thread to callscope
-				ScopeProvider.instance.set(callScope);
-				
-				try {
-					task.run();
-				}
-				finally {
-					ScopeProvider.instance.reset();
-				}
-				
-			}
-		};
-	}
-	
-}

src/main/java/org/gcube/common/scope/impl/ServiceMapAdapter.java

@@ -1,13 +1,14 @@
 package org.gcube.common.scope.impl;
 
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 
 /**
@@ -45,12 +46,15 @@ public class ServiceMapAdapter extends XmlAdapter<ServiceMapAdapter.ValueService
 
 	@Override
 	public ValueServiceMap marshal(Map<String, String> map) throws Exception {
+		Set<ServiceEntry> entries = new HashSet<ServiceMapAdapter.ServiceEntry>();
 		ValueServiceMap valueMap = new ValueServiceMap();
 		for (Map.Entry<String,String> e : map.entrySet()) {
 			ServiceEntry entry = new ServiceEntry();
 			entry.name=e.getKey();
 			entry.endpoint = e.getValue();
+			entries.add(entry);
 		}
+		valueMap.services = entries;
 		return valueMap;
 	}
 }

src/main/java/org/gcube/common/scope/impl/ServiceMapScanner.java

@@ -2,21 +2,21 @@ package org.gcube.common.scope.impl;
 
 import java.net.URL;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Pattern;
 
-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.gcube.common.scope.api.ServiceMap;
+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;
+
 /**
  * Scans the classpath for {@link ServiceMap}s.
  * 
@@ -37,19 +37,25 @@ class ServiceMapScanner {
 	 */
 	static Map<String, ServiceMap> maps() {
 
+		
+		log.info("scanning form maps");
+		
 		Map<String, ServiceMap> maps = new HashMap<String, ServiceMap>();
 
 		try {
-
-			Set<String> resources = getMapNames();
-
+			
+			ConfigurationBuilder reflectionConf =  new ConfigurationBuilder().addUrls(ClasspathHelper.forJavaClassPath()).addUrls(ClasspathHelper.forClassLoader()).setScanners(new ResourcesScanner());
+			
+			Reflections reflection = new Reflections(reflectionConf); 
+			
 			JAXBContext context = JAXBContext.newInstance(DefaultServiceMap.class);
+			Set<String> resources  = reflection.getResources(Pattern.compile(".*\\.servicemap"));
+			log.info("loading {} ", resources);
 			Unmarshaller um = context.createUnmarshaller();
-
-			for (String resource : resources) {
-				
+			
+			for (String resource: resources) {
+				log.info("loading {} ", resource);
 				URL url = Thread.currentThread().getContextClassLoader().getResource(resource);
-				log.info("loading {} ", url);
 				DefaultServiceMap map = (DefaultServiceMap) um.unmarshal(url);
 
 				ServiceMap current = maps.get(map.scope());
@@ -63,20 +69,15 @@ class ServiceMapScanner {
 								new Object[] { current.version(), map.version(), map.scope() });
 
 				maps.put(map.scope(), map);
-			}
-		} catch (Exception e) {
+
+		   } 
+			
+		} catch (Throwable e) {
+			log.error("errror scanning service amps",e);
 			throw new RuntimeException("could not load service maps", e);
 		}
 
 		return maps;
 	}
 
-	private static Set<String> getMapNames() {
-		
-		ClasspathScanner scanner = ClasspathScannerFactory.scanner();
-		Set<String> names = new HashSet<String>();
-		for (ClasspathResource r : scanner.scan(new NameMatcher(mapConfigPattern)))
-			names.add(r.name());
-		return names;
-	}
 }

src/test/java/org/gcube/common/scope/BadConfigurationTest.java

@@ -1,56 +0,0 @@
-package org.gcube.common.scope;
-
-import static org.junit.Assert.*;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.gcube.common.scope.api.ScopeProvider;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class BadConfigurationTest {
-
-	private ClassLoader loader;
-	
-	@Before
-	public void init() {
-		loader = Thread.currentThread().getContextClassLoader();
-	}
-	
-	@Test
-	public void multipleAlternativeProvidersCannotBeConfigured() {
-		
-		try {
-			addJarsToClasspath("alternativeprovider.jar","yetanotheralternativeprovider.jar");
-			ScopeProvider.instance.set("shouldfail");
-	
-		}
-		catch(Error e) {
-			return;
-		}
-	
-		fail();
-	}
-	
-	private void addJarsToClasspath(String ... jars) {
-		
-		List<URL> jarUrls = new ArrayList<URL>();
-		for (String jar : jars)
-			jarUrls.add(loader.getResource(jar));
-			
-		URLClassLoader urlClassLoader
-		 = new URLClassLoader(jarUrls.toArray(new URL[0]),loader);
-		
-		
-		Thread.currentThread().setContextClassLoader(urlClassLoader);
-	}
-	
-	@After
-	public void teardown() {
-		Thread.currentThread().setContextClassLoader(loader);
-	}
-}

src/test/java/org/gcube/common/scope/BeanTest.java

@@ -1,9 +1,11 @@
 package org.gcube.common.scope;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
-import org.gcube.common.scope.impl.ScopeBean;
-import org.gcube.common.scope.impl.ScopeBean.Type;
+import org.gcube.common.security.ContextBean;
+import org.gcube.common.security.ContextBean.Type;
 import org.junit.Test;
 
 public class BeanTest {
@@ -13,22 +15,22 @@ public class BeanTest {
 	public void beansAreParsedCorrectly() {
 		
 		String infra ="/infra";
-		ScopeBean infraBean = new ScopeBean(infra);
+		ContextBean infraBean = new ContextBean(infra);
 		assertEquals("infra",infraBean.name());
 		assertTrue(infraBean.is(Type.INFRASTRUCTURE));
 		assertNull(infraBean.enclosingScope());
 		assertEquals(infra,infraBean.toString());
-		assertEquals(infraBean,new ScopeBean(infra));
+		assertEquals(infraBean,new ContextBean(infra));
 		
 		String vo =infra+"/vo";
-		ScopeBean vobean = new ScopeBean(vo);
+		ContextBean vobean = new ContextBean(vo);
 		assertEquals("vo",vobean.name());
 		assertTrue(vobean.is(Type.VO));
 		assertEquals(infraBean,vobean.enclosingScope());
 		assertEquals(vo,vobean.toString());
 		
 		String vre = vo+"/vre";
-		ScopeBean vrebean = new ScopeBean(vre);
+		ContextBean vrebean = new ContextBean(vre);
 		assertEquals("vre",vrebean.name());
 		assertTrue(vrebean.is(Type.VRE));
 		assertEquals(vobean,vrebean.enclosingScope());

src/test/java/org/gcube/common/scope/BindingTest.java

@@ -1,13 +1,14 @@
 package org.gcube.common.scope;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.common.scope.impl.ScopedTasks;
+import org.gcube.common.security.AuthorizedTasks;
+import org.gcube.common.security.providers.SecretManagerProvider;
 import org.junit.Test;
 
 public class BindingTest {
@@ -20,36 +21,36 @@ public class BindingTest {
 		
 		final String callScope = "somescope";
 		
-		ScopeProvider.instance.set(callScope);
+		SecretManagerProvider.set(new TestSecret(callScope));
 		
 		Callable<Void> unbound = new Callable<Void>() {
 			@Override
 			public Void call() throws Exception {
-				assertEquals("task thread is not bound to call scope, but to "+ScopeProvider.instance.get(),callScope,ScopeProvider.instance.get());
+				assertEquals("task thread is not bound to call scope, but to "+SecretManagerProvider.get().getContext(),callScope,SecretManagerProvider.get().getContext());
 				return null;
 			}
 		};
 		
-		Callable<Void> bound = ScopedTasks.bind(unbound);
+		Callable<Void> bound = AuthorizedTasks.bind(unbound);
 		
 		String newScope = "newscope";
 		
 		//scope in current thread changes
-		ScopeProvider.instance.set(newScope);
+		SecretManagerProvider.set(new TestSecret(newScope));
 		
 		//task is submittted
 		executor.submit(bound).get();
 		
 		//resetting task
-		assertEquals("call thread does not retain its latest scope",newScope,ScopeProvider.instance.get());
+		assertEquals("call thread does not retain its latest scope",newScope,SecretManagerProvider.get().getContext());
 
 		//reset call scope
-		ScopeProvider.instance.reset();
+		SecretManagerProvider.reset();
 		
 		Callable<Void> cleanupTest = new Callable<Void>() {
 			@Override
 			public Void call() throws Exception {
-				assertNull(ScopeProvider.instance.get());
+				assertNull(SecretManagerProvider.get());
 				return null;
 			}
 		};

src/test/java/org/gcube/common/scope/ConfigurationTest.java

@@ -1,51 +0,0 @@
-package org.gcube.common.scope;
-
-import static org.junit.Assert.*;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.gcube.common.scope.api.ScopeProvider;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ConfigurationTest {
-
-	private ClassLoader loader;
-	
-	@Before
-	public void init() {
-		loader = Thread.currentThread().getContextClassLoader();
-	}
-	
-	@Test
-	public void alternativeProvidersCanBeConfigured() {
-		
-		addJarsToClasspath("alternativeprovider.jar");
-		
-		assertEquals("AlternativeProvider",ScopeProvider.instance.getClass().getSimpleName());
-	}
-	
-	
-	
-	private void addJarsToClasspath(String ... jars) {
-		
-		List<URL> jarUrls = new ArrayList<URL>();
-		for (String jar : jars)
-			jarUrls.add(loader.getResource(jar));
-			
-		URLClassLoader urlClassLoader
-		 = new URLClassLoader(jarUrls.toArray(new URL[0]),loader);
-		
-		
-		Thread.currentThread().setContextClassLoader(urlClassLoader);
-	}
-	
-	@After
-	public void teardown() {
-		Thread.currentThread().setContextClassLoader(loader);
-	}
-}

src/test/java/org/gcube/common/scope/ProviderTest.java

@@ -1,33 +0,0 @@
-package org.gcube.common.scope;
-
-import static org.junit.Assert.*;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.gcube.common.scope.api.ScopeProvider;
-import org.junit.Test;
-
-public class ProviderTest {
-
-	@Test
-	public void scopesAreThreadInherited() throws Exception {
-		
-		final ScopeProvider provider = ScopeProvider.instance;
-		
-		provider.set("scope");
-		
-		final CountDownLatch latch = new CountDownLatch(1);
-		
-		new Thread() {
-			public void run() {
-				assertNotNull(provider.get());
-				latch.countDown();
-			};
-		}.start();
-		
-		if (!latch.await(100, TimeUnit.MILLISECONDS))
-			fail("scope was null in testing thread");
-	}
-	
-}

src/test/java/org/gcube/common/scope/ServiceMapTest.java

@@ -1,17 +1,19 @@
 package org.gcube.common.scope;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.StringReader;
+import java.io.StringWriter;
 
-import javax.xml.bind.JAXBContext;
-
-import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.common.scope.api.ServiceMap;
 import org.gcube.common.scope.impl.DefaultServiceMap;
+import org.gcube.common.security.providers.SecretManagerProvider;
 import org.junit.After;
 import org.junit.Test;
 
+import jakarta.xml.bind.JAXBContext;
+
 public class ServiceMapTest {
 
 	
@@ -39,12 +41,20 @@ public class ServiceMapTest {
 		assertEquals("http://acme.org:8000/service1", serviceMap.endpoint("service1"));
 		
 		assertEquals("http://acme2.org:8000/service2", serviceMap.endpoint("service2"));
+		
+		StringWriter sw = new StringWriter();
+		context.createMarshaller().marshal(serviceMap, sw);
+		
+		DefaultServiceMap serviceMapCopy = (DefaultServiceMap) context
+				.createUnmarshaller().unmarshal(new StringReader(sw.toString()));
+		assertEquals(serviceMapCopy, serviceMap);
+
 	}
 	
 	@Test
 	public void serviceMapsDiscoveredCorrectly() throws Exception {
 		
-		ScopeProvider.instance.set("/infra/vo");
+		SecretManagerProvider.set(new TestSecret("/infra/vo"));
 
 		assertNotNull(ServiceMap.instance.endpoint("service1"));
 		
@@ -55,7 +65,7 @@ public class ServiceMapTest {
 	@Test
 	public void serviceMapsCanBeLookedupInVREScope() throws Exception {
 		
-		ScopeProvider.instance.set("/infra/vo/vre");
+		SecretManagerProvider.set(new TestSecret("/infra/vo/vre"));
 
 		assertNotNull(ServiceMap.instance.endpoint("service1"));
 		
@@ -63,7 +73,7 @@ public class ServiceMapTest {
 	
 	@After
 	public void cleanup() {
-		ScopeProvider.instance.reset();
+		SecretManagerProvider.reset();
 	}
 	
 }

src/test/java/org/gcube/common/scope/TestSecret.java

@@ -0,0 +1,41 @@
+package org.gcube.common.scope;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.gcube.common.security.Owner;
+import org.gcube.common.security.secrets.Secret;
+
+public class TestSecret extends Secret {
+
+	String context;
+	
+	public TestSecret(String context){
+		this.context = context;
+	}
+	
+	@Override
+	public Owner getOwner() {
+		return new Owner("test", Collections.emptyList(), false, false);
+	}
+
+	@Override
+	public String getContext() {
+		return this.context;
+	}
+
+	@Override
+	public Map<String, String> getHTTPAuthorizationHeaders() {
+		return Collections.emptyMap();
+	}
+
+	@Override
+	public boolean isValid() {
+		return true;
+	}
+	
+	@Override
+	public boolean isExpired() {
+		return false;
+	}
+}