[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
This commit is contained in:
parent
326da1b056
commit
bf20df44de
|
@ -1,6 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<xs:schema attributeFormDefault="unqualified"
|
<xs:schema attributeFormDefault="unqualified"
|
||||||
elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
||||||
|
<xs:include schemaLocation="NamespacesCatalogueCategories.xsd"/>
|
||||||
<xs:element name="metadataformat">
|
<xs:element name="metadataformat">
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:sequence>
|
<xs:sequence>
|
||||||
|
@ -51,7 +52,7 @@
|
||||||
minOccurs="0" maxOccurs="1">
|
minOccurs="0" maxOccurs="1">
|
||||||
</xs:element>
|
</xs:element>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
<xs:attribute name="categoryref" use="optional" type="xs:IDREF" />
|
<xs:attribute name="categoryref" use="optional" type="xs:string" />
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
|
@ -78,6 +79,7 @@
|
||||||
<xs:simpleContent id="TaggingGroupingValue">
|
<xs:simpleContent id="TaggingGroupingValue">
|
||||||
<xs:extension base="TaggingGroupingValue">
|
<xs:extension base="TaggingGroupingValue">
|
||||||
<xs:attribute type="xs:boolean" name="create" />
|
<xs:attribute type="xs:boolean" name="create" />
|
||||||
|
<xs:attribute type="xs:boolean" name="propagateUp" />
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:simpleContent>
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
@ -86,4 +88,4 @@
|
||||||
<xs:minLength value="1" />
|
<xs:minLength value="1" />
|
||||||
</xs:restriction>
|
</xs:restriction>
|
||||||
</xs:simpleType>
|
</xs:simpleType>
|
||||||
</xs:schema>
|
</xs:schema>
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
</namespace>
|
</namespace>
|
||||||
<namespace id="developer_information">
|
<namespace id="developer_information">
|
||||||
<name>Developer</name>
|
<name>Developer</name>
|
||||||
<title>Developer Information</title>
|
<title>Developer Title</title>
|
||||||
<description>This section is about Developer(s)</description>
|
<description>This section is about Developer(s)</description>
|
||||||
</namespace>
|
</namespace>
|
||||||
<namespace id="extra_information">
|
<namespace id="extra_information">
|
||||||
<name>Extra Information</name>
|
<name>Extra</name>
|
||||||
<title>Extras</title>
|
<title>Extra Title</title>
|
||||||
<description>This section is about Extra(s)</description>
|
<description>This section is about Extra(s)</description>
|
||||||
</namespace>
|
</namespace>
|
||||||
</namespaces>
|
</namespaces>
|
|
@ -1,19 +1,28 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
<xs:schema attributeFormDefault="unqualified"
|
||||||
<xs:element name="namespaces">
|
elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
||||||
<xs:complexType>
|
xmlns:category="http://www.w3.org/TR/html4/">
|
||||||
<xs:sequence>
|
<xs:element name="namespaces">
|
||||||
<xs:element name="namespace" minOccurs="1" maxOccurs="unbounded">
|
<xs:complexType>
|
||||||
<xs:complexType>
|
<xs:sequence>
|
||||||
<xs:sequence>
|
<xs:element name="namespace" minOccurs="1" maxOccurs="unbounded">
|
||||||
<xs:element type="xs:string" name="name" minOccurs="1" maxOccurs="1"/>
|
<xs:complexType>
|
||||||
<xs:element type="xs:string" name="title" minOccurs="1" maxOccurs="1"/>
|
<xs:sequence>
|
||||||
<xs:element type="xs:string" name="description" minOccurs="0" maxOccurs="1"/>
|
<xs:element type="xs:string" name="name" minOccurs="1"
|
||||||
</xs:sequence>
|
maxOccurs="1" />
|
||||||
<xs:attribute type="xs:ID" name="id" use="required"/>
|
<xs:element type="xs:string" name="title" minOccurs="1"
|
||||||
</xs:complexType>
|
maxOccurs="1" />
|
||||||
</xs:element>
|
<xs:element type="xs:string" name="description"
|
||||||
</xs:sequence>
|
minOccurs="0" maxOccurs="1" />
|
||||||
</xs:complexType>
|
</xs:sequence>
|
||||||
</xs:element>
|
<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>
|
</xs:schema>
|
||||||
|
|
|
@ -5,6 +5,8 @@
|
||||||
<Change>[Task #8267] Medatada Discovery Library: definition of
|
<Change>[Task #8267] Medatada Discovery Library: definition of
|
||||||
namespaces and metadata fields must be separated
|
namespaces and metadata fields must be separated
|
||||||
</Change>
|
</Change>
|
||||||
|
<Change>[Task #8571] Added "propagateUp" property to grouping field
|
||||||
|
</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
<Changeset
|
<Changeset
|
||||||
component="org.gcube.data-catalogue.gcubedatacatalogue-metadata-discovery.3-0-0"
|
component="org.gcube.data-catalogue.gcubedatacatalogue-metadata-discovery.3-0-0"
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -53,7 +53,7 @@
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
<!-- GWT needs at least java 1.6 -->
|
<!-- GWT needs at least java 1.6 -->
|
||||||
<maven.compiler.source>1.7</maven.compiler.source>
|
<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>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
|
@ -33,6 +33,9 @@ public class MetadataGrouping implements Serializable{
|
||||||
@XmlAttribute
|
@XmlAttribute
|
||||||
private Boolean create = false;
|
private Boolean create = false;
|
||||||
|
|
||||||
|
@XmlAttribute
|
||||||
|
private Boolean propagateUp = false;
|
||||||
|
|
||||||
@XmlJavaTypeAdapter(TaggingGroupingAdapter.class)
|
@XmlJavaTypeAdapter(TaggingGroupingAdapter.class)
|
||||||
@XmlValue
|
@XmlValue
|
||||||
private TaggingGroupingValue groupingValue = null;
|
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)
|
/* (non-Javadoc)
|
||||||
* @see java.lang.Object#toString()
|
* @see java.lang.Object#toString()
|
||||||
*/
|
*/
|
||||||
|
@ -109,6 +132,8 @@ public class MetadataGrouping implements Serializable{
|
||||||
StringBuilder builder = new StringBuilder();
|
StringBuilder builder = new StringBuilder();
|
||||||
builder.append("MetadataGrouping [create=");
|
builder.append("MetadataGrouping [create=");
|
||||||
builder.append(create);
|
builder.append(create);
|
||||||
|
builder.append(", propagateUp=");
|
||||||
|
builder.append(propagateUp);
|
||||||
builder.append(", groupingValue=");
|
builder.append(", groupingValue=");
|
||||||
builder.append(groupingValue);
|
builder.append(groupingValue);
|
||||||
builder.append("]");
|
builder.append("]");
|
||||||
|
|
Loading…
Reference in New Issue