From 24fa210be46251182f364b992bca0a443dd0c16f Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 26 Nov 2019 15:05:52 +0100 Subject: [PATCH] Migrated to git --- .classpath | 15 +-- .gitignore | 1 + .../com.gwtplugins.gdt.eclipse.core.prefs | 4 + .../com.gwtplugins.gwt.eclipse.core.prefs | 2 + .settings/org.eclipse.jdt.core.prefs | 7 +- ....eclipse.wst.common.project.facet.core.xml | 2 +- distro/LICENSE => LICENSE.md | 50 +++++---- README.md | 54 ++++++++++ distro/changelog.xml => changelog.xml | 2 +- templates/descriptor.xml => descriptor.xml | 8 +- distro/README | 74 ------------- distro/descriptor.xml | 32 ------ distro/profile.xml | 26 ----- pom.xml | 102 ++++-------------- profile.xml | 29 +++++ templates/LICENSE | 1 - templates/README | 60 ----------- templates/changelog.xml | 33 ------ templates/profile.xml | 25 ----- 19 files changed, 150 insertions(+), 377 deletions(-) create mode 100644 .gitignore create mode 100644 .settings/com.gwtplugins.gdt.eclipse.core.prefs create mode 100644 .settings/com.gwtplugins.gwt.eclipse.core.prefs rename distro/LICENSE => LICENSE.md (94%) create mode 100644 README.md rename distro/changelog.xml => changelog.xml (96%) rename templates/descriptor.xml => descriptor.xml (89%) delete mode 100644 distro/README delete mode 100644 distro/descriptor.xml delete mode 100644 distro/profile.xml create mode 100644 profile.xml delete mode 100644 templates/LICENSE delete mode 100644 templates/README delete mode 100644 templates/changelog.xml delete mode 100644 templates/profile.xml diff --git a/.classpath b/.classpath index c2290be..75f5880 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -10,25 +10,20 @@ + - - + + - - - - - - - + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs new file mode 100644 index 0000000..8f0b83a --- /dev/null +++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +jarsExcludedFromWebInfLib= +warSrcDir= +warSrcDirIsOutput=true diff --git a/.settings/com.gwtplugins.gwt.eclipse.core.prefs b/.settings/com.gwtplugins.gwt.eclipse.core.prefs new file mode 100644 index 0000000..82c36af --- /dev/null +++ b/.settings/com.gwtplugins.gwt.eclipse.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +filesCopiedToWebInfLib= diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 443e085..4e4a3ad 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 4f92af5..f4bf050 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/distro/LICENSE b/LICENSE.md similarity index 94% rename from distro/LICENSE rename to LICENSE.md index b3c3804..1932b4c 100644 --- a/distro/LICENSE +++ b/LICENSE.md @@ -1,10 +1,9 @@ -European Union Public Licence V. 1.1 +#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 +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). @@ -13,13 +12,13 @@ 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. -1. Definitions +##1. Definitions In this Licence, the following terms have the following meaning: @@ -60,7 +59,7 @@ In this Licence, the following terms have the following meaning: -2. Scope of the rights granted by the Licence +##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 @@ -86,7 +85,7 @@ rights granted on the Work under this Licence. -3. Communication of the Source Code +##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 @@ -98,7 +97,7 @@ continues to distribute and/or communicate the Work. -4. Limitations on copyright +##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 @@ -107,7 +106,7 @@ applicable limitations thereto. -5. Obligations of the Licensee +##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: @@ -148,7 +147,7 @@ reproducing the content of the copyright notice. -6. Chain of Authorship +##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 @@ -164,7 +163,7 @@ terms of this Licence. -7. Disclaimer of Warranty +##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 @@ -181,7 +180,7 @@ for the grant of any rights to the Work. -8. Disclaimer of Liability +##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, @@ -194,7 +193,7 @@ laws as far such laws apply to the Work. -9. Additional agreements +##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 @@ -208,7 +207,7 @@ any such warranty or additional liability. -10. Acceptance of 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 @@ -223,7 +222,7 @@ Distribution and/or Communication by You of the Work or copies thereof. -11. Information to the public +##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 @@ -234,7 +233,7 @@ accessible, concluded, stored and reproduced by the Licensee. -12. Termination of the Licence +##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. @@ -245,7 +244,7 @@ remain in full compliance with the Licence. -13. Miscellaneous +##13. Miscellaneous Without prejudice of Article 9 above, the Licence represents the complete agreement between the Parties as to the Work licensed hereunder. @@ -266,7 +265,7 @@ their choice. -14. Jurisdiction +##14. Jurisdiction Any litigation resulting from the interpretation of this License, arising between the European Commission, as a Licensor, and any Licensee, will be @@ -280,7 +279,7 @@ conducts its primary business. -15. Applicable Law +##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. @@ -292,14 +291,13 @@ This licence shall be governed by the Belgian law if: - or registered office inside a European Union country. -=== +--- -Appendix +##Appendix - -“Compatible Licences” according to article 5 EUPL are: +**“Compatible Licences”** according to article 5 EUPL are: - GNU General Public License (GNU GPL) v. 2 @@ -310,4 +308,4 @@ Appendix - Eclipse Public License v. 1.0 -- Cecill v. 2.0 \ No newline at end of file +- Cecill v. 2.0 diff --git a/README.md b/README.md new file mode 100644 index 0000000..602ea87 --- /dev/null +++ b/README.md @@ -0,0 +1,54 @@ +# gCube URI Resolver + +The Gcube Url Shortener uses the Firebase Dynamic Links Short Links API provided by Google (at https://firebase.google.com/docs/reference/dynamic-links/link-shortener). +It is a service that takes long URLs and squeezes them into fewer characters to make a link that is easier to share, tweet, or email to friends. + +## Built With + +* [OpenJDK](https://openjdk.java.net/) - The JDK used +* [Maven](https://maven.apache.org/) - Dependency Management + +## Documentation + +## Change log + +See the [URI Resolver Releases](https://code-repo.d4science.org/gCubeSystem/gcube-url-shortener/releases) + +## Authors + +* **Francesco Mangiacrapa** ([ORCID](https://orcid.org/0000-0002-6528-664X)) Computer Scientist at [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience) + +## License + +This project is licensed under the EUPL V.1.1 License - see the [LICENSE.md](LICENSE.md) file for details. + + +## About the gCube Framework +This software is part of the [gCubeFramework](https://www.gcube-system.org/ "gCubeFramework"): an +open-source software toolkit used for building and operating Hybrid Data +Infrastructures enabling the dynamic deployment of Virtual Research Environments +by favouring the realisation of reuse oriented policies. + +The projects leading to this software have received funding from a series of European Union programmes including: + +- the Sixth Framework Programme for Research and Technological Development + - DILIGENT (grant no. 004260). +- the Seventh Framework Programme for research, technological development and demonstration + - D4Science (grant no. 212488); + - D4Science-II (grant no.239019); + - ENVRI (grant no. 283465); + - EUBrazilOpenBio (grant no. 288754); + - iMarine(grant no. 283644). +- the H2020 research and innovation programme + - BlueBRIDGE (grant no. 675680); + - EGIEngage (grant no. 654142); + - ENVRIplus (grant no. 654182); + - PARTHENOS (grant no. 654119); + - SoBigData (grant no. 654024); + - DESIRA (grant no. 818194); + - ARIADNEplus (grant no. 823914); + - RISIS2 (grant no. 824091); + - PerformFish (grant no. 727610); + - AGINFRAplus (grant no. 731001). + + diff --git a/distro/changelog.xml b/changelog.xml similarity index 96% rename from distro/changelog.xml rename to changelog.xml index c7a5a14..401f857 100644 --- a/distro/changelog.xml +++ b/changelog.xml @@ -1,6 +1,6 @@ + date="20191126-133444"> [Task #16415] Migrate to Firebase Dynamic Links APIs / - ${distroDirectory} / true - README - LICENSE - changelog.xml + README.md + LICENSE.md profile.xml + changelog.xml 755 true + diff --git a/distro/README b/distro/README deleted file mode 100644 index 51fd968..0000000 --- a/distro/README +++ /dev/null @@ -1,74 +0,0 @@ -The gCube System - gcube-url-shortener --------------------------------------------------- - -The Gcube Url Shortener uses the Firebase Dynamic Links Short Links API provided by Google (at https://firebase.google.com/docs/reference/dynamic-links/link-shortener). - It is a service that takes long URLs and squeezes them into fewer characters to make a link that is easier to share, tweet, or email to friends. - - -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. - -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). - - -Version --------------------------------------------------- - -1.5.0-SNAPSHOT (2019-07-05) - -Please see the file named "changelog.xml" in this directory for the release notes. - - -Authors --------------------------------------------------- - -* Francesco Mangiacrapa (francesco.mangiacrapa-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). - -Maintainers ------------ - -* Francesco Mangiacrapa (francesco.mangiacrapa-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). - -Download information --------------------------------------------------- - -Source code is available from SVN: - https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/gcube-url-shortener - -Binaries can be downloaded from the gCube website: - https://www.gcube-system.org/ - - -Installation --------------------------------------------------- - - -Documentation --------------------------------------------------- - -Documentation is available on-line in the gCube Wiki: - https://wiki.gcube-system.org/gcube/index.php - -Support --------------------------------------------------- - -Bugs and support requests can be reported in the gCube issue tracking tool: - https://support.d4science.org/projects/gcube/ - - -Licensing --------------------------------------------------- - -This software is licensed under the terms you may find in the file named "LICENSE" in this directory. \ No newline at end of file diff --git a/distro/descriptor.xml b/distro/descriptor.xml deleted file mode 100644 index ab37ad2..0000000 --- a/distro/descriptor.xml +++ /dev/null @@ -1,32 +0,0 @@ - - servicearchive - - tar.gz - - / - - - distro - / - true - - README - LICENSE - changelog.xml - profile.xml - - 755 - true - - - - - target/gcube-url-shortener-1.5.0-SNAPSHOT.jar - /gcube-url-shortener - - - - diff --git a/distro/profile.xml b/distro/profile.xml deleted file mode 100644 index c672db3..0000000 --- a/distro/profile.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - Service - - The Gcube Url Shortener uses the Firebase Dynamic Links Short Links API provided by Google (at https://firebase.google.com/docs/reference/dynamic-links/link-shortener). - It is a service that takes long URLs and squeezes them into fewer characters to make a link that is easier to share, tweet, or email to friends. - PortletUser - gcube-url-shortener - 1.5.0-SNAPSHOT - - - gcube-url-shortener - 1.5.0-SNAPSHOT - - org.gcube.portlets.user - gcube-url-shortener - 1.5.0-SNAPSHOT - - - target/gcube-url-shortener-1.5.0-SNAPSHOT.war - - - - - diff --git a/pom.xml b/pom.xml index 1c3dd6d..d764ed6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,11 @@ - maven-parent org.gcube.tools - 1.0.0 + 1.1.0 @@ -16,8 +17,11 @@ gcube-url-shortener The Gcube Url Shortener uses the Firebase Dynamic Links Short Links API provided by Google (at https://firebase.google.com/docs/reference/dynamic-links/link-shortener). It is a service that takes long URLs and squeezes them into fewer characters to make a link that is easier to share, tweet, or email to friends. + - https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/${project.artifactId} + scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git + scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git + https://code-repo.d4science.org/gCubeSystem/${project.artifactId} @@ -38,19 +42,8 @@ ${buildDate} templates distro - config - 1.8 - 1.8 - 2.5.1 - - ${env.GLOBUS_LOCATION} - - UTF-8 - UTF-8 @@ -126,92 +119,40 @@ - - ${webappDirectory}/WEB-INF/classes + + + + src/main/resources + + **/*.* + + + + + - - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - + org.apache.maven.plugins maven-surefire-plugin - 2.16 true - - - - org.apache.maven.surefire - surefire-junit47 - 2.16 - - - - - maven-resources-plugin - 2.6 - - - copy-distro-resources - process-resources - - copy-resources - - - ${distroDirectory} - - - ${templatesDirectory} - true - - - - - - - - maven-clean-plugin - 2.5 - - - - ${distroDirectory} - - ** - - false - - - ${configDirectory} - - ** - - false - - - - org.apache.maven.plugins maven-assembly-plugin - 2.2 - ${templatesDirectory}/descriptor.xml + descriptor.xml servicearchive - package + install single @@ -220,5 +161,4 @@ - diff --git a/profile.xml b/profile.xml new file mode 100644 index 0000000..4078947 --- /dev/null +++ b/profile.xml @@ -0,0 +1,29 @@ + + + + Service + + ${project.description} + PortletUser + ${project.artifactId} + 1.0.0 + + + ${artifactId} + ${version} + + ${groupId} + ${artifactId} + ${version} + + + target/${build.finalName}.jar + + library + + ${project.build.finalName}.${project.packaging} + + + + + \ No newline at end of file diff --git a/templates/LICENSE b/templates/LICENSE deleted file mode 100644 index 2d9616a..0000000 --- a/templates/LICENSE +++ /dev/null @@ -1 +0,0 @@ -${gcube.license} \ No newline at end of file diff --git a/templates/README b/templates/README deleted file mode 100644 index 3678c90..0000000 --- a/templates/README +++ /dev/null @@ -1,60 +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 --------------------------------------------------- - -* Francesco Mangiacrapa (francesco.mangiacrapa-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). - -Maintainers ------------ - -* Francesco Mangiacrapa (francesco.mangiacrapa-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). - -Download information --------------------------------------------------- - -Source code is available from SVN: - ${scm.url} - -Binaries can be downloaded from the gCube website: - ${gcube.website} - - -Installation --------------------------------------------------- - - -Documentation --------------------------------------------------- - -Documentation is available on-line in the gCube Wiki: - ${gcube.wikiRoot} - -Support --------------------------------------------------- - -Bugs and support requests can be reported in the gCube issue tracking tool: - ${gcube.issueTracking} - - -Licensing --------------------------------------------------- - -This software is licensed under the terms you may find in the file named "LICENSE" in this directory. \ No newline at end of file diff --git a/templates/changelog.xml b/templates/changelog.xml deleted file mode 100644 index f8b0248..0000000 --- a/templates/changelog.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - [Task #16415] Migrate to Firebase Dynamic Links APIs - - - [Support #8940] src/it/simple-it/pom.xm - - - removed lo4j dependency from pom - - - removed jump of scope during read of Runtime - HTTP-URL-Shortener - - removed constructor with the parameter scope - - - removed maven portal bom dependency - - - maven-bom replaced by portal-bom - - - First Release - - \ No newline at end of file diff --git a/templates/profile.xml b/templates/profile.xml deleted file mode 100644 index 51c3b6b..0000000 --- a/templates/profile.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Service - - ${description} - PortletUser - ${artifactId} - ${version} - - - ${artifactId} - ${version} - - ${groupId} - ${artifactId} - ${version} - - - target/${build.finalName}.war - - - - -