release

.classpath

@@ -10,11 +10,13 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

.gitignore

@@ -1 +0,0 @@
-target

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>gis-interface</name>
+	<name>geonetwork</name>
 	<comment></comment>
 	<projects>
 	</projects>

.settings/org.eclipse.jdt.core.prefs

@@ -2,4 +2,5 @@ eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

CHANGELOG.md

@@ -0,0 +1,21 @@
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+# Changelog for org.gcube.spatial.data.geonetwork
+
+## [v3.4.5] - 2020-11-16
+Changed maven repositories in pom
+
+### Fixes
+- Change of nexus hostname in pom.xml
+
+## [v3.4.4] - 2020-05-15
+
+### Fixes
+- gCube bom 2.0.0 integration (https://support.d4science.org/issues/19612)
+- NOT NULL constraints removed from legacy methods (https://support.d4science.org/issues/19965)
+
+## [v3.4.3] - 2020-05-15
+
+### Enhancements
+
+- ISOMetadataByTemplate now exposes a method to define custom freemarker templates

FUNDING.md

@@ -0,0 +1,26 @@
+# Acknowledgments
+
+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](https://cordis.europa.eu/project/id/004260) (grant no. 004260).
+- the Seventh Framework Programme for research, technological development and demonstration 
+    - [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488);
+    - [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019);
+    - [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465);
+    - [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644);
+    - [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754).
+- the H2020 research and innovation programme 
+    - [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024);
+    - [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119);
+    - [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142);
+    - [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182);
+    - [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680);
+    - [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610);
+    - [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001);
+    - [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194);
+    - [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914);
+    - [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091);
+    - [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650);
+    - [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409);
+    - [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042);

GeonetworkSE.xml

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Resource version="0.4.x"><ID>c851b81c-78cf-491d-8df9-c46a68908fc4</ID><Type>RuntimeResource</Type><Profile><Category>Gis</Category><Platform><Name>geonetwork</Name><Version>3</Version><MinorVersion>0</MinorVersion><RevisionVersion>5</RevisionVersion><BuildVersion>0</BuildVersion></Platform><RunTime><HostedOn>node3-d-d4s.d4science.org</HostedOn><Status>READY</Status></RunTime><AccessPoint><Interface><Endpoint EntryName="geonetwork">http://node3-d-d4s.d4science.org/geonetwork</Endpoint></Interface><AccessData><Username>admin</Username><Password>5jykeFZrlF1Xfa4vohyDYg==</Password></AccessData><Properties><Property><Name>priority</Name><Value encrypted="false">1</Value></Property></Properties></AccessPoint></Profile></Resource>

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
+

README.md

@@ -0,0 +1,68 @@
+# Project Title
+
+One paragraph of project description goes here.
+
+## Structure of the project
+
+* Relevant information about how the repository is organized.
+* Description of the Maven modules (if any). 
+* Any information needed to work with the code.
+
+## Built With
+
+* [OpenJDK](https://openjdk.java.net/) - The JDK used
+* [JAX-RS](https://github.com/eclipse-ee4j/jaxrs-api) - Java™ API for RESTful Web Services
+* [Jersey](https://jersey.github.io/) - JAX-RS runtime
+* [Maven](https://maven.apache.org/) - Dependency Management
+* ...
+
+## Documentation
+
+Relevant wiki link(s).
+
+## Change log
+
+See [CHANGELOG.md](CHANGELOG.md).
+
+## Authors
+
+* **John Doe** ([ORCID](https://orcid.org/...-...)) - *Initial work*  @ [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
+* **...** - ...
+
+## 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 = {.. projec title ..},
+        author = {{Infrascience Group}},
+        organization = {ISTI - CNR},
+        address = {Pisa, Italy},
+        year = 2019,
+        note = {...},
+        url = {http://www.http://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 see [FUNDING.md](FUNDING.md)
+
+## Acknowledgments
+ 
+ * Hat tip to anyone whose code was used
+ * Inspiration
+ * etc
+
+

distro/LICENSE

@@ -1 +0,0 @@
-${gcube.license}

distro/README

@@ -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
---------------------------------------------------
- 
-* Fabio Sinibaldi (fabio.sinibaldi-AT-isti.cnr.it) Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).  
-
-Maintainers
------------
- 
-* Fabio Sinibaldi (fabio.sinibaldi-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
---------------------------------------------------
- 
-Installation documentation is available on-line in the gCube Wiki:
-    ${gcube.wikiRoot}/Legacy_ISO_Metadata_Publishing
- 
-Documentation 
---------------------------------------------------
- 
-Documentation is available on-line in the gCube Wiki:
-    ${gcube.wikiRoot}/Legacy_ISO_Metadata_Publishing
-    ${gcube.wikiRoot}/Legacy_ISO_Metadata_Publishing
-     
- 
-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.

distro/changelog.xml

@@ -1,26 +0,0 @@
-<ReleaseNotes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="xsd/changelog.xsd">
-	<Changeset component="geonetwork.1-0-0" date="2013-03-01">
-		<Change>First Release</Change>
-	</Changeset>
-	<Changeset  component="geonetwork.2-1-1" date="2015-05-25">
-		<Change>Integration fixes</Change>
-	</Changeset>
-	<Changeset  component="geonetwork.3-0-0" date="2016-06-25">
-		<Change>Added interface GeoNetworkAdministration</Change>
-		<Change>User and group management facilities</Change>
-		<Change>Gcube 4 SDI automatic configuration</Change>
-		<Change>Improved check on configuration constraints</Change>
-	</Changeset>
-	<Changeset  component="geonetwork.3-1-0" date="2016-09-09">
-		<Change>Added Security token management</Change>
-		<Change>Multiple GN version handling by integrating geonetwork-manager 1.4-SNAPSHOT</Change>
-		<Change>Introduced 'Publish and promote' API</Change>	
-	</Changeset>
-	<Changeset  component="geonetwork.3-2-0" date="2016-11-01">
-		<Change>GeoNetwork 3.x compatibility</Change>					
-	</Changeset>
-	<Changeset  component="geonetwork.3-2-2" date="2017-04-21">
-		<Change>Configurable validation check</Change>					
-	</Changeset>
-</ReleaseNotes>

distro/descriptor.xml

@@ -1,30 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>servicearchive</id>
-	<formats>
-		<format>tar.gz</format>
-	</formats>
-	<baseDirectory>/</baseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>${distroDirectory}</directory>
-			<outputDirectory>/</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<includes>
-				<include>README</include>
-				<include>LICENSE</include>
-				<include>changelog.xml</include>
-			</includes>
-			<fileMode>755</fileMode>
-			<filtered>true</filtered>
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>target/${build.finalName}.${project.packaging}</source>
-			<outputDirectory>/${artifactId}</outputDirectory>
-		</file>
-	</files>
-</assembly>

distro/profile.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<ID />
-	<Type>Service</Type>
-	<Profile>
-		<Description>${description}</Description>
-		<Class>SpatialData</Class>
-		<Name>${artifactId}</Name>
-		<Version>1.0.0</Version>
-		<Packages>
-			<Software>
-				<Name>${artifactId}</Name>
-				<Version>${version}</Version>
-				<MavenCoordinates>
-					<groupId>${groupId}</groupId>
-					<artifactId>${artifactId}</artifactId>
-					<version>${version}</version>
-				</MavenCoordinates>
-				<Files>
-					<File>${build.finalName}.jar</File>
-				</Files>
-			</Software>
-		</Packages>
-	</Profile>
-</Resource>

pom.xml

@@ -8,14 +8,14 @@
 	</parent>
 	<groupId>org.gcube.spatial.data</groupId>
 	<artifactId>geonetwork</artifactId>
-	<version>3.4.0</version>
+	<version>3.4.5</version>
 	<name>geonetwork</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<geotools.version>8.0-M4</geotools.version>
 		<distroDirectory>distro</distroDirectory>
-		<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem/</gitBaseUrl>
+		<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
 	</properties>
 
 	<scm>
@@ -29,7 +29,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>1.4.0</version>
+				<version>2.0.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -65,7 +65,13 @@
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>uri-resolver-manager</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<version>[1.0.0, 2.0.0)</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- EXTERNAL -->
@@ -73,7 +79,7 @@
 		<dependency>
 			<groupId>it.geosolutions</groupId>
 			<artifactId>geonetwork-manager</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>1.4-SNAPSHOT</version>		
 		</dependency>
 
 		<dependency>
@@ -128,22 +134,16 @@
 
 
 
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.6.4</version>
-			<scope>test</scope>
-		</dependency>
 
 	</dependencies>
 	<repositories>
 		<repository>
-			<id>GeoSolutions</id>
-			<url>http://maven.research-infrastructures.eu/nexus/content/repositories/geo-solutions-snapshots/</url>
+			<id>geo-solutions-snapshots</id>
+			<url>https://nexus.d4science.org/nexus/content/repositories/geo-solutions-snapshots/</url>
 		</repository>
 		<repository>
-			<id>GeoToolkit</id>
-			<url>http://maven.research-infrastructures.eu:8081/nexus/content/repositories/geotoolkit/</url>
+			<id>geotoolkit</id>
+			<url>https://nexus.d4science.org/nexus/content/repositories/geotoolkit/</url>
 		</repository>
 	</repositories>
 

src/main/java/org/gcube/spatial/data/geonetwork/iso/GcubeISOMetadata.java

@@ -44,11 +44,13 @@ import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
 
 @Getter
 @Setter
 @RequiredArgsConstructor
 @Deprecated
+@Slf4j
 public class GcubeISOMetadata {
 
 	private EnvironmentConfiguration config;
@@ -167,16 +169,17 @@ public class GcubeISOMetadata {
 		KeywordSet keySet=new KeywordSet();
 		for(Entry<Thesaurus,HashSet<String> > entry : this.getDescriptiveKeywords().entrySet()) {
 			
+			
 			for(String s:entry.getValue()) {
 				keySet.addKeyword(s);
 			}
 		}
-		desc.addKeywordSet(keySet);
 		
+		desc.addKeywordSet(keySet);
 		
 		desc.addKeywordSet(new KeywordSet(
 				KeywordType.THEME,
-				Collections.singleton(getInspireTheme()),
+				Collections.singleton(getInspireTheme()==null?"Species distribution":getInspireTheme()),
 				org.gcube.spatial.data.geonetwork.iso.tpl.keys.Thesaurus.INSPIRE_THEMES));
 		
 		
@@ -202,9 +205,12 @@ public class GcubeISOMetadata {
 		for(TopicCategory cat:getTopicCategories())
 			desc.addTopicCategory(org.gcube.spatial.data.geonetwork.iso.tpl.codelists.TopicCategory.getById(cat.identifier()));
 		
-		desc.setDistributionInfo(distributionInfo);
-	
-		desc.setLineageStatement(this.getLineageStatement());
+		try {
+			desc.setDistributionInfo(distributionInfo);
+		}catch(NullPointerException e) {
+			log.warn("*******Distribution info is null!!!****** This should happen only in legacy approaches.");
+		}
+		desc.setLineageStatement(this.getLineageStatement()!=null?this.getLineageStatement():"");
 		desc.setConstraints(this.getContraints());
 		
 		return ISOMetadataByTemplate.createXML(desc);

src/main/java/org/gcube/spatial/data/geonetwork/iso/tpl/ISOMetadataByTemplate.java

@@ -5,12 +5,15 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.commons.io.IOUtils;
 
+import freemarker.cache.ClassTemplateLoader;
+import freemarker.cache.FileTemplateLoader;
+import freemarker.cache.MultiTemplateLoader;
+import freemarker.cache.TemplateLoader;
 import freemarker.core.ParseException;
 import freemarker.template.Configuration;
 import freemarker.template.MalformedTemplateNameException;
@@ -24,6 +27,9 @@ import lombok.extern.slf4j.Slf4j;
 public class ISOMetadataByTemplate {
 
 
+	private static List<TemplateLoader> loaders=new ArrayList<TemplateLoader>();
+	
+	
 	private static Configuration cfg;
 
 
@@ -37,12 +43,12 @@ public class ISOMetadataByTemplate {
 			// Specify the source where the template files come from. Here I set a
 			// plain directory for it, but non-file-system sources are possible too:
 
-		
+			
 			
 //			cfg.setDirectoryForTemplateLoading(
 //					new File(ISOMetadataByTemplate.class.getResource("xmlTemplates").toURI()));
 
-			cfg.setClassForTemplateLoading(ISOMetadataByTemplate.class, "/xmlTemplates");
+//			cfg.setClassForTemplateLoading(ISOMetadataByTemplate.class, "/xmlTemplates");
 			
 			// Set the preferred charset template files are stored in. UTF-8 is
 			// a good choice in most applications:
@@ -54,28 +60,58 @@ public class ISOMetadataByTemplate {
 
 			// Don't log exceptions inside FreeMarker that it will thrown at you anyway:
 			cfg.setLogTemplateExceptions(false);
+			
+			
+			loaders.add(new ClassTemplateLoader(ISOMetadataByTemplate.class, "/xmlTemplates"));
+			
+			
+//			ISOMetadataByTemplate.class.getClassLoader().get
+			reload();
+			
 		}catch(Exception e){
 			throw new RuntimeException(e);
 		}
 	}
 
-
+	private static final void reload() {
+		MultiTemplateLoader loader=new MultiTemplateLoader(loaders.toArray(new TemplateLoader[loaders.size()]));
+		cfg.setTemplateLoader(loader);
+	}
 
 	public static final File createXML(MetadataDescriptor desc) throws TemplateNotFoundException, MalformedTemplateNameException, ParseException, IOException, TemplateException{
+		return custom(desc,"BaseTemplate.ftlx");
+//		
+//		Writer out=null;
+//		try{
+//			Template temp = cfg.getTemplate("BaseTemplate.ftlx");
+//			File output=File.createTempFile("ISO_", ".xml");
+//			out=new OutputStreamWriter(new FileOutputStream(output));
+//			temp.process(desc, out);
+//			return output;		
+//		}finally{
+//			if(out!=null)
+//				IOUtils.closeQuietly(out);				
+//		}
+
+	}
+
+	public static final File custom(Object descriptor, String template) throws TemplateNotFoundException, MalformedTemplateNameException, ParseException, IOException, TemplateException {
 		Writer out=null;
 		try{
-			Template temp = cfg.getTemplate("BaseTemplate.ftlx");
+			Template temp = cfg.getTemplate(template);
 			File output=File.createTempFile("ISO_", ".xml");
 			out=new OutputStreamWriter(new FileOutputStream(output));
-			temp.process(desc, out);
+			temp.process(descriptor, out);
 			return output;		
 		}finally{
 			if(out!=null)
 				IOUtils.closeQuietly(out);				
 		}
-
+	}
+	
+	public static final void registerTemplateFolder(File baseDir) throws IOException {
+		loaders.add(new FileTemplateLoader(baseDir));
+		reload();
 	}
 
-
-
 }

src/main/resources/xmlTemplates/BaseTemplate.ftlx

@@ -204,7 +204,7 @@
 
 
 <!-- ONLINE REsources and protocols -->
-
+<#if distributionInfo??>
 	<gmd:distributionInfo>
 		<gmd:MD_Distribution>
 			<#list distributionInfo.protocols as protocol>
@@ -240,7 +240,7 @@
 			</gmd:transferOptions>
 		</gmd:MD_Distribution>
 	</gmd:distributionInfo>
-
+</#if>
 
 
 

src/test/java/org/gcube/spatial/data/geonetwork/test/GcubeIsoTest.java

@@ -1,8 +1,17 @@
 package org.gcube.spatial.data.geonetwork.test;
 
+import java.util.Date;
+
 import org.gcube.spatial.data.geonetwork.GeoNetwork;
 import org.gcube.spatial.data.geonetwork.GeoNetworkReader;
 import org.gcube.spatial.data.geonetwork.LoginLevel;
+import org.gcube.spatial.data.geonetwork.iso.GcubeISOMetadata;
+import org.gcube.spatial.data.geonetwork.iso.Thesaurus;
+import org.geotoolkit.metadata.iso.extent.DefaultExtent;
+import org.opengis.metadata.citation.PresentationForm;
+import org.opengis.metadata.identification.TopicCategory;
+import org.opengis.metadata.spatial.GeometricObjectType;
+import org.opengis.metadata.spatial.TopologyLevel;
 
 public class GcubeIsoTest {
 
@@ -11,11 +20,51 @@ public class GcubeIsoTest {
 	 * @throws Exception 
 	 */
 	public static void main(String[] args) throws Exception {
-		TokenSetter.set("/gcube/devsec");
+		TokenSetter.set("/gcube/devsec/devVRE");
 		GeoNetworkReader reader=GeoNetwork.get();
 		reader.login(LoginLevel.SCOPE);
-		System.out.println(reader.getById("0815e357-ebd7-4c02-8dc8-f945eceb870c"));
+//		System.out.println(reader.getById("0815e357-ebd7-4c02-8dc8-f945eceb870c"));
+		
+		System.out.println(fillMeta(0.5, "myself.self", "dumb Title", "stupid table", "BS", "no one", "keywordX").getMetadataFile());
 		
 	}
 
+	
+	// From ecological engine
+	private static GcubeISOMetadata fillMeta(double resolution, String username, String title, String tableName, String purpose, String credits, String keyword) throws Exception {
+
+		/*
+		if (scope == null)
+			scope = ScopeProvider.instance.get();
+		 */
+		
+//		ScopeProvider.instance.set(scope);
+
+		GcubeISOMetadata meta = new GcubeISOMetadata();
+		meta.setAbstractField("This metadata has been automatically generated from the Statistical Manager on the basis of a distribution of points and according the resolution of " + resolution + " degrees.");
+		meta.setCreationDate(new Date(System.currentTimeMillis()));
+		meta.setExtent((DefaultExtent) DefaultExtent.WORLD);
+		meta.setGeometricObjectType(GeometricObjectType.SURFACE);
+		meta.setPresentationForm(PresentationForm.MAP_DIGITAL);
+		meta.setPurpose(purpose);
+		meta.setResolution(resolution);
+		if (title == null || title.length() == 0)
+			meta.setTitle("Distribution");
+		else
+			meta.setTitle(title);
+
+		meta.setTopologyLevel(TopologyLevel.GEOMETRY_ONLY);
+		meta.setUser(username);
+
+		meta.addGraphicOverview("http://www.d4science.org/D4ScienceOrg-Social-theme/images/custom/D4ScienceInfrastructure.png");
+		meta.addCredits(credits);
+		Thesaurus generalThesaurus = meta.getConfig().getThesauri().get("General");
+		meta.addKeyword(title, generalThesaurus);
+		meta.addKeyword(username, generalThesaurus);
+		meta.addKeyword("DataMiner", generalThesaurus);
+		meta.addKeyword(keyword, generalThesaurus);
+		meta.addKeyword(tableName, generalThesaurus);
+		meta.addTopicCategory(TopicCategory.BIOTA);
+		return meta;
+	}
 }

src/test/java/org/gcube/spatial/data/geonetwork/test/TestScavo.java

@@ -0,0 +1,188 @@
+package org.gcube.spatial.data.geonetwork.test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.GregorianCalendar;
+import java.util.HashSet;
+import java.util.UUID;
+
+import org.gcube.portlets.user.uriresolvermanager.exception.IllegalArgumentException;
+import org.gcube.portlets.user.uriresolvermanager.exception.UriResolverMapException;
+import org.gcube.spatial.data.geonetwork.GeoNetwork;
+import org.gcube.spatial.data.geonetwork.GeoNetworkPublisher;
+import org.gcube.spatial.data.geonetwork.LoginLevel;
+import org.gcube.spatial.data.geonetwork.iso.tpl.ISOMetadataByTemplate;
+import org.gcube.spatial.data.geonetwork.iso.tpl.MetadataDescriptor;
+import org.gcube.spatial.data.geonetwork.iso.tpl.codelists.GeometricObjectType;
+import org.gcube.spatial.data.geonetwork.iso.tpl.codelists.KeywordType;
+import org.gcube.spatial.data.geonetwork.iso.tpl.codelists.ResponsiblePartyRole;
+import org.gcube.spatial.data.geonetwork.iso.tpl.codelists.RestrictionCode;
+import org.gcube.spatial.data.geonetwork.iso.tpl.codelists.TopicCategory;
+import org.gcube.spatial.data.geonetwork.iso.tpl.codelists.TopologyLevel;
+import org.gcube.spatial.data.geonetwork.iso.tpl.constraints.LegalConstraints;
+import org.gcube.spatial.data.geonetwork.iso.tpl.constraints.ResourceConstraints;
+import org.gcube.spatial.data.geonetwork.iso.tpl.distribution.DistributionInfo;
+import org.gcube.spatial.data.geonetwork.iso.tpl.distribution.DistributionInfo.DistributionInfoType;
+import org.gcube.spatial.data.geonetwork.iso.tpl.extent.BoundingBox;
+import org.gcube.spatial.data.geonetwork.iso.tpl.keys.KeywordSet;
+import org.gcube.spatial.data.geonetwork.iso.tpl.keys.Thesaurus;
+import org.gcube.spatial.data.geonetwork.iso.tpl.parties.Contact;
+import org.gcube.spatial.data.geonetwork.iso.tpl.parties.ResponsibleParty;
+import org.gcube.spatial.data.geonetwork.iso.tpl.spatial.VectorRepresentation;
+import org.gcube.spatial.data.geonetwork.model.faults.MissingConfigurationException;
+import org.gcube.spatial.data.geonetwork.model.faults.MissingServiceEndpointException;
+
+import freemarker.core.ParseException;
+import freemarker.template.MalformedTemplateNameException;
+import freemarker.template.TemplateException;
+import freemarker.template.TemplateNotFoundException;
+import it.geosolutions.geonetwork.exception.GNLibException;
+import it.geosolutions.geonetwork.exception.GNServerException;
+import it.geosolutions.geonetwork.util.GNInsertConfiguration;
+
+public class TestScavo {
+
+	public static void main(String[] args) throws TemplateNotFoundException, MalformedTemplateNameException, ParseException, UriResolverMapException, IllegalArgumentException, IOException, TemplateException, Exception, GNLibException, GNServerException, MissingServiceEndpointException {
+		
+		//Login
+		TokenSetter.set("/d4science.research-infrastructures.eu/D4OS/GeoNA-Prototype");
+		GeoNetworkPublisher pub=GeoNetwork.get();
+		pub.login(LoginLevel.DEFAULT);
+		//obtainMeta();
+		//Push
+		GNInsertConfiguration conf=pub.getCurrentUserConfiguration("dataset", "_none_");
+		conf.setValidate(false);
+		System.out.println(pub.insertMetadata(new File("/Users/FabioIsti/Documents/Progetto_Faenza.xml")));
+		
+	}
+	
+	public static void obtainMeta() throws UriResolverMapException, IllegalArgumentException, TemplateNotFoundException, MalformedTemplateNameException, ParseException, IOException, TemplateException {
+		MetadataDescriptor desc=new MetadataDescriptor();
+		
+		// Nome indicativo del progetto di scavo
+		
+		String projectName="Progetto Faventia";
+		
+		
+		// Introduction :  descrizione del progetto e dei suoi obiettivi a brief summary (max. 200-300 words) 
+		// of the main aims and objectives of the project (or alternative process) from which the data collection arose
+		String introduction="Il progetto Faventia si propone di studiare, mappare e analizzare le evidenze archeologiche presenti nel territorio basso faentino al fine di ricostruire gli assetti del popolamento antico e valorizzare il patrimonio storico e archeologico locale, incrementandone la conoscenza sia a livello qualitativo che quantitativo.";
+		
+		desc.setPurpose(introduction);
+		
+		
+		//Overview : descrizione dei contenuti del progettoa summary description (max. 200-600 words) 
+		//of the content of the dataset.
+		String overview="Relazione di fine ricognizione e relativo abstract; selezione di immagini rappresentative; posizionamento topografico dell’area indagata; elenco e posizionamento delle UT; elenco e posizionamento dei siti";
+		
+		desc.setAbstractField(overview);
+		
+		// Preview Images
+
+		//TODO
+		
+		
+		
+		
+		// Related Resources
+		
+		//TODO
+		
+		
+		// Project dates
+			// Field fork start / end
+		//TODO
+		
+		
+		//Project Funders : Istituti che finanziano il progetto
+		//TODO
+		
+		// License
+		// Copyright Holder : name of the copyright holder for the dataset. It is possible that the collection will 
+		// have more than one copyright holder, please list them all. 
+		// If the collection was created during your work as an employee, 
+		// the copyright holder will normally be your employer under your contract of employment.
+		
+		
+		//License Holder : the licence holder is the individual, organisation, or the person who will sign a deposit 
+		// licence on behalf of an organisation. This is usually the same as the main copyright holder. 
+		// Include a valid email address as the e-licence will be sent to this address.
+		
+		
+		
+		// Creator: the individuals, organisations or individuals working on behalf of organisations 
+		// that the collection should be attributed to.
+
+		
+		//EXCEL "Authore": Direttore scientifico: prof. Andrea Augenti (andrea.augenti@unibo.it - Università di Bologna)   
+		// Coordinamento scientifico: dott. Marco Cavalazzi (marco.cavalazzi3@unibo.it - Università di Bologna) 
+		// Responsabili sul campo: dott. Michele Abballe (michele.abballe@ugent.be - Ghent University, BE); 
+		// dott.ssa Michela De Felicibus (michela.defelicibus2@unibo.it - Università di Bologna)
+		
+		desc.setResponsibleParties(Arrays.asList(
+				new ResponsibleParty("Prof. Andrea Augenti","Università di Bologna",ResponsiblePartyRole.POINT_OF_CONTACT,new Contact("andrea.augenti@unibo.it","")),
+				new ResponsibleParty("Dott. Marco Cavalazzi","Università di Bologna",ResponsiblePartyRole.AUTHOR,new Contact("marco.cavalazzi3@unibo.it","")),
+				new ResponsibleParty("Dott. Michele Abballe","Ghent University. BE",ResponsiblePartyRole.AUTHOR,new Contact("michele.abballe@ugent.be","")),
+				new ResponsibleParty("Dott.ssa Michela De Felicibus","Università di Bologna",ResponsiblePartyRole.AUTHOR,new Contact("michela.defelicibus@unibo.it","")),
+				new ResponsibleParty("Geoportale Nazionale per l'Archeologia","MiBAC",ResponsiblePartyRole.CUSTODIAN,new Contact("","")),
+				new ResponsibleParty("","Università di Bologna",ResponsiblePartyRole.PUBLISHER,new Contact("","")),
+				new ResponsibleParty("GeoNA-Proto","D4Science",ResponsiblePartyRole.RESOURCE_PROVIDER,new Contact("fabio.sinibaldi@isti.cnr.it","www.d4science.org"))
+				));
+		
+		
+		// Keywords:
+		// Free Keyword :
+		//	Period Keyword : (i.e. Mesolitico, Neolitico, Età del Bronzo)
+
+		desc.addKeywordSet(new KeywordSet(new HashSet<String>(Arrays.asList(new String[] {
+				"Età del Bronzo", "Età del Ferro", "Età Romana", 
+				"Età Tardoantica", "Alto Medioevo", "Basso Medioevo"
+		}))));
+		
+		
+		// Attachments : 
+//		*Relazione di scavo (pdf)
+//		 Title (generated : <Project Name>+ “relazione di scavo”)
+//		 Abstract
+		
+		desc.setGeoServerDistributionInfo("http://geoserver.d4science.org/geoserver", "geona-proto","posizionamento_area", "speciesProb", "EPSG:4326",BoundingBox.WORLD_EXTENT);
+			
+		
+//		*Immagini Rappresentative (TIFF / JPEG)
+//		 Title
+//		 Caption
+		
+		
+//		*Posizionamento dell’area (GIS)
+//		 Title (generated : <Project Name>+ “posizionamento dell’area”)
+//		 Description
+//		 Data Quality Assessment
+//		 Method of Data Capture
+//		*Pianta di fine scavo (GIS)
+//		 Title (generated : <Project Name>+ “pianta di fine scavo”)
+//		 Description
+//		 Data Quality Assessment : Here you can provide an assessment or statement about the quality and accuracy of the data used and/or created within the GIS (i.e. “None” or “High risk of spatial dispacement”)
+//		 Method of Data Capture
+//		*Diagramma Stratigrafico (pdf)
+//		 Title (generated : <Project Name>+ “diagramma stratigrafico”)
+//		 Abstract
+//		*Elenco Materiali (xls)
+//		 Title (generated : <Project Name>+ “elenco materiali”)
+//		 Abstract
+//		*Schede di Catalogo reperti integri o più rappresentativi (xls)
+//		 Title (generated : <Project Name>+ “Schede catalogo reperti integri o più rappresentativi”)
+//		*Schede sepoltura etc. (pdf)
+//		 Title
+//		 Abstract
+
+		
+		
+		
+		
+		
+		System.out.println("FILE :"+ISOMetadataByTemplate.createXML(desc).getAbsolutePath());
+		
+	}
+}

src/test/java/org/gcube/spatial/data/geonetwork/test/TrueMarbleMeta.java

@@ -34,7 +34,7 @@ public class TrueMarbleMeta {
 	 * @throws Exception 
 	 */
 	public static void main(String[] args) throws Exception {
-		TokenSetter.set("/gcube/devNext");
+		TokenSetter.set("/gcube/devsec/devVRE");
 //		TokenSetter.set("/pred4s/preprod/preVRE");		
 //		TokenSetter.set("/d4science.research-infrastructures.eu");
 		
@@ -124,7 +124,7 @@ public class TrueMarbleMeta {
 		desc.setUUIDIdentifier(UUID.randomUUID().toString());
 		desc.getExtent().addGeographicExtent(BoundingBox.WORLD_EXTENT);
 		
-		desc.setGeoServerDistributionInfo("http://geoserver.d4science.org/geoserver", "ws","wmpa", "speciesProb", "EPSG:4326",BoundingBox.WORLD_EXTENT);
+//		desc.setGeoServerDistributionInfo("http://geoserver.d4science.org/geoserver", "ws","wmpa", "speciesProb", "EPSG:4326",BoundingBox.WORLD_EXTENT);
 		
 		
 		desc.setSpatialResolution(0.5d);
@@ -140,10 +140,10 @@ public class TrueMarbleMeta {
 		System.out.println("Going to Publish ----->> "+metaFile.getAbsolutePath());
 		
 		GeoNetworkPublisher publisher=TestConfiguration.getClient();
-		publisher.login(LoginLevel.SCOPE);
+		publisher.login(LoginLevel.PRIVATE);
 		GNInsertConfiguration config=publisher.getCurrentUserConfiguration("dataset", "_none_");
 		
-		config.setValidate(true);
+		config.setValidate(false);
 		System.out.println("Settings : "+publisher.getConfiguration().getScopeConfiguration());
 		System.out.println("Publishing Settings : validate = "+config.getValidate());
 		long id=publisher.insertMetadata(config, metaFile);