From d462893125b61ef9fa1c3f2dae23fb794b8f1220 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 10 Jul 2020 18:27:48 +0200 Subject: [PATCH 01/17] Enhancing version to have zero-dependencies container --- .gitignore | 1 + .settings/.gitignore | 3 +++ pom.xml | 4 ++-- src/main/resources/META-INF/.gitignore | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 .settings/.gitignore create mode 100644 src/main/resources/META-INF/.gitignore 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/.gitignore b/.settings/.gitignore new file mode 100644 index 0000000..1de83a6 --- /dev/null +++ b/.settings/.gitignore @@ -0,0 +1,3 @@ +/org.eclipse.core.resources.prefs +/org.eclipse.jdt.core.prefs +/org.eclipse.m2e.core.prefs diff --git a/pom.xml b/pom.xml index e5e2ad5..349c84e 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gcube.core common-smartgears - 2.2.0 + 3.0.0-SNAPSHOT SmartGears @@ -19,7 +19,7 @@ org.gcube.distribution gcube-bom - LATEST + 2.0.0-SNAPSHOT pom import diff --git a/src/main/resources/META-INF/.gitignore b/src/main/resources/META-INF/.gitignore new file mode 100644 index 0000000..b5c4b2d --- /dev/null +++ b/src/main/resources/META-INF/.gitignore @@ -0,0 +1 @@ +/smartgears-config.xml From 72dbecf46d8872df050c5780862583a688d36ba9 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 14 Jul 2020 12:19:02 +0200 Subject: [PATCH 02/17] Added required files e.g. CHANGELOG, LICENSE, README --- CHANGELOG.md | 131 +++++++++++++++++++++ LICENSE.md | 312 +++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 79 +++++++++++++ 3 files changed, 522 insertions(+) create mode 100644 CHANGELOG.md create mode 100644 LICENSE.md create mode 100644 README.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..f626212 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,131 @@ +# Changelog + +All notable changes to this project will be documented in this file. +This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [v3.0.0-SNAPSHOT] [r5.0.0] - + +- [#19283] Switched container JSON management to gcube-jackson + +## [v.2.2.0] [r4.19.0] - 2020-01-23 + +- Multiple token are generated in the same call in place of one per call + + +## [v.2.1.9] [r4.15.0] - 2019-11-08 + +- Project adapted to be build with Jenkins + + +## [v.2.1.8] [r4.14.0] - 2019-05-27 + +- Support oauth2 protocol accepting token in the auhtorization header field + + +## [v.2.1.7] [r4.13.1] - 2019-02-26 + +- Added Proxy Address to Application Configuration + +- Added protocol to Container Configuration (http by default) + +- Changed the logs in accounting handler to log error or success and eventually error code + + +## [v.2.1.5] [r4.6.1] - 2017-09-19 + +- Added ThreadLocal InnerMethodName to set method name from application + + +## [v.2.1.4] [r4.6.0] - 2017-07-25 + +- Validation handler for application split in 2 different handlers: - ContextRetriever that set Token and Scope - RequestValidation that does all the required checks + + +## [v.2.1.3] [r4.5.0] - 2017-06-06 + +- Added gcube bom dependency + +- Search for handlers in the root classpath + + +## [v.2.1.2] [r4.3.0] - 2017-05-02 + +- Modified the Authorization filter to accept also children scope when authorizeChildrenContext is enabled on ContianerConfiguration + +- Shutdown of Accounting thread added + + +## [v.2.1.1] [r4.3.0] - 2017-03-16 + +- Minor issue on filter exclusion fixed + + +## [v.2.0.1] [r4.2.0] - 2016-12-15 + +- Proxy configuration added + +- Solved a bug in events registration for ProfileManager + +- Added a scheduler for period update of GCoreEnpoints + +- Exclude modified to support exclude for sub-group of handlers + + +## [v.2.0.0] [r4.1.0] - 2016-11-07 + +- Integration with Authorization 2.0 + + +## [v.1.2.7] [r3.11.0] - 2016-05-18 + +- [#2355] Removed commons-io dependecy + +## [v.1.2.6] [r3.10.1] - 2016-04-08 + +- [#2474] Added missing class for service loader of org.gcube.smartgears.handlers.container.ContainerHandler +- [#1353] Added flush of accounting data + + +## [v.1.2.5] [r3.10.0] - 2016-02-08 + +- Enhanced accounting version + + +## [v.1.2.4] [r3.9.0] - 2015-12-09 + +- Transparent accounting added on service calls + + +## [v.1.2.3] - 2015-07-27 + +- Authorization token control added + +- Added support to HTTP Basic authorization + + +## [v.1.2.2] - 2015-04-27 + +- Fixed available space information on ghn profile + + +## [v.1.2.1] - 2014-02-13 + +- Scopes can be removed from container + +- Node profile set to static + +- Internal adjustments for move to Java 7 + +- Wildcard allowed in exclude directives + +- Domain corrected derived in gHN profile + +- Cleaner shutdown + +- Further improvement in shutdown handling + + +## [v.1.0.0] - 2013-10-24 + +- First Release + diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..3af0507 --- /dev/null +++ b/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 + diff --git a/README.md b/README.md new file mode 100644 index 0000000..30250cf --- /dev/null +++ b/README.md @@ -0,0 +1,79 @@ +# Common Smartgears + +A core gCube library which empower a servlet container (e.g. tomcat) with a set of functionality such as: + +- node and application infrastructure registration +- authorization +- accounting + + +## 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/SmartGears) + +## Change log + +See [Releases](https://code-repo.d4science.org/gCubeSystem/common-smartgears/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) +* **Fabio Simeoni** - FAO of the UN, Italy + + +## 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}, {Simeoni, Fabio}}, + organization = {{ISTI - CNR}, {FAO}}, + address = {{Pisa, Italy}, {Roma, Italy}}, + year = 2019, + 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); + + From 568be1f0bbe16bfe112679b46759ccb4b5a57f4e Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 24 Jul 2020 15:44:05 +0200 Subject: [PATCH 03/17] Ignore eclipse generated file --- .classpath | 43 ------------------------------------------- .gitignore | 1 + 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 .classpath diff --git a/.classpath b/.classpath deleted file mode 100644 index 228d02c..0000000 --- a/.classpath +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index b83d222..0f44a0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target/ +/.classpath From fb52eb958b41bf85a6e122ad72a0892b00dfaaea Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 24 Jul 2020 15:45:05 +0200 Subject: [PATCH 04/17] Removed files from distro which has been changed and moved in root --- distro/LICENSE | 4 --- distro/README | 70 -------------------------------------------------- 2 files changed, 74 deletions(-) delete mode 100644 distro/LICENSE delete mode 100644 distro/README diff --git a/distro/LICENSE b/distro/LICENSE deleted file mode 100644 index cdf50bd..0000000 --- a/distro/LICENSE +++ /dev/null @@ -1,4 +0,0 @@ -gCube System - License ------------------------------------------------------------- - -${gcube.license} \ No newline at end of file diff --git a/distro/README b/distro/README deleted file mode 100644 index 5b353ed..0000000 --- a/distro/README +++ /dev/null @@ -1,70 +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 -* Luca Frosini (luca.frosini@isti.cnr.it), CNR, Italy -* Lucio Lelii (lucio.lelii@isti.cnr.it), CNT, Italy - - -Maintainers ------------ - -* Luca Frosini (luca.frosini@isti.cnr.it), CNR, Italy -* Lucio Lelii (lucio.lelii@isti.cnr.it), CNT, 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}/Smartgears - - -Documentation --------------------------------------------------- - -Documentation is available on-line in the gCube Wiki: - ${gcube.wikiRoot}/Smartgears - - -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. - From 132f249e05b2478079a589dcf63cb1f47a69b5cc Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 24 Jul 2020 15:45:42 +0200 Subject: [PATCH 05/17] Removed unneeded import --- .../java/org/gcube/smartgears/managers/ApplicationManager.java | 2 -- .../java/org/gcube/smartgears/managers/ContainerManager.java | 1 - 2 files changed, 3 deletions(-) diff --git a/src/main/java/org/gcube/smartgears/managers/ApplicationManager.java b/src/main/java/org/gcube/smartgears/managers/ApplicationManager.java index c4b4b74..38fbe42 100644 --- a/src/main/java/org/gcube/smartgears/managers/ApplicationManager.java +++ b/src/main/java/org/gcube/smartgears/managers/ApplicationManager.java @@ -13,10 +13,8 @@ import java.io.File; import java.io.FileOutputStream; import java.io.ObjectOutputStream; import java.util.Collection; -import java.util.HashSet; import java.util.List; import java.util.Map.Entry; -import java.util.Set; import java.util.stream.Collectors; import javax.servlet.FilterRegistration; diff --git a/src/main/java/org/gcube/smartgears/managers/ContainerManager.java b/src/main/java/org/gcube/smartgears/managers/ContainerManager.java index 7e99092..9d3d327 100644 --- a/src/main/java/org/gcube/smartgears/managers/ContainerManager.java +++ b/src/main/java/org/gcube/smartgears/managers/ContainerManager.java @@ -10,7 +10,6 @@ import static org.gcube.smartgears.provider.ProviderFactory.provider; import java.io.File; import java.io.FileOutputStream; import java.io.ObjectOutputStream; -import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; From f80301b8679086db52fdb65bc70429c6b65a2692 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 24 Jul 2020 15:46:17 +0200 Subject: [PATCH 06/17] Remvoed changelog which has been changed and moved in root folder --- distro/changelog.xml | 68 -------------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 distro/changelog.xml diff --git a/distro/changelog.xml b/distro/changelog.xml deleted file mode 100644 index 5bae3dd..0000000 --- a/distro/changelog.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - Support oauth2 protocol accepting token in the auhtorization header field - - - Added Proxy Address to Application Configuration - Added protocol to Container Configuration (http by default) - Changed the logs in accounting handler to log error or success and eventually error code - - - Added ThreadLocal InnerMethodName to set method name from application - - - Validation handler for application split in 2 different handlers: - - ContextRetriever that set Token and Scope - - RequestValidation that does all the required checks - - - - Added gcube bom dependency - Search for handlers in the root classpath - - - Modified the Authorization filter to accept also children - scope when authorizeChildrenContext is enabled on ContianerConfiguration - Shutdown of Accounting thread added - - - Minor issue on filter exclusion fixed - - - proxy configuration added - solved a bug in events registration for ProfileManager - added a scheduler for period update of GCoreEnpoints - Exclude modified to support exclude for sub-group of handlers - - - integration with Authorization 2.0 - - - Added flush of accounting data - - - Changed accounting version - - - Transparent accounting added on service calls - - - Authorization token control added - Added support to HTTP Basic authorization - - - Fixed available space information on ghn profile - - - scopes can be removed from container - node profile set to static - internal adjustments for move to Java 7 - wildcard allowed in exclude directives - domain corrected derived in gHN profile - cleaner shutdown - further improvement in shutdown handling - - - First Release - - \ No newline at end of file From c04b3df2ffa3fd06bf1a1a798f6d20c4dad83a18 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 24 Jul 2020 15:46:59 +0200 Subject: [PATCH 07/17] Removed unused variable and the related imports --- .../handlers/application/lifecycle/ProfileBuilder.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/smartgears/handlers/application/lifecycle/ProfileBuilder.java b/src/main/java/org/gcube/smartgears/handlers/application/lifecycle/ProfileBuilder.java index 522b9ba..da9c635 100644 --- a/src/main/java/org/gcube/smartgears/handlers/application/lifecycle/ProfileBuilder.java +++ b/src/main/java/org/gcube/smartgears/handlers/application/lifecycle/ProfileBuilder.java @@ -12,14 +12,12 @@ import org.gcube.common.resources.gcore.HostingNode; import org.gcube.smartgears.configuration.application.ApplicationConfiguration; import org.gcube.smartgears.configuration.container.ContainerConfiguration; import org.gcube.smartgears.context.application.ApplicationContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class ProfileBuilder { private static List servletExcludes = Arrays.asList("default","jsp"); - private static final Logger log = LoggerFactory.getLogger(ProfileBuilder.class); + // private static final Logger log = LoggerFactory.getLogger(ProfileBuilder.class); private ApplicationContext context; From 216f0f1389fca3f3f744e64de04cfedce337c8cf Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 3 Aug 2020 16:28:49 +0200 Subject: [PATCH 08/17] Fixed CHANGELOG according to the new template --- CHANGELOG.md | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f626212..87f223b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,11 @@ -# Changelog - -All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +# Changelog for Common Smartgears + + ## [v3.0.0-SNAPSHOT] [r5.0.0] - -- [#19283] Switched container JSON management to gcube-jackson +- Switched container JSON management to gcube-jackson [#19283] ## [v.2.2.0] [r4.19.0] - 2020-01-23 @@ -25,9 +25,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v.2.1.7] [r4.13.1] - 2019-02-26 - Added Proxy Address to Application Configuration - - Added protocol to Container Configuration (http by default) - - Changed the logs in accounting handler to log error or success and eventually error code @@ -44,14 +42,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v.2.1.3] [r4.5.0] - 2017-06-06 - Added gcube bom dependency - - Search for handlers in the root classpath ## [v.2.1.2] [r4.3.0] - 2017-05-02 - Modified the Authorization filter to accept also children scope when authorizeChildrenContext is enabled on ContianerConfiguration - - Shutdown of Accounting thread added @@ -63,11 +59,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v.2.0.1] [r4.2.0] - 2016-12-15 - Proxy configuration added - - Solved a bug in events registration for ProfileManager - - Added a scheduler for period update of GCoreEnpoints - - Exclude modified to support exclude for sub-group of handlers @@ -78,12 +71,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v.1.2.7] [r3.11.0] - 2016-05-18 -- [#2355] Removed commons-io dependecy +- Removed commons-io dependency [#2355] ## [v.1.2.6] [r3.10.1] - 2016-04-08 -- [#2474] Added missing class for service loader of org.gcube.smartgears.handlers.container.ContainerHandler -- [#1353] Added flush of accounting data +- Added missing class for service loader of org.gcube.smartgears.handlers.container.ContainerHandler [#2474] +- Added flush of accounting data [#1353] ## [v.1.2.5] [r3.10.0] - 2016-02-08 @@ -99,7 +92,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v.1.2.3] - 2015-07-27 - Authorization token control added - - Added support to HTTP Basic authorization @@ -111,17 +103,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v.1.2.1] - 2014-02-13 - Scopes can be removed from container - - Node profile set to static - - Internal adjustments for move to Java 7 - - Wildcard allowed in exclude directives - - Domain corrected derived in gHN profile - - Cleaner shutdown - - Further improvement in shutdown handling From 0f54034ef91933364e27c96c4ab9e146e964afcd Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 3 Aug 2020 16:31:21 +0200 Subject: [PATCH 09/17] Removed dependency version which is already defined in gcube-bom --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 349c84e..b66280d 100644 --- a/pom.xml +++ b/pom.xml @@ -165,7 +165,6 @@ ch.qos.logback logback-classic - 1.2.3 runtime @@ -203,7 +202,7 @@ maven-jar-plugin - 2.3.2 + default-jar @@ -224,7 +223,7 @@ org.apache.maven.plugins maven-war-plugin - 2.4 + false probe @@ -247,7 +246,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.15 + From 74dabde6f55c65440657113a478d58a971111463 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 6 Aug 2020 16:33:34 +0200 Subject: [PATCH 10/17] Fixed CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87f223b..8a501b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Switched container JSON management to gcube-jackson [#19283] + ## [v.2.2.0] [r4.19.0] - 2020-01-23 - Multiple token are generated in the same call in place of one per call From b503e017cc4341836d9e6c5ee438fa9002f4e146 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 6 Aug 2020 16:34:53 +0200 Subject: [PATCH 11/17] Updated descriptor --- distro/descriptor.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/distro/descriptor.xml b/distro/descriptor.xml index ba2c192..524c315 100644 --- a/distro/descriptor.xml +++ b/distro/descriptor.xml @@ -13,9 +13,6 @@ ${file.separator} true - README - LICENSE - changelog.xml profile.xml 755 From 7944226cca6618e00d52cb87c7743582fe9e7a22 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 6 Aug 2020 16:35:59 +0200 Subject: [PATCH 12/17] Removed servicearchive creation which is deprecated --- distro/descriptor.xml | 28 ---------------------------- pom.xml | 19 ------------------- 2 files changed, 47 deletions(-) delete mode 100644 distro/descriptor.xml diff --git a/distro/descriptor.xml b/distro/descriptor.xml deleted file mode 100644 index 524c315..0000000 --- a/distro/descriptor.xml +++ /dev/null @@ -1,28 +0,0 @@ - - servicearchive - - tar.gz - - / - - - ${distroDirectory} - ${file.separator} - true - - profile.xml - - 755 - true - - - - - target${file.separator}${build.finalName}.${project.packaging} - ${file.separator}${artifactId} - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index b66280d..d28e4a5 100644 --- a/pom.xml +++ b/pom.xml @@ -180,25 +180,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - ${distroDirectory}/descriptor.xml - - - - - servicearchive - install - - single - - - - - maven-jar-plugin From 9873a148f2c3ed9171749e840e3d781a10f723c5 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 8 Oct 2020 13:49:48 +0200 Subject: [PATCH 13/17] Ignored generated directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0f44a0f..4110018 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /target/ /.classpath +/bin/ From f17d3e107d061066c9efd581cab41818d1a88d76 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 29 Oct 2020 17:23:17 +0100 Subject: [PATCH 14/17] Removed -SNAPSHOT from version and lower bound dependencies range to release the component refs #19616 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d28e4a5..0f5e8fd 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gcube.core common-smartgears - 3.0.0-SNAPSHOT + 3.0.0 SmartGears From d2f3af7f9ed610f76ece7136fe2ea6556ecddc04 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 29 Oct 2020 19:17:11 +0100 Subject: [PATCH 15/17] Fixed version on CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a501b3..91b94fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for Common Smartgears -## [v3.0.0-SNAPSHOT] [r5.0.0] - +## [v3.0.0] [r5.0.0] - - Switched container JSON management to gcube-jackson [#19283] From 621fd9d20cc13aff2f8ccb2deec6912dc3af6710 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 30 Oct 2020 16:21:36 +0100 Subject: [PATCH 16/17] Update 'pom.xml' removed snapshot from bom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0f5e8fd..d501fe2 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.gcube.distribution gcube-bom - 2.0.0-SNAPSHOT + 2.0.0 pom import From fd6857ab60cc6ec3b65ed63b0c6e227b744b56d2 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 4 Nov 2020 17:22:36 +0100 Subject: [PATCH 17/17] Fixed scm section --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d501fe2..9c4471f 100644 --- a/pom.xml +++ b/pom.xml @@ -34,9 +34,9 @@ - scm:git:https://code-repo.d4science.org/gCubeSystem/commmon-smartgears.git - scm:git:https://code-repo.d4science.org/gCubeSystem/commmon-smartgears.git - https://code-repo.d4science.org/gCubeSystem/commmon-smartgears + scm:git:https://code-repo.d4science.org/gCubeSystem/common-smartgears.git + scm:git:https://code-repo.d4science.org/gCubeSystem/common-smartgears.git + https://code-repo.d4science.org/gCubeSystem/common-smartgears