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/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 15c6c25..ed342a8 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,15 +4,6 @@
-
- uses
-
-
- uses
-
-
- uses
-
diff --git a/src/main/webapp/WEB-INF/LICENSE b/LICENSE.md
similarity index 94%
rename from src/main/webapp/WEB-INF/LICENSE
rename to LICENSE.md
index 9724bfe..1932b4c 100644
--- a/src/main/webapp/WEB-INF/LICENSE
+++ b/LICENSE.md
@@ -1,13 +1,9 @@
-gCube System - License
-------------------------------------------------------------
+#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).
@@ -16,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:
@@ -63,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
@@ -89,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
@@ -101,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
@@ -110,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:
@@ -151,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
@@ -167,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
@@ -184,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,
@@ -197,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
@@ -211,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
@@ -226,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
@@ -237,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.
@@ -248,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.
@@ -269,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
@@ -283,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.
@@ -295,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
@@ -313,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..6b12145
--- /dev/null
+++ b/README.md
@@ -0,0 +1,46 @@
+# WPS
+
+This is the implementation of the DataMiner service that integrates the WPS 52North in the D4Science Infrastructure.
+
+## Structure of the project
+
+* The source code is present in the src folder.
+
+## Built With
+
+* [OpenJDK](https://openjdk.java.net/) - The JDK used
+* [Maven](https://maven.apache.org/) - Dependency Management
+
+## Documentation
+
+* Use of this service is is described on [Wiki](https://wiki.gcube-system.org/gcube/DataMiner_Installation).
+
+## Change log
+
+See [Releases](https://code-repo.d4science.org/gCubeSystem/wps/releases).
+
+## Authors
+
+* **Gianpaolo Coro** ([ORCID]()) - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
+* **Lucio Lelii** ([ORCID]()) - [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);
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/changelog.xml b/changelog.xml
similarity index 75%
rename from src/main/webapp/WEB-INF/changelog.xml
rename to changelog.xml
index 7885397..e4e1858 100644
--- a/src/main/webapp/WEB-INF/changelog.xml
+++ b/changelog.xml
@@ -1,4 +1,8 @@
+
+ Updated to Git and Jenkins [ticket #18120]
+
Added https support [ticket #13024]
diff --git a/distro/descriptor.xml b/descriptor.xml
similarity index 81%
rename from distro/descriptor.xml
rename to descriptor.xml
index e395580..779594a 100644
--- a/distro/descriptor.xml
+++ b/descriptor.xml
@@ -9,13 +9,13 @@
/
- ${distroDirectory}
/
true
- README
- LICENSE
- changelog.xml
+ README.md
+ LICENSE.md
+ gcube-app.xml
+ changelog.xml
profile.xml
755
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 5a6ef5c..0000000
--- a/distro/README
+++ /dev/null
@@ -1,66 +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
---------------------------------------------------
-
-* Lucio Lelii (lucio.lelii@isti.cnr.it), CNR, Italy
-
-
-Maintainers
------------
-
-* Lucio Lelii (lucio.lelii@isti.cnr.it), CNR, Italy
-
-
-Download information
---------------------------------------------------
-
-Source code is available from SVN:
- ${scm.url}
-
-Binaries can be downloaded from the gCube website:
- ${gcube.website}
-
-
-Installation
---------------------------------------------------
-
-Installation documentation is available on-line in the gCube Wiki:
- ${gcube.wikiRoot}/RConnector
-
-
-Documentation
---------------------------------------------------
-
-Documentation is available on-line in the gCube Wiki:
- ${gcube.wikiRoot}/RConnector
-
-
-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/distro/changelog.xml b/distro/changelog.xml
deleted file mode 100644
index 7885397..0000000
--- a/distro/changelog.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- Added https support [ticket #13024]
-
-
- Dynamic adding, removing and updating of algorithms added
-
- Moved to SocialNetworkingService 2.0
-
-
- First Release
-
-
\ No newline at end of file
diff --git a/distro/gcube-app.xml b/distro/gcube-app.xml
deleted file mode 100644
index 72edaf8..0000000
--- a/distro/gcube-app.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-DataMiner
-WPS
-${version}
-A service implementing a WPS provider in the D4Science e-Infrastructure
-
diff --git a/distro/web.xml b/distro/web.xml
deleted file mode 100644
index 88ea994..0000000
--- a/distro/web.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
- 52°North Web Processing Service, Git:
- 1665e1b7b2188755161d4f0f3a6acf562d0444e1 @ 2015-03-21 00:30:20
-
- A web processing framework supporting the OGC WPS 1.0.0 specification
-
-
- algorithmDirectory
- /home/gcube/wps_algorithms/algorithms/dev/software
-
-
-
- maxComputation
- 4
-
-
- saveOnStorage
- true
-
-
- simulationMode
- false
-
-
- excludeWritesOnSH
-
- statistical.manager
-
-
-
-
-
-
-
-
-
- filter-mapping> CommunicationSizeLogFilter
- /WebProcessingService
-
-
-
-
- wpsServlet
- org.gcube.data.analysis.wps.WebProcessingService
-
- 0
-
- wps.config.file
- config/wps_config.xml
-
-
-
- cancelComputationServlet
- org.gcube.data.analysis.wps.CancelComputation
- 1
-
-
- retrieveResultServlet
- org.n52.wps.server.RetrieveResultServlet
- 1
-
-
- wpsServlet
- /WebProcessingService
-
-
- retrieveResultServlet
- /RetrieveResultServlet
-
-
- cancelComputationServlet
- /CancelComputationServlet
-
-
- /index.html
-
-
-
-
- security.config.validation
- false
-
-
-
-
- ClassLoaderFilter
- org.gcube.data.analysis.wps.filter.ClassLoaderFilter
-
-
-
-
-
-
-
- CORS
- com.thetransactioncompany.cors.CORSFilter
-
- cors.allowOrigin
- *
-
-
- cors.allowGenericHttpRequests
- true
-
-
- cors.supportedMethods
- GET, POST, HEAD, PUT, DELETE, OPTIONS
-
-
- cors.supportedHeaders
- *
-
-
- cors.exposedHeaders
- *
-
-
-
- CORS
- /*
-
-
-
- ClassLoaderFilter
- /*
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/gcube-app.xml b/gcube-app.xml
new file mode 100644
index 0000000..e2474e9
--- /dev/null
+++ b/gcube-app.xml
@@ -0,0 +1,8 @@
+
+
+
+${serviceName}
+${serviceClass}
+${version}
+${description}
+
diff --git a/pom.xml b/pom.xml
index 41a4958..eef436c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,19 +3,23 @@
4.0.0
org.gcube.data-analysis
wps
- 1.1.4-SNAPSHOT
+ 1.1.5-SNAPSHOT
WPS
+ A service implementing a WPS provider in the D4Science e-Infrastructure
maven-parent
org.gcube.tools
- 1.0.0
+ 1.1.0
war
+ DataMiner
+ WPS
+
${project.basedir}/src/main/webapp/WEB-INF
${project.basedir}/distro
2.2-M2
@@ -23,8 +27,9 @@
1.3.3
1.5.1
3.6.1
+
-
+
n52-releases
@@ -37,7 +42,7 @@
false
-
+
Apache
Apache repository
http://repo1.maven.org/maven2
@@ -57,8 +62,8 @@
OpenGEO
opengeo repository
https://repo.boundlessgeo.com
-
-
+
+
@@ -734,8 +739,18 @@
${webappDirectory}
- ${distroDirectory}
+ ${project.basedir}
true
+
+ src
+
+
+ LICENSE.md
+ README.md
+ gcube-app.xml
+ changelog.xml
+ profile.xml
+
diff --git a/distro/profile.xml b/profile.xml
similarity index 100%
rename from distro/profile.xml
rename to profile.xml
diff --git a/src/main/webapp/WEB-INF/README b/src/main/webapp/WEB-INF/README
deleted file mode 100644
index 891d184..0000000
--- a/src/main/webapp/WEB-INF/README
+++ /dev/null
@@ -1,79 +0,0 @@
-The gCube System - WPS
---------------------------------------------------
-
-${description}
-
-
-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.1.3-SNAPSHOT (2019-03-27)
-
-Please see the file named "changelog.xml" in this directory for the release notes.
-
-
-Authors
---------------------------------------------------
-
-* Lucio Lelii (lucio.lelii@isti.cnr.it), CNR, Italy
-
-
-Maintainers
------------
-
-* Lucio Lelii (lucio.lelii@isti.cnr.it), CNR, Italy
-
-
-Download information
---------------------------------------------------
-
-Source code is available from SVN:
- ${scm.url}
-
-Binaries can be downloaded from the gCube website:
- https://www.gcube-system.org/
-
-
-Installation
---------------------------------------------------
-
-Installation documentation is available on-line in the gCube Wiki:
- https://wiki.gcube-system.org/gcube/index.php/RConnector
-
-
-Documentation
---------------------------------------------------
-
-Documentation is available on-line in the gCube Wiki:
- https://wiki.gcube-system.org/gcube/index.php/RConnector
-
-
-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/src/main/webapp/WEB-INF/descriptor.xml b/src/main/webapp/WEB-INF/descriptor.xml
deleted file mode 100644
index a66561d..0000000
--- a/src/main/webapp/WEB-INF/descriptor.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
- servicearchive
-
- tar.gz
-
- /
-
-
- /home/lucio/eclipse-workspace/wps_TRUNK/distro
- /
- true
-
- README
- LICENSE
- changelog.xml
- profile.xml
-
- 755
- true
-
-
-
-
-
- /wps
-
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/gcube-app.xml b/src/main/webapp/WEB-INF/gcube-app.xml
deleted file mode 100644
index 9ff0f0f..0000000
--- a/src/main/webapp/WEB-INF/gcube-app.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-DataMiner
-WPS
-1.0
-A service implementing a WPS provider in the D4Science e-Infrastructure
-
diff --git a/src/main/webapp/WEB-INF/profile.xml b/src/main/webapp/WEB-INF/profile.xml
deleted file mode 100644
index 67c8fb8..0000000
--- a/src/main/webapp/WEB-INF/profile.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
- Service
-
- ${description}
- DataAnalysis
- wps
- 1.0.0
-
-
- wps
- 1.1.3-SNAPSHOT
-
- org.gcube.data-analysis
- wps
- 1.1.3-SNAPSHOT
-
-
- wps.jar
-
-
-
-
-
-
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index f481ee9..88ea994 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -9,7 +9,7 @@
algorithmDirectory
- /home/gcube/wps_algorithms/algorithms
+ /home/gcube/wps_algorithms/algorithms/dev/software