From bf20df44ded39c3d74a64d089e20cce98cf03ae9 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 19 May 2017 09:19:46 +0000
Subject: [PATCH] [Task #8571] Added "propagateUp" property to grouping field

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/gcubedatacatalogue-metadata-discovery@148881 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 Gdcmetadataprofilev3.xsd                      |  6 ++-
 NamespacesCatalogueCategories.xml             |  8 ++--
 NamespacesCatalogueCategories.xsd             | 43 +++++++++++--------
 distro/changelog.xml                          |  2 +
 pom.xml                                       |  2 +-
 .../bean/jaxb/MetadataGrouping.java           | 25 +++++++++++
 6 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/Gdcmetadataprofilev3.xsd b/Gdcmetadataprofilev3.xsd
index eaa179e..dc8e9f2 100644
--- a/Gdcmetadataprofilev3.xsd
+++ b/Gdcmetadataprofilev3.xsd
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema attributeFormDefault="unqualified"
 	elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+	<xs:include schemaLocation="NamespacesCatalogueCategories.xsd"/>
 	<xs:element name="metadataformat">
 		<xs:complexType>
 			<xs:sequence>
@@ -51,7 +52,7 @@
 								minOccurs="0" maxOccurs="1">
 							</xs:element>
 						</xs:sequence>
-						<xs:attribute name="categoryref" use="optional" type="xs:IDREF" />
+						<xs:attribute name="categoryref" use="optional" type="xs:string" />
 					</xs:complexType>
 				</xs:element>
 			</xs:sequence>
@@ -78,6 +79,7 @@
 		<xs:simpleContent id="TaggingGroupingValue">
 			<xs:extension base="TaggingGroupingValue">
 				<xs:attribute type="xs:boolean" name="create" />
+				<xs:attribute type="xs:boolean" name="propagateUp" />
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
@@ -86,4 +88,4 @@
 			<xs:minLength value="1" />
 		</xs:restriction>
 	</xs:simpleType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/NamespacesCatalogueCategories.xml b/NamespacesCatalogueCategories.xml
index ef47f33..3e0472f 100644
--- a/NamespacesCatalogueCategories.xml
+++ b/NamespacesCatalogueCategories.xml
@@ -8,12 +8,12 @@
 	</namespace>
 	<namespace id="developer_information">
 		<name>Developer</name>
-		<title>Developer Information</title>
+		<title>Developer Title</title>
 		<description>This section is about Developer(s)</description>
 	</namespace>
 	<namespace id="extra_information">
-		<name>Extra Information</name>
-		<title>Extras</title>
+		<name>Extra</name>
+		<title>Extra Title</title>
 		<description>This section is about Extra(s)</description>
 	</namespace>
-</namespaces>
+</namespaces>
\ No newline at end of file
diff --git a/NamespacesCatalogueCategories.xsd b/NamespacesCatalogueCategories.xsd
index 354b315..d6db0b8 100644
--- a/NamespacesCatalogueCategories.xsd
+++ b/NamespacesCatalogueCategories.xsd
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:element name="namespaces">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="namespace" minOccurs="1" maxOccurs="unbounded">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element type="xs:string" name="name" minOccurs="1" maxOccurs="1"/>
-              <xs:element type="xs:string" name="title" minOccurs="1" maxOccurs="1"/>
-              <xs:element type="xs:string" name="description" minOccurs="0" maxOccurs="1"/>
-            </xs:sequence>
-            <xs:attribute type="xs:ID" name="id" use="required"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
+<xs:schema attributeFormDefault="unqualified"
+	elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:category="http://www.w3.org/TR/html4/">
+	<xs:element name="namespaces">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="namespace" minOccurs="1" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element type="xs:string" name="name" minOccurs="1"
+								maxOccurs="1" />
+							<xs:element type="xs:string" name="title" minOccurs="1"
+								maxOccurs="1" />
+							<xs:element type="xs:string" name="description"
+								minOccurs="0" maxOccurs="1" />
+						</xs:sequence>
+						<xs:attribute type="xs:string" name="id" use="required" />
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+		<xs:unique name="unique-namespace-id">
+			<xs:selector xpath="namespace" />
+			<xs:field xpath="@id" />
+		</xs:unique>
+	</xs:element>
 </xs:schema>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index c1fb8a5..9755f85 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -5,6 +5,8 @@
 		<Change>[Task #8267] Medatada Discovery Library: definition of
 			namespaces and metadata fields must be separated
 		</Change>
+		<Change>[Task #8571] Added "propagateUp" property to grouping field
+		</Change>
 	</Changeset>
 	<Changeset
 		component="org.gcube.data-catalogue.gcubedatacatalogue-metadata-discovery.3-0-0"
diff --git a/pom.xml b/pom.xml
index 4ecf14a..ab93c30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<!-- GWT needs at least java 1.6 -->
 		<maven.compiler.source>1.7</maven.compiler.source>
-		<maven.compiler.target>1.7</maven.compiler.target>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 
 	<dependencies>
diff --git a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataGrouping.java b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataGrouping.java
index 82c0719..c39f0bb 100644
--- a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataGrouping.java
+++ b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataGrouping.java
@@ -33,6 +33,9 @@ public class MetadataGrouping implements Serializable{
 	@XmlAttribute
 	private Boolean create = false;
 
+	@XmlAttribute
+	private Boolean propagateUp = false;
+
     @XmlJavaTypeAdapter(TaggingGroupingAdapter.class)
     @XmlValue
 	private TaggingGroupingValue groupingValue = null;
@@ -100,6 +103,26 @@ public class MetadataGrouping implements Serializable{
 	}
 
 
+
+	/**
+	 * @return the propagateUp
+	 */
+	public Boolean getPropagateUp() {
+
+		return propagateUp;
+	}
+
+
+
+	/**
+	 * @param propagateUp the propagateUp to set
+	 */
+	public void setPropagateUp(Boolean propagateUp) {
+
+		this.propagateUp = propagateUp;
+	}
+
+
 	/* (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */
@@ -109,6 +132,8 @@ public class MetadataGrouping implements Serializable{
 		StringBuilder builder = new StringBuilder();
 		builder.append("MetadataGrouping [create=");
 		builder.append(create);
+		builder.append(", propagateUp=");
+		builder.append(propagateUp);
 		builder.append(", groupingValue=");
 		builder.append(groupingValue);
 		builder.append("]");