diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74a76dc..94f5050 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for Resource Checker Smart Executor Plugin
+## [v2.0.0-SNAPSHOT]
-## [v2.0.0] [r5.0.0] -
-
+- Ported plugin to smart-executor APIs 3.0.0 [#21618]
- Switched smart-executor JSON management to gcube-jackson [#19647]
- Creating uberjar in place of jar-with-dependecies
- Used smart-executor bom for better dependency management
diff --git a/FUNDING.md b/FUNDING.md
new file mode 100644
index 0000000..9e48b94
--- /dev/null
+++ b/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);
diff --git a/README.md b/README.md
index 27c7b2f..e051db0 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ See [Releases](https://code-repo.d4science.org/gCubeSystem/resource-checker-se-p
## Authors
+* **Costantino Perciante** ISTI-CNR
* **Luca Frosini** ([ORCID](https://orcid.org/0000-0003-3183-2291)) - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
## How to Cite this Software
@@ -34,37 +35,16 @@ Tell people how to cite this software.
url = {http://www.gcube-system.org/}
}
-## License
+### 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);
-
-
+The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md)
diff --git a/gcube/extra-resources/META-INF/plugin.properties b/gcube/extra-resources/META-INF/ResourceCheckerPlugin.properties
similarity index 100%
rename from gcube/extra-resources/META-INF/plugin.properties
rename to gcube/extra-resources/META-INF/ResourceCheckerPlugin.properties
diff --git a/pom.xml b/pom.xml
index aacfb00..3016384 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
resource-checker-se-plugin2.0.0-SNAPSHOTResource Checker Smart Executor Plugin
- Resource Checker Smart Executor Plugin periodically checks the presence of required resources in the IS V.1 in every context
+ Resource Checker Smart Executor Plugin periodically checks the presence of required resources in the gCore IS in every contextscm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git
diff --git a/src/main/java/org/gcube/informationsystem/resource_checker/ResourceCheckerPlugin.java b/src/main/java/org/gcube/informationsystem/resource_checker/ResourceCheckerPlugin.java
index 0d3f8fa..58333d8 100644
--- a/src/main/java/org/gcube/informationsystem/resource_checker/ResourceCheckerPlugin.java
+++ b/src/main/java/org/gcube/informationsystem/resource_checker/ResourceCheckerPlugin.java
@@ -47,7 +47,6 @@ import org.xml.sax.InputSource;
* The resource-checker-se-plugin implementation class.
* @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
*/
-@SuppressWarnings("rawtypes")
public class ResourceCheckerPlugin extends Plugin {
private static final int SECONDS2WAIT = 2; // seconds to wait among IS requests
@@ -55,6 +54,7 @@ public class ResourceCheckerPlugin extends Plugin {
public static final String ROLE_TO_NOTIFY = "role";
private static final String NAGIOS_PROPERTY_FILE = "/META-INF/plugin_resources/nagios-report-location.properties";
private static final Logger logger = LoggerFactory.getLogger(ResourceCheckerPlugin.class);
+ @SuppressWarnings("rawtypes")
private static final DiscoveryClient client = ICFactory.client();
public ResourceCheckerPlugin(){
@@ -200,6 +200,7 @@ public class ResourceCheckerPlugin extends Plugin {
* @return the identifier of the resource
* @throws Exception
*/
+ @SuppressWarnings("rawtypes")
private String isServicePresent(BasicFunctionalityBean service, DiscoveryClient client, DocumentBuilder docBuilder) throws Exception {
Class classFor = service.getType() == null? ServiceEndpoint.class : service.getType(); // default is service end point
diff --git a/src/test/resources/META-INF/ResourceCheckerPlugin.properties b/src/test/resources/META-INF/ResourceCheckerPlugin.properties
new file mode 100644
index 0000000..968953b
--- /dev/null
+++ b/src/test/resources/META-INF/ResourceCheckerPlugin.properties
@@ -0,0 +1,4 @@
+groupId=org.gcube.information-system
+artifactId=resource-checker-se-plugin
+version=2.0.0-SNAPSHOT
+description=Resource Checker Smart Executor Plugin periodically checks the presence of required resources in the gCore IS in every context
\ No newline at end of file
diff --git a/src/test/resources/META-INF/services/org.gcube.vremanagement.executor.plugin.PluginDeclaration b/src/test/resources/META-INF/services/org.gcube.vremanagement.executor.plugin.PluginDeclaration
deleted file mode 100644
index c30813e..0000000
--- a/src/test/resources/META-INF/services/org.gcube.vremanagement.executor.plugin.PluginDeclaration
+++ /dev/null
@@ -1 +0,0 @@
-org.gcube.informationsystem.resource_checker.ResourceCheckerPluginDeclaration
\ No newline at end of file
diff --git a/tar-gz.xml b/tar-gz.xml
deleted file mode 100644
index e41c0e6..0000000
--- a/tar-gz.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
- tar.gz
-
- tar.gz
-
- ${file.separator}
-
-
- target${file.separator}libs
- ${file.separator}
- true
- 755
-
-
-
-
-
- true
-
-
-
\ No newline at end of file