diff --git a/.classpath b/.classpath
index 74e17a7..502bd4a 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
-
+
@@ -10,6 +10,7 @@
+
@@ -23,5 +24,5 @@
-
+
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.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 6e80039..4e4a3ad 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -5,4 +5,5 @@ 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.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..1932b4c
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,311 @@
+#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..6821611
--- /dev/null
+++ b/README.md
@@ -0,0 +1,53 @@
+# gCube URI Resolver Manager
+
+This JAVA library takes the access to gCube Resolvers provided by the [URI-Resolver](https://code-repo.d4science.org/gCubeSystem/uri-resolver) in the D4Science Infrastructure.
+
+## Built With
+
+* [OpenJDK](https://openjdk.java.net/) - The JDK used
+* [Maven](https://maven.apache.org/) - Dependency Management
+
+## Documentation
+
+## Change log
+
+See the [URI Resolver Manager](https://code-repo.d4science.org/gCubeSystem/uri-resolver/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/changelog.xml b/changelog.xml
new file mode 100644
index 0000000..370b062
--- /dev/null
+++ b/changelog.xml
@@ -0,0 +1,20 @@
+
+
+ [Bug #4941] Removed jumps of scope
+
+
+
+
+
+ Removed maven-portal-bom as dependency
+
+
+
+ Updated to support several Access Point for each Resolver
+
+ Introduced Entry Names in Uri-Resolver-Map
+
+
+ First Release
+
+
\ No newline at end of file
diff --git a/templates/descriptor.xml b/descriptor.xml
similarity index 89%
rename from templates/descriptor.xml
rename to descriptor.xml
index 0eec2ec..baacbb7 100644
--- a/templates/descriptor.xml
+++ b/descriptor.xml
@@ -9,17 +9,17 @@
/
- ${distroDirectory}
/
true
- README
- LICENSE
- changelog.xml
+ README.md
+ LICENSE.md
profile.xml
+ changelog.xml
755
true
+
diff --git a/pom.xml b/pom.xml
index 0767e05..e194e54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,10 @@
-
maven-parent
org.gcube.tools
- 1.0.0
+ 1.1.0
@@ -14,10 +15,13 @@
jar
uri-resolver-manager
The URI Resolver Manager
+
- 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}
-
+
Francesco Mangiacrapa
@@ -33,16 +37,8 @@
${project.basedir}/distro
${project.build.directory}/${project.build.finalName}
- templates
- distro
- config
-
2.5.1
-
- ${env.GLOBUS_LOCATION}
UTF-8
UTF-8
@@ -74,7 +70,7 @@
org.gcube.portlets.user
gcube-url-shortener
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ [1.0.0, 2.0.0-SNAPSHOT)
compile
@@ -123,85 +119,39 @@
-
- ${webappDirectory}/WEB-INF/classes
+
+
+ src/main/resources
+
+ **/*.*
+
+
+
+
+
+
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
@@ -210,5 +160,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/src/test/java/UriResolverManagerTest.java b/src/test/java/UriResolverManagerTest.java
index cc26672..f232140 100644
--- a/src/test/java/UriResolverManagerTest.java
+++ b/src/test/java/UriResolverManagerTest.java
@@ -106,7 +106,7 @@ public class UriResolverManagerTest {
/**
* Thread safe
*/
- @Test
+ //@Test
public void test2(){
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 9789343..0000000
--- a/templates/changelog.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
- [Bug #4941] Removed jumps of scope
-
-
-
-
-
- Removed maven-portal-bom as dependency
-
-
-
- Updated to support several Access Point for each Resolver
-
- Introduced Entry Names in Uri-Resolver-Map
-
-
- First Release
-
-
\ No newline at end of file
diff --git a/templates/profile.xml b/templates/profile.xml
deleted file mode 100644
index ffa3274..0000000
--- a/templates/profile.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- Service
-
- ${project.description}
- PortletsUser
- ${project.name}
- 1.0.0
-
-
- ${project.description}
- ${project.name}
- ${version}
-
- ${project.groupId}
- ${project.artifactId}
- ${project.version}
-
- library
-
- ${project.build.finalName}.${project.packaging}
-
-
-
-
-
-
-