From d9a229929bb3c425d787bae5e7396f1e104a1178 Mon Sep 17 00:00:00 2001 From: lucio Date: Mon, 22 May 2023 11:23:32 +0200 Subject: [PATCH] enunciate documentation added --- .settings/org.eclipse.wst.common.component | 33 +- distro/gcube-app.xml | 1 + enunciate.xml | 27 ++ pom.xml | 144 +++--- .../storagehub/services/DocManager.java | 47 ++ src/main/webapp/WEB-INF/LICENSE | 418 +++++++++--------- src/main/webapp/WEB-INF/README | 28 +- src/main/webapp/WEB-INF/gcube-app.xml | 3 +- 8 files changed, 370 insertions(+), 331 deletions(-) create mode 100644 enunciate.xml create mode 100644 src/main/java/org/gcube/data/access/storagehub/services/DocManager.java diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 9ca9303..53cf7c9 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,6 @@ - + + @@ -23,7 +24,8 @@ - + + @@ -47,7 +49,8 @@ - + + @@ -71,7 +74,8 @@ - + + @@ -95,7 +99,8 @@ - + + @@ -119,13 +124,8 @@ - - uses - - - uses - - + + @@ -149,7 +149,8 @@ - + + @@ -173,7 +174,8 @@ - + + @@ -197,7 +199,8 @@ - + + diff --git a/distro/gcube-app.xml b/distro/gcube-app.xml index aa6e541..861cfde 100644 --- a/distro/gcube-app.xml +++ b/distro/gcube-app.xml @@ -4,4 +4,5 @@ ${version} Storage Hub webapp + /api-docs/* \ No newline at end of file diff --git a/enunciate.xml b/enunciate.xml new file mode 100644 index 0000000..51e33ce --- /dev/null +++ b/enunciate.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index b52d217..c3d45a8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,29 +1,23 @@ - maven-parent org.gcube.tools 1.1.0 - 4.0.0 org.gcube.data.access storagehub - 1.4.1 + 1.4.2 storagehub - scm:git:https://code-repo.d4science.org/gCubeSystem/storagehub.git scm:git:https://code-repo.d4science.org/gCubeSystem/storagehub.git https://code-repo.d4science.org/gCubeSystem/storagehub - - war - ${project.basedir}/src/main/webapp/WEB-INF 2.20.2 @@ -32,15 +26,13 @@ 7.0.40 6.1.26 1.21 - ${project.basedir}/distro REST web service for Jackrabbit storagehub UTF-8 UTF-8 - + 2.14.0 - @@ -57,107 +49,85 @@ - - org.aspectj aspectjrt - org.gcube.core common-smartgears - org.gcube.core common-smartgears-app - org.gcube.common authorization-control-library [1.0.0,2.0.0-SNAPSHOT) - org.gcube.common common-authorization - org.gcube.core common-encryption - org.gcube.core common-scope-maps - org.gcube.core common-scope - org.gcube.common storagehub-model - [1.0.0,2.0.0-SNAPSHOT) - org.gcube.data.access storagehub-script-utils - [1.0.0-SNAPSHOT,2.0.0) + [1.0.0, 2.0.0-SNAPSHOT) - com.itextpdf itextpdf 5.5.13.2 - - + com.twelvemonkeys.imageio imageio-jpeg 3.3.2 - com.twelvemonkeys.imageio imageio-bmp 3.3.2 - com.twelvemonkeys.imageio imageio-core 3.3.2 - - org.bouncycastle bcprov-jdk15on 1.62 - org.slf4j slf4j-api - org.gcube.common gxJRS - - javax.jcr jcr @@ -178,80 +148,67 @@ jackrabbit-jcr-server ${jackrabbit.version} - com.fasterxml.jackson.core jackson-annotations ${jackson.version} - com.fasterxml.jackson.core jackson-core ${jackson.version} - com.fasterxml.jackson.core jackson-databind ${jackson.version} - - org.apache.tika tika-parsers 1.21 - org.apache.tika tika-core 1.21 - net.bull.javamelody javamelody-core 1.82.0 - - org.projectlombok - lombok - 1.18.2 + org.projectlombok + lombok + 1.18.2 provided - javax.servlet javax.servlet-api 3.0.1 - javax.interceptor javax.interceptor-api 1.2.2 - javax.enterprise cdi-api 2.0 - javax.ws.rs javax.ws.rs-api - org.glassfish.jersey.containers jersey-container-servlet @@ -260,14 +217,12 @@ org.glassfish.jersey.containers jersey-container-servlet-core - org.glassfish.jersey.inject jersey-hk2 2.30.1 - org.glassfish.jersey.core jersey-server @@ -285,87 +240,67 @@ weld-servlet-core 3.1.0.Final - org.jboss jandex 2.2.2.Final - - - javax.servlet - javax.servlet-api - 3.0.1 - - org.glassfish.jersey.core jersey-common - org.glassfish.jersey.media jersey-media-json-jackson - org.glassfish.jersey.media jersey-media-multipart - postgresql postgresql 9.1-901.jdbc4 runtime - org.gcube.contentmanagement storage-manager-core [3.0.0-SNAPSHOT,4.0.0-SNAPSHOT) - org.gcube.contentmanagement storage-manager-wrapper [3.0.0-SNAPSHOT,4.0.0-SNAPSHOT) - org.reflections reflections 0.9.10 - com.google.guava guava 16.0 - org.apache.commons commons-compress 1.17 - org.tukaani xz 1.5 - - org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-simple test - org.apache.derby derby @@ -378,7 +313,6 @@ 10.8.2.2 test - com.googlecode.jeeunit jeeunit @@ -391,20 +325,29 @@ gson 2.7 - ch.qos.logback logback-classic test - com.vlkan.rfos rotating-fos 0.9.2 - - + + + com.webcohesion.enunciate + enunciate-core-annotations + ${enunciate.version} + provided + + + com.webcohesion.enunciate + enunciate-rt-util + ${enunciate.version} + provided + org.mockito @@ -412,14 +355,11 @@ 1.9.5 test - - org.slf4j jul-to-slf4j ${slf4j.version} - org.jboss.weld.se weld-se @@ -432,19 +372,16 @@ 4.11 test - org.glassfish.jersey.test-framework jersey-test-framework-core test - org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-grizzly2 test - ${project.artifactId} @@ -535,7 +472,46 @@ + + + com.webcohesion.enunciate + enunciate-maven-plugin + ${enunciate.version} + + + + assemble + + assemble + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + + copy-enunciate-docs + process-resources + + copy-resources + + + target + + + ${project.build.directory}/${project.artifactId}-${project.version}/api-docs + ${project.build.directory}/api-docs + true + + + + + + - \ No newline at end of file diff --git a/src/main/java/org/gcube/data/access/storagehub/services/DocManager.java b/src/main/java/org/gcube/data/access/storagehub/services/DocManager.java new file mode 100644 index 0000000..1304cdb --- /dev/null +++ b/src/main/java/org/gcube/data/access/storagehub/services/DocManager.java @@ -0,0 +1,47 @@ +package org.gcube.data.access.storagehub.services; + +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; + +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Context; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Path("api-docs") +public class DocManager { + + private static Logger logger = LoggerFactory.getLogger(DocManager.class); + + @GET + @Path("/{any: .*}") + public InputStream toDoc(@Context HttpServletRequest req) throws WebApplicationException { + logger.info(DocManager.class.getSimpleName() + " toDoc called"); + + String pathInfo = req.getPathInfo(); + logger.debug("pathInfo {}", pathInfo); + try { + + if (pathInfo.endsWith("/api-docs")) { + pathInfo += "index.html"; + } + + if (pathInfo.endsWith("/api-docs/")) { + pathInfo += "index.html"; + } + + logger.info("going to {}", pathInfo); + + String realPath = req.getServletContext().getRealPath(pathInfo); + return new FileInputStream(new File(realPath)); + + } catch (Exception e) { + throw new WebApplicationException("error getting docs",e); + } + } +} \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/LICENSE b/src/main/webapp/WEB-INF/LICENSE index ddd1eb9..f82c1f8 100644 --- a/src/main/webapp/WEB-INF/LICENSE +++ b/src/main/webapp/WEB-INF/LICENSE @@ -1,313 +1,297 @@ European Union Public Licence V. 1.1 - EUPL © the European Community 2007 + 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). + 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: + 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 + Licensed under the EUPL V.1.1 - or has expressed by any other mean his willingness to license under the EUPL. + or has expressed by any other mean his willingness to license under the EUPL. + 1. Definitions - 1. Definitions + In this Licence, the following terms have the following meaning: - In this Licence, the following terms have the following meaning: + - The Licence: this Licence. - - 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. - - 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. - - 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 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 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 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. - - 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. - - 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. - - 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. - - 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: - 2. Scope of the rights granted by the Licence + - 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. - 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: + 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. - - 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. + 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. - 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. + 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. - 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. - 3. Communication of the Source Code + 4. Limitations on copyright - 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. + 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 - 4. Limitations on copyright + The grant of the rights mentioned above is subject to some restrictions and + obligations imposed on the Licensee. Those obligations are the following: - 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. + 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. - 5. Obligations of the Licensee + 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. - The grant of the rights mentioned above is subject to some restrictions and - obligations imposed on the Licensee. Those obligations are the following: + 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. - 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. + 6. Chain of Authorship - 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. + 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. - 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. + 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. - 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. + 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 - 6. Chain of Authorship + 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. - 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. + 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. - 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. + This disclaimer of warranty is an essential part of the Licence and a condition + for the grant of any rights to the Work. - 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. + 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. - 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. + 9. Additional agreements - 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. + 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. - This disclaimer of warranty is an essential part of the Licence and a condition - for the grant of any rights to the Work. + 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. - 8. Disclaimer of Liability + 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. - 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. + 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. - 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. + 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. - 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. + 13. Miscellaneous - 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. + 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. - 11. Information to the public + 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. - 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. + 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. - 12. Termination of the Licence + 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. - 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. + 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: - 13. Miscellaneous + - 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. - 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. + Appendix + “Compatible Licences” according to article 5 EUPL are: - 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. + - GNU General Public License (GNU GPL) v. 2 - 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. + - Open Software License (OSL) v. 2.1, v. 3.0 + - Common Public License v. 1.0 + - Eclipse Public License v. 1.0 - 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 + - Cecill v. 2.0 diff --git a/src/main/webapp/WEB-INF/README b/src/main/webapp/WEB-INF/README index 15122bb..33461e3 100644 --- a/src/main/webapp/WEB-INF/README +++ b/src/main/webapp/WEB-INF/README @@ -5,27 +5,27 @@ REST web service for Jackrabbit This software is part of the gCube Framework (https://www.gcube-system.org/): 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. + 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), AGINFRA PLUS (grant no. 731001). + 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), AGINFRA PLUS (grant no. 731001). Version -------------------------------------------------- -1.3.1 (20210910-085653) +1.4.1 (20230522-091212) Please see the file named "changelog.xml" in this directory for the release notes. diff --git a/src/main/webapp/WEB-INF/gcube-app.xml b/src/main/webapp/WEB-INF/gcube-app.xml index 04f2d74..fe546b5 100644 --- a/src/main/webapp/WEB-INF/gcube-app.xml +++ b/src/main/webapp/WEB-INF/gcube-app.xml @@ -1,7 +1,8 @@ StorageHub DataAccess - 1.3.1 + 1.4.1 Storage Hub webapp + /api-docs/* \ No newline at end of file