diff --git a/.aspell-api-exceptions.pws b/.aspell-api-exceptions.pws
index 1e4b944c98c9cbc5acb14f14d02406353d1acf71..2a0061bb0d5677efa9bb2af99613b489bf5d316c 100644
--- a/.aspell-api-exceptions.pws
+++ b/.aspell-api-exceptions.pws
@@ -614,6 +614,7 @@ speciesIdentity
sra
stap
steradian
+strictCutoff
structuralState
submapConnections
substantia
diff --git a/.gitignore b/.gitignore
index 30cc188312feadc9497688f594a6c3ac84abef85..25070f5bbf65f72a10d647323e65a31d8f51ee3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ minerva.txt
#IntelliJ files
.idea/
+.idea-back/
.run/
*.iml
diff --git a/CHANGELOG b/CHANGELOG
index dfe7fe1197d2a27ffbb8027074e6c6abb785212a..493a5fbd27a4164acabd1f07d47e3f9178a7a1d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,26 @@
+minerva (17.1.0) unstable; urgency=medium
+ * Improvement: downloadModel API call contains strictCutoff parameter
+ (default=true) to allow selecting reaction that cross polygon (#1769)
+ * Improvement: project can have a license (#1726)
+ * Small improvement: when removing user allow to properly handle user projects
+ (#1721)
+ * Small improvement: allow to upload zip file where root folder is zipped
+ (#1685)
+ * Small improvement: caching of drug, MiRNA and chemical is done in background
+ if cache is not selected (#1957)
+ * Small improvement: size of the operator reduced to reduce overlapping
+ (#1531, #1671)
+ * Small improvement: only one background checkbox can be selected in a
+ project (#1678)
+ * Bug fix: export to CellDesigner was missing type attribute for gene, rna,
+ antisense rna (#2039)
+ * Bug fix: long inchi annotations were rejected (#2068)
+ * Bug fix: warning on uploading zip without map was missing (#1685)
+
+ -- Piotr Gawron <piotr.gawron@uni.lu> Fri, 23 Aug 2024 11:00:00 +0200
+
minerva (17.0.6) stable; urgency=medium
- * Bug fix: SBGN-ML converter - ignore nwt:extraInfo tags when parsing
+ * Bug fix: SBGN-ML converter - ignore nwt:extraInfo tags when parsing
sbgn files created by nwt (#2064)
-- Piotr Gawron <piotr.gawron@uni.lu> Thu, 18 Jul 2024 10:00:00 +0200
@@ -787,7 +808,7 @@ minerva (15.1.2) stable; urgency=medium
minerva (15.1.1) stable; urgency=medium
* Bug fix: export to CD maps with species containing ":" or "." in species id
- generated files that could not be opened in CellDesigner (#1363)
+ generated files that could not be opened in CellDesigner (#1363)
* Bug fix: zoom level change was not reflected in the url when submap was
opened (#1338)
* Bug fix: API call returning list of overlays returned for non existing
@@ -1253,7 +1274,7 @@ minerva (14.0.3) stable; urgency=medium
(#963)
* Bug fix: filename case in uploaded zip files is preserved (#964)
* Bug fix: +/- buttons were misaligned in genome browser (#942)
- * Bug fix: color of links in the left panel was unintentionally changed
+ * Bug fix: color of links in the left panel was unintentionally changed
(#990)
* Bug fix: minerva logo in left panel is centred properly
* Bug fix: width of search button icon was too big
@@ -1321,7 +1342,7 @@ minerva (14.0.0) stable; urgency=medium
* Bug fix: exported SBML passes online validation (#831)
* Bug fix: allow user to remove own comments (#931)
* Bug fix: validation of project name length is provided (#950)
- * Bug fix: list of "Copy from" elements in "Select valid annotations" dialog
+ * Bug fix: list of "Copy from" elements in "Select valid annotations" dialog
is shortened to used bio entity types (#911)
* Bug fix: version of the project is limited to 20 characters (#951)
* Bug fix: export to CD could misalign reaction lines that were imported from
@@ -1772,7 +1793,7 @@ minerva (12.1.1) stable; urgency=medium
minerva (12.1.0) stable; urgency=medium
* Small improvement: default privilege value for 'Custom overlays' added
* Small improvement: explicit logging of successful and unsuccessful logins
- * Small improvement: clicking on search result icon (on the map) change tab to
+ * Small improvement: clicking on search result icon (on the map) change tab to
the corresponding search results
* Small improvement: option to remove additional overlays generated by custom
semantic zoom
@@ -1959,7 +1980,7 @@ minerva (11.1.0) stable; urgency=high
* Terms of Use added
-- Piotr Gawron <piotr.gawron@uni.lu> Tue, 05 Jun 2018 9:00:00 +0200
-
+
minerva (11.0.10) stable; urgency=medium
* Bug fix: link from overview image to search result was broken
@@ -2001,7 +2022,7 @@ minerva (11.0.6) stable; urgency=medium
* Bug fix: fix a bug when entering invalid MiRNA id
-- Piotr Gawron <piotr.gawron@uni.lu> Thu, 14 Dec 2017 16:00:00 +0200
-
+
minerva (11.0.5) stable; urgency=medium
* Bug fix: fix on connection to DrugBank database
* Bug fix: posttranslational modification data was sometimes unavailable
diff --git a/CellDesigner-plugin/pom.xml b/CellDesigner-plugin/pom.xml
index 54b3e0ca01796ed68441e21827c0862c9759721c..8f07c889ecf60659b46f4e50cd5a8f1767dbb438 100644
--- a/CellDesigner-plugin/pom.xml
+++ b/CellDesigner-plugin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>CellDesigner-plugin</artifactId>
<!-- dependency from the MapViewer model -->
@@ -50,19 +50,19 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>commons</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
diff --git a/annotation/pom.xml b/annotation/pom.xml
index 955a8ed89972008bfe24cb2ccf35ce2108ad50bd..a4cc3d91cbc366443584e87f85500f7bdfd5e297 100644
--- a/annotation/pom.xml
+++ b/annotation/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>annotation</artifactId>
<name>Annotation module</name>
@@ -19,7 +19,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- dependency from the MapViewer dao -->
@@ -27,7 +27,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>persist</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- dependency from the MapViewer cell designer parser (we need access
@@ -35,13 +35,13 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- Log4J2 -->
diff --git a/commons/pom.xml b/commons/pom.xml
index c623ceb28705f02bb60d7c15ae84d9452874336a..ddef5cdbb7a574bf4820c9a96fc1f7d706ad8b84 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>commons</artifactId>
<name>Mapviewer commons</name>
diff --git a/converter-CellDesigner/pom.xml b/converter-CellDesigner/pom.xml
index 45ee94d323b10da84857e2b50586e00e49e04c7b..8f6e65f0f971038e6ca25e0c614142b7f80170b3 100644
--- a/converter-CellDesigner/pom.xml
+++ b/converter-CellDesigner/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>converter-CellDesigner</artifactId>
<name>CellDesigner converter</name>
@@ -17,13 +17,13 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- Log4J2 -->
diff --git a/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/AntisenseRnaXmlParser.java b/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/AntisenseRnaXmlParser.java
index 5f23ed03c4c4c027f7bfcedeb584b38a7f42bbe8..a61eae240abd4eb6d84d9bc9de2d8535c899ee74 100644
--- a/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/AntisenseRnaXmlParser.java
+++ b/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/AntisenseRnaXmlParser.java
@@ -1,8 +1,5 @@
package lcsb.mapviewer.converter.model.celldesigner.species;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import lcsb.mapviewer.common.Pair;
import lcsb.mapviewer.common.XmlParser;
import lcsb.mapviewer.common.exception.InvalidArgumentException;
@@ -14,12 +11,13 @@ import lcsb.mapviewer.converter.model.celldesigner.structure.fields.CellDesigner
import lcsb.mapviewer.converter.model.celldesigner.structure.fields.ModificationType;
import lcsb.mapviewer.model.map.species.AntisenseRna;
import lcsb.mapviewer.model.map.species.field.ModificationResidue;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* Class that performs parsing of the CellDesigner xml for AntisenseRna object.
- *
+ *
* @author Piotr Gawron
- *
*/
public class AntisenseRnaXmlParser extends AbstractElementXmlParser<CellDesignerAntisenseRna, AntisenseRna> {
@@ -27,16 +25,15 @@ public class AntisenseRnaXmlParser extends AbstractElementXmlParser<CellDesigner
* List of {@link CellDesignerElement celldesigner elements} obtained during
* parsing process.
*/
- private CellDesignerElementCollection elements;
+ private final CellDesignerElementCollection elements;
- private ModificationResidueXmlParser modificationResidueXmlParser;
+ private final ModificationResidueXmlParser modificationResidueXmlParser;
/**
* Default constructor.
- *
- * @param elements
- * list of {@link CellDesignerElement celldesigner elements} obtained
- * during parsing process
+ *
+ * @param elements list of {@link CellDesignerElement celldesigner elements} obtained
+ * during parsing process
*/
public AntisenseRnaXmlParser(final CellDesignerElementCollection elements) {
this.elements = elements;
@@ -46,19 +43,19 @@ public class AntisenseRnaXmlParser extends AbstractElementXmlParser<CellDesigner
@Override
public Pair<String, CellDesignerAntisenseRna> parseXmlElement(final Node antisenseRnaNode)
throws InvalidXmlSchemaException {
- CellDesignerAntisenseRna antisenseRna = new CellDesignerAntisenseRna();
- String identifier = XmlParser.getNodeAttr("id", antisenseRnaNode);
+ final CellDesignerAntisenseRna antisenseRna = new CellDesignerAntisenseRna();
+ final String identifier = XmlParser.getNodeAttr("id", antisenseRnaNode);
antisenseRna.setName(decodeName(XmlParser.getNodeAttr("name", antisenseRnaNode)));
- NodeList list = antisenseRnaNode.getChildNodes();
+ final NodeList list = antisenseRnaNode.getChildNodes();
for (int i = 0; i < list.getLength(); i++) {
- Node node = list.item(i);
+ final Node node = list.item(i);
if (node.getNodeType() == Node.ELEMENT_NODE) {
if (node.getNodeName().equals("celldesigner:notes")) {
antisenseRna.setNotes(getRap().getNotes(node));
} else if (node.getNodeName().equals("celldesigner:listOfRegions")) {
- NodeList residueList = node.getChildNodes();
+ final NodeList residueList = node.getChildNodes();
for (int j = 0; j < residueList.getLength(); j++) {
- Node residueNode = residueList.item(j);
+ final Node residueNode = residueList.item(j);
if (residueNode.getNodeType() == Node.ELEMENT_NODE) {
if (residueNode.getNodeName().equalsIgnoreCase("celldesigner:region")) {
antisenseRna.addRegion(getAntisenseRnaRegion(residueNode));
@@ -73,48 +70,46 @@ public class AntisenseRnaXmlParser extends AbstractElementXmlParser<CellDesigner
}
}
}
- Pair<String, CellDesignerAntisenseRna> result = new Pair<String, CellDesignerAntisenseRna>(identifier,
+ final Pair<String, CellDesignerAntisenseRna> result = new Pair<String, CellDesignerAntisenseRna>(identifier,
antisenseRna);
return result;
}
@Override
public String toXml(final AntisenseRna antisenseRna) {
- String attributes = "";
- String result = "";
+ String attributes = " type=\"ANTISENSE_RNA\" ";
+ final StringBuilder result = new StringBuilder();
attributes += " id=\"ar_" + elements.getElementId(antisenseRna) + "\"";
- if (!antisenseRna.getName().equals("")) {
+ if (!antisenseRna.getName().isEmpty()) {
attributes += " name=\"" + XmlParser.escapeXml(encodeName(antisenseRna.getName())) + "\"";
}
- result += "<celldesigner:AntisenseRNA" + attributes + ">";
+ result.append("<celldesigner:AntisenseRNA").append(attributes).append(">");
- if (antisenseRna.getModificationResidues().size() > 0) {
- result += "<celldesigner:listOfRegions>";
+ if (!antisenseRna.getModificationResidues().isEmpty()) {
+ result.append("<celldesigner:listOfRegions>");
for (final ModificationResidue region : antisenseRna.getModificationResidues()) {
- result += modificationResidueXmlParser.toXml(region);
+ result.append(modificationResidueXmlParser.toXml(region));
}
- result += "</celldesigner:listOfRegions>";
+ result.append("</celldesigner:listOfRegions>");
}
- result += "</celldesigner:AntisenseRNA>";
- return result;
+ result.append("</celldesigner:AntisenseRNA>");
+ return result.toString();
}
/**
* Method that parse xml node into AntisenseRnaRegion element.
- *
- * @param regionNode
- * xml node to parse
+ *
+ * @param regionNode xml node to parse
* @return AntisenseRnaRegion object from xml node
- * @throws InvalidXmlSchemaException
- * thrown when input xml node doesn't follow defined schema
+ * @throws InvalidXmlSchemaException thrown when input xml node doesn't follow defined schema
*/
private CellDesignerModificationResidue getAntisenseRnaRegion(final Node regionNode) throws InvalidXmlSchemaException {
- CellDesignerModificationResidue residue = new CellDesignerModificationResidue();
+ final CellDesignerModificationResidue residue = new CellDesignerModificationResidue();
residue.setIdModificationResidue(XmlParser.getNodeAttr("id", regionNode));
residue.setName(XmlParser.getNodeAttr("name", regionNode));
residue.setSize(XmlParser.getNodeAttr("size", regionNode));
residue.setPos(XmlParser.getNodeAttr("pos", regionNode));
- String typeString = XmlParser.getNodeAttr("type", regionNode);
+ final String typeString = XmlParser.getNodeAttr("type", regionNode);
if (typeString != null) {
try {
residue.setModificationType(ModificationType.getByCellDesignerName(typeString));
@@ -123,9 +118,9 @@ public class AntisenseRnaXmlParser extends AbstractElementXmlParser<CellDesigner
}
}
- NodeList list = regionNode.getChildNodes();
+ final NodeList list = regionNode.getChildNodes();
for (int i = 0; i < list.getLength(); i++) {
- Node node = list.item(i);
+ final Node node = list.item(i);
if (node.getNodeType() == Node.ELEMENT_NODE) {
throw new InvalidXmlSchemaException("Unknown element of celldesigner:region " + node.getNodeName());
}
diff --git a/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/GeneXmlParser.java b/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/GeneXmlParser.java
index 4bdcc896e9aaf1c29f02f96b725169b2a4c6eb84..e30b48420ab1302c9de276db86497c9adde275f8 100644
--- a/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/GeneXmlParser.java
+++ b/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/GeneXmlParser.java
@@ -1,8 +1,5 @@
package lcsb.mapviewer.converter.model.celldesigner.species;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import lcsb.mapviewer.common.Pair;
import lcsb.mapviewer.common.XmlParser;
import lcsb.mapviewer.common.exception.InvalidArgumentException;
@@ -14,13 +11,14 @@ import lcsb.mapviewer.converter.model.celldesigner.structure.fields.CellDesigner
import lcsb.mapviewer.converter.model.celldesigner.structure.fields.ModificationType;
import lcsb.mapviewer.model.map.species.Gene;
import lcsb.mapviewer.model.map.species.field.ModificationResidue;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* Class that performs parsing of the CellDesigner xml for
* {@link CellDesignerGene} object.
- *
+ *
* @author Piotr Gawron
- *
*/
public class GeneXmlParser extends AbstractElementXmlParser<CellDesignerGene, Gene> {
@@ -28,17 +26,16 @@ public class GeneXmlParser extends AbstractElementXmlParser<CellDesignerGene, Ge
* Collection of {@link CellDesignerElement cell designer elements} parsed from
* xml.
*/
- private CellDesignerElementCollection elements;
+ private final CellDesignerElementCollection elements;
- private ModificationResidueXmlParser modificationResidueXmlParser;
+ private final ModificationResidueXmlParser modificationResidueXmlParser;
/**
* Default constructor. Model is required because some nodes require access to
* other parts of the model.
- *
- * @param elements
- * collection of {@link CellDesignerElement cell designer elements}
- * parsed from xml
+ *
+ * @param elements collection of {@link CellDesignerElement cell designer elements}
+ * parsed from xml
*/
public GeneXmlParser(final CellDesignerElementCollection elements) {
this.elements = elements;
@@ -47,19 +44,19 @@ public class GeneXmlParser extends AbstractElementXmlParser<CellDesignerGene, Ge
@Override
public Pair<String, CellDesignerGene> parseXmlElement(final Node geneNode) throws InvalidXmlSchemaException {
- CellDesignerGene gene = new CellDesignerGene();
- String identifier = XmlParser.getNodeAttr("id", geneNode);
+ final CellDesignerGene gene = new CellDesignerGene();
+ final String identifier = XmlParser.getNodeAttr("id", geneNode);
gene.setName(decodeName(XmlParser.getNodeAttr("name", geneNode)));
- NodeList list = geneNode.getChildNodes();
+ final NodeList list = geneNode.getChildNodes();
for (int i = 0; i < list.getLength(); i++) {
- Node node = list.item(i);
+ final Node node = list.item(i);
if (node.getNodeType() == Node.ELEMENT_NODE) {
if (node.getNodeName().equals("celldesigner:notes")) {
gene.setNotes(getRap().getNotes(node));
} else if (node.getNodeName().equals("celldesigner:listOfRegions")) {
- NodeList residueList = node.getChildNodes();
+ final NodeList residueList = node.getChildNodes();
for (int j = 0; j < residueList.getLength(); j++) {
- Node residueNode = residueList.item(j);
+ final Node residueNode = residueList.item(j);
if (residueNode.getNodeType() == Node.ELEMENT_NODE) {
if (residueNode.getNodeName().equalsIgnoreCase("celldesigner:region")) {
gene.addModificationResidue(getModificationResidue(residueNode));
@@ -79,52 +76,50 @@ public class GeneXmlParser extends AbstractElementXmlParser<CellDesignerGene, Ge
@Override
public String toXml(final Gene gene) {
- String attributes = "";
- String result = "";
+ String attributes = " type=\"GENE\" ";
+ final StringBuilder result = new StringBuilder();
attributes += " id=\"g_" + elements.getElementId(gene) + "\"";
- if (!gene.getName().equals("")) {
+ if (!gene.getName().isEmpty()) {
attributes += " name=\"" + XmlParser.escapeXml(encodeName(gene.getName())) + "\"";
}
- result += "<celldesigner:gene" + attributes + ">";
+ result.append("<celldesigner:gene").append(attributes).append(">");
- if (gene.getModificationResidues().size() > 0) {
- result += "<celldesigner:listOfRegions>\n";
+ if (!gene.getModificationResidues().isEmpty()) {
+ result.append("<celldesigner:listOfRegions>\n");
for (final ModificationResidue mr : gene.getModificationResidues()) {
- result += modificationResidueXmlParser.toXml(mr);
+ result.append(modificationResidueXmlParser.toXml(mr));
}
- result += "</celldesigner:listOfRegions>\n";
+ result.append("</celldesigner:listOfRegions>\n");
}
- result += "</celldesigner:gene>";
- return result;
+ result.append("</celldesigner:gene>");
+ return result.toString();
}
/**
* Parse modification for a gene.
*
- * @param residueNode
- * source xml node
+ * @param residueNode source xml node
* @return object representing modification
- * @throws InvalidXmlSchemaException
- * thrown when input xml node doesn't follow defined schema
+ * @throws InvalidXmlSchemaException thrown when input xml node doesn't follow defined schema
*/
CellDesignerModificationResidue getModificationResidue(final Node residueNode) throws InvalidXmlSchemaException {
- CellDesignerModificationResidue residue = new CellDesignerModificationResidue();
+ final CellDesignerModificationResidue residue = new CellDesignerModificationResidue();
residue.setIdModificationResidue(XmlParser.getNodeAttr("id", residueNode));
residue.setName(XmlParser.getNodeAttr("name", residueNode));
residue.setSide(XmlParser.getNodeAttr("side", residueNode));
residue.setSize(XmlParser.getNodeAttr("size", residueNode));
residue.setActive(XmlParser.getNodeAttr("active", residueNode));
residue.setAngle(XmlParser.getNodeAttr("pos", residueNode));
- String type = XmlParser.getNodeAttr("type", residueNode);
+ final String type = XmlParser.getNodeAttr("type", residueNode);
try {
residue.setModificationType(ModificationType.getByCellDesignerName(type));
} catch (final InvalidArgumentException e) {
throw new InvalidXmlSchemaException(e);
}
- NodeList list = residueNode.getChildNodes();
+ final NodeList list = residueNode.getChildNodes();
for (int i = 0; i < list.getLength(); i++) {
- Node node = list.item(i);
+ final Node node = list.item(i);
if (node.getNodeType() == Node.ELEMENT_NODE) {
throw new InvalidXmlSchemaException("Unknown element of celldesigner:region " + node.getNodeName());
}
diff --git a/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/RnaXmlParser.java b/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/RnaXmlParser.java
index d64b38e70e90b926731268ac9ab667b4967d27af..3a3d8bf4e4ea9ef656d59fad605544810c413c54 100644
--- a/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/RnaXmlParser.java
+++ b/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/RnaXmlParser.java
@@ -1,8 +1,5 @@
package lcsb.mapviewer.converter.model.celldesigner.species;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import lcsb.mapviewer.common.Pair;
import lcsb.mapviewer.common.XmlParser;
import lcsb.mapviewer.common.exception.InvalidXmlSchemaException;
@@ -13,13 +10,14 @@ import lcsb.mapviewer.converter.model.celldesigner.structure.fields.CellDesigner
import lcsb.mapviewer.converter.model.celldesigner.structure.fields.ModificationType;
import lcsb.mapviewer.model.map.species.Rna;
import lcsb.mapviewer.model.map.species.field.ModificationResidue;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* Class that performs parsing of the CellDesigner xml for
* {@link CellDesignerRna} object.
- *
+ *
* @author Piotr Gawron
- *
*/
public class RnaXmlParser extends AbstractElementXmlParser<CellDesignerRna, Rna> {
@@ -28,17 +26,16 @@ public class RnaXmlParser extends AbstractElementXmlParser<CellDesignerRna, Rna>
* Collection of {@link CellDesignerElement cell designer elements} parsed from
* xml.
*/
- private CellDesignerElementCollection elements;
+ private final CellDesignerElementCollection elements;
- private ModificationResidueXmlParser modificationResidueXmlParser;
+ private final ModificationResidueXmlParser modificationResidueXmlParser;
/**
* Default constructor. Model is required because some nodes require access to
* other parts of the model.
- *
- * @param elements
- * collection of {@link CellDesignerElement cell designer elements}
- * parsed from xml
+ *
+ * @param elements collection of {@link CellDesignerElement cell designer elements}
+ * parsed from xml
*/
public RnaXmlParser(final CellDesignerElementCollection elements) {
this.elements = elements;
@@ -47,19 +44,19 @@ public class RnaXmlParser extends AbstractElementXmlParser<CellDesignerRna, Rna>
@Override
public Pair<String, CellDesignerRna> parseXmlElement(final Node rnaNode) throws InvalidXmlSchemaException {
- CellDesignerRna rna = new CellDesignerRna();
- String identifier = XmlParser.getNodeAttr("id", rnaNode);
+ final CellDesignerRna rna = new CellDesignerRna();
+ final String identifier = XmlParser.getNodeAttr("id", rnaNode);
rna.setName(decodeName(XmlParser.getNodeAttr("name", rnaNode)));
- NodeList list = rnaNode.getChildNodes();
+ final NodeList list = rnaNode.getChildNodes();
for (int i = 0; i < list.getLength(); i++) {
- Node node = list.item(i);
+ final Node node = list.item(i);
if (node.getNodeType() == Node.ELEMENT_NODE) {
if (node.getNodeName().equals("celldesigner:notes")) {
rna.setNotes(getRap().getNotes(node));
} else if (node.getNodeName().equals("celldesigner:listOfRegions")) {
- NodeList residueList = node.getChildNodes();
+ final NodeList residueList = node.getChildNodes();
for (int j = 0; j < residueList.getLength(); j++) {
- Node residueNode = residueList.item(j);
+ final Node residueNode = residueList.item(j);
if (residueNode.getNodeType() == Node.ELEMENT_NODE) {
if (residueNode.getNodeName().equalsIgnoreCase("celldesigner:region")) {
rna.addRegion(getRnaRegion(residueNode));
@@ -79,47 +76,45 @@ public class RnaXmlParser extends AbstractElementXmlParser<CellDesignerRna, Rna>
@Override
public String toXml(final Rna rna) {
- String attributes = "";
- String result = "";
+ String attributes = " type=\"RNA\" ";
+ final StringBuilder result = new StringBuilder();
attributes += " id=\"r_" + elements.getElementId(rna) + "\"";
- if (!rna.getName().equals("")) {
+ if (!rna.getName().isEmpty()) {
attributes += " name=\"" + XmlParser.escapeXml(encodeName(rna.getName())) + "\"";
}
- result += "<celldesigner:RNA" + attributes + ">";
+ result.append("<celldesigner:RNA").append(attributes).append(">");
- if (rna.getModificationResidues().size() > 0) {
- result += "<celldesigner:listOfRegions>";
+ if (!rna.getModificationResidues().isEmpty()) {
+ result.append("<celldesigner:listOfRegions>");
for (final ModificationResidue mr : rna.getModificationResidues()) {
- result += modificationResidueXmlParser.toXml(mr);
+ result.append(modificationResidueXmlParser.toXml(mr));
}
- result += "</celldesigner:listOfRegions>";
+ result.append("</celldesigner:listOfRegions>");
}
- result += "</celldesigner:RNA>";
- return result;
+ result.append("</celldesigner:RNA>");
+ return result.toString();
}
/**
* Parses CellDesigner xml node for RnaRegion.
*
- * @param residueNode
- * xml node to parse
+ * @param residueNode xml node to parse
* @return {@link CellDesignerModificationResidue} object created from the node
- * @throws InvalidXmlSchemaException
- * thrown when input xml node doesn't follow defined schema
+ * @throws InvalidXmlSchemaException thrown when input xml node doesn't follow defined schema
*/
private CellDesignerModificationResidue getRnaRegion(final Node residueNode) throws InvalidXmlSchemaException {
- CellDesignerModificationResidue residue = new CellDesignerModificationResidue();
+ final CellDesignerModificationResidue residue = new CellDesignerModificationResidue();
residue.setIdModificationResidue(XmlParser.getNodeAttr("id", residueNode));
residue.setSize(XmlParser.getNodeAttr("size", residueNode));
residue.setPos(XmlParser.getNodeAttr("pos", residueNode));
- String typeString = XmlParser.getNodeAttr("type", residueNode);
+ final String typeString = XmlParser.getNodeAttr("type", residueNode);
if (typeString != null) {
residue.setModificationType(ModificationType.getByCellDesignerName(typeString));
}
- NodeList list = residueNode.getChildNodes();
+ final NodeList list = residueNode.getChildNodes();
for (int i = 0; i < list.getLength(); i++) {
- Node node = list.item(i);
+ final Node node = list.item(i);
if (node.getNodeType() == Node.ELEMENT_NODE) {
throw new InvalidXmlSchemaException("Unknown element of celldesigner:region " + node.getNodeName());
}
diff --git a/converter-SBGNML/pom.xml b/converter-SBGNML/pom.xml
index aea3928986efd8f335a9d46dff3b3277979da763..e7c66bcda74245f5f4d6ffdc39ca6d195df549c4 100644
--- a/converter-SBGNML/pom.xml
+++ b/converter-SBGNML/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>converter-SBGNML</artifactId>
@@ -20,26 +20,26 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>persist</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-graphics</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
diff --git a/converter-graphics/pom.xml b/converter-graphics/pom.xml
index 41b0af7cd4fe75c182881593cd5ed1ea889f6ea8..8b77ca66a71978b529dd1dc3d25da35b7c2d81f9 100644
--- a/converter-graphics/pom.xml
+++ b/converter-graphics/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>converter-graphics</artifactId>
<name>MapViewer graphics converter</name>
@@ -18,13 +18,13 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model-command</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- Log4J2 -->
diff --git a/converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/bioentity/reaction/ReactionConverter.java b/converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/bioentity/reaction/ReactionConverter.java
index 12f05cd8705c1baf4ca24c8ac63ecf4a23f6cf38..39d7401613d35e0834418d0320bbf3f1bbeea65a 100644
--- a/converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/bioentity/reaction/ReactionConverter.java
+++ b/converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/bioentity/reaction/ReactionConverter.java
@@ -65,6 +65,10 @@ public class ReactionConverter extends BioEntityConverter<Reaction> {
* circle.
*/
private static final int DEFAULT_OPERATOR_RADIUS = 6;
+
+ private static final double SBGN_OPERATOR_RADIUS = 10.0;
+ private static final double SBGN_OPERATOR_FONT_SIZE = 8.0;
+
/**
* Line width of #DEFAULT_COLOR_SCHEMA used for coloring reactions where we have
* more than one layout.
@@ -123,6 +127,7 @@ public class ReactionConverter extends BioEntityConverter<Reaction> {
protected void drawRectangleData(final PolylineData line, final Point2D processCoordinates, final ReactionRect insideType,
final Graphics2D graphics) {
Color oldColor = graphics.getColor();
+ Font oldFont = graphics.getFont();
graphics.setColor(line.getColor());
@@ -130,9 +135,9 @@ public class ReactionConverter extends BioEntityConverter<Reaction> {
Point2D endPoint = line.getLines().get((line.getLines().size() - 1) / 2).getP2();
if (startPoint.distance(endPoint) > RECT_SIZE) {
Point2D rectStartPoint = pointTransformation.getPointOnLine(startPoint, endPoint,
- 0.5 - RECT_SIZE / (2 * startPoint.distance(endPoint)));
+ 0.5 - RECT_SIZE / (2 * startPoint.distance(endPoint)));
Point2D rectEndPoint = pointTransformation.getPointOnLine(startPoint, endPoint,
- 0.5 + RECT_SIZE / (2 * startPoint.distance(endPoint)));
+ 0.5 + RECT_SIZE / (2 * startPoint.distance(endPoint)));
PolylineData preRectangleLine = new PolylineData(line);
preRectangleLine.removeLines();
preRectangleLine.addLine(startPoint, rectStartPoint);
@@ -233,6 +238,7 @@ public class ReactionConverter extends BioEntityConverter<Reaction> {
}
graphics.setColor(oldColor);
+ graphics.setFont(oldFont);
}
@Override
@@ -373,6 +379,7 @@ public class ReactionConverter extends BioEntityConverter<Reaction> {
* @param sbgnFormat true if operator is to be drawn in SBGN format
*/
void drawOperator(final Graphics2D graphics, final NodeOperator operator, final boolean sbgnFormat) {
+ Font oldFont = graphics.getFont();
Color oldColor = graphics.getColor();
// draw line
@@ -390,7 +397,8 @@ public class ReactionConverter extends BioEntityConverter<Reaction> {
// bigger connecting point circles in SBGN view
if (sbgnFormat && (operator instanceof AndOperator || operator instanceof OrOperator)) {
fillColor = Color.WHITE;
- radius = 15;
+ radius = SBGN_OPERATOR_RADIUS;
+ graphics.setFont(getSbgnOperatorFontSize());
if (operator instanceof AndOperator) {
text = "AND";
}
@@ -400,7 +408,7 @@ public class ReactionConverter extends BioEntityConverter<Reaction> {
}
// it's a circle
Ellipse2D cir = new Ellipse2D.Double(centerPoint.getX() - radius, centerPoint.getY() - radius, 2 * radius,
- 2 * radius);
+ 2 * radius);
graphics.setColor(fillColor);
graphics.fill(cir);
graphics.setColor(operator.getLine().getColor());
@@ -408,8 +416,9 @@ public class ReactionConverter extends BioEntityConverter<Reaction> {
// and text defined by operator
Rectangle2D rect = graphics.getFontMetrics().getStringBounds(text, graphics);
graphics.drawString(text, (int) (centerPoint.getX() - rect.getWidth() / 2 + 1),
- (int) (centerPoint.getY() + rect.getHeight() / 2) - 2);
+ (int) (centerPoint.getY() + rect.getHeight() / 2) - 2);
graphics.setColor(oldColor);
+ graphics.setFont(oldFont);
}
/**
@@ -488,4 +497,8 @@ public class ReactionConverter extends BioEntityConverter<Reaction> {
this.pointTransformation = pointTransformation;
}
+ private Font getSbgnOperatorFontSize() {
+ return new Font(Font.SANS_SERIF, 0, (int) SBGN_OPERATOR_FONT_SIZE);
+ }
+
}
\ No newline at end of file
diff --git a/converter-graphics/src/test/java/lcsb/mapviewer/converter/graphics/bioentity/reaction/ReactionConverterTest.java b/converter-graphics/src/test/java/lcsb/mapviewer/converter/graphics/bioentity/reaction/ReactionConverterTest.java
index 5fac969a94ae54c2a88bbbf96e77ea22179420e4..1a61b6285467e7d4bd9398cb9761949ec8d3ce72 100644
--- a/converter-graphics/src/test/java/lcsb/mapviewer/converter/graphics/bioentity/reaction/ReactionConverterTest.java
+++ b/converter-graphics/src/test/java/lcsb/mapviewer/converter/graphics/bioentity/reaction/ReactionConverterTest.java
@@ -1,5 +1,6 @@
package lcsb.mapviewer.converter.graphics.bioentity.reaction;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyDouble;
@@ -10,6 +11,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import java.awt.Color;
+import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.Shape;
import java.awt.Stroke;
@@ -497,4 +499,27 @@ public class ReactionConverterTest extends GraphicsTestFunctions {
Mockito.verify(graphics, times(5)).draw(any(Shape.class));
}
+ @Test
+ public void testDrawSbgnReaction() throws Exception {
+ BufferedImage bi = new BufferedImage(200, 200, BufferedImage.TYPE_INT_ARGB);
+ Graphics2D graphics = bi.createGraphics();
+
+ Font f = graphics.getFont();
+ ReactionConverter rc = new ReactionConverter(colorExtractor);
+
+ Reaction reaction = createComplexReaction(5.0);
+ rc.draw(reaction, graphics, new ConverterParams().sbgnFormat(true));
+
+ assertEquals(f, graphics.getFont());
+
+ // ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ // ImageIO.write(bi, "PNG", outputStream);
+ // byte[] output1 = outputStream.toByteArray();
+
+ // FileUtils.writeByteArrayToFile(new File("tmp.png"), output1);
+ //
+ // Desktop.getDesktop().open(new File("tmp.png"));
+
+ }
+
}
diff --git a/converter-sbml/pom.xml b/converter-sbml/pom.xml
index 685a65ad3f3b9a8dd26bbbd564e662230024e24c..de6b7d476d01a6160547504e06f9bc41e5861122 100644
--- a/converter-sbml/pom.xml
+++ b/converter-sbml/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>converter-sbml</artifactId>
<name>converter-sbml</name>
@@ -40,22 +40,22 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model-command</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- Log4J2 -->
@@ -167,7 +167,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-graphics</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
<scope>test</scope>
</dependency>
diff --git a/converter/pom.xml b/converter/pom.xml
index 164f2699b765393e83b379533baf01a3a69c7901..d69a4b09124d420ae78e9a8943b584d9a5c8bbae 100644
--- a/converter/pom.xml
+++ b/converter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>converter</artifactId>
@@ -15,7 +15,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
diff --git a/frontend-js/pom.xml b/frontend-js/pom.xml
index 9bea270812af8f8ec6e5431aee1c24c69251e225..5bd97ae4414f22baa716e9c02e26cd8f7c88236e 100644
--- a/frontend-js/pom.xml
+++ b/frontend-js/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>frontend-js</artifactId>
<name>frontend-js</name>
diff --git a/frontend-js/src/main/js/GuiConnector.js b/frontend-js/src/main/js/GuiConnector.js
index f2e24b45d6c28e25c561d3d762894c1d4e59d3bf..5b7cd78b588bd3c4c4436d9d7e711ac40d9824c7 100644
--- a/frontend-js/src/main/js/GuiConnector.js
+++ b/frontend-js/src/main/js/GuiConnector.js
@@ -515,6 +515,7 @@ GuiConnector.prototype.getErrorMessageForError = function (error) {
*/
GuiConnector.prototype.info = function (message) {
var self = returnThisOrSingleton(this);
+
if (self._infoDialog === undefined) {
self._infoDialog = document.createElement("div");
self._infoDialogContent = document.createElement("div");
@@ -530,6 +531,7 @@ GuiConnector.prototype.info = function (message) {
});
}
self._infoDialogContent.innerHTML = message;
+ $(self._infoDialogContent).css({"max-height":"350px", overflow:"auto"});
$(self._infoDialog).dialog("open");
};
diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index 474c38e72cdeeeb7418c2daae76ff8c713e9ebf8..5cdaf8245f23a654ff0dc4f482bd945533f0fe05 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -22,6 +22,7 @@ var ConfigurationType = require('./ConfigurationType');
var IdentifiedElement = require('./map/data/IdentifiedElement');
var InvalidCredentialsError = require('./InvalidCredentialsError');
var LayoutAlias = require('./map/data/LayoutAlias');
+var License = require('./map/data/License');
var DataOverlay = require('./map/data/DataOverlay');
var LayoutReaction = require('./map/data/LayoutReaction');
var MapModel = require('./map/data/MapModel');
@@ -86,6 +87,7 @@ ServerConnector.init = function () {
* @private
*/
self._configuration = undefined;
+ self._licenses = undefined;
self._loggedUser = undefined;
self._serverBaseUrl = undefined;
@@ -1037,6 +1039,13 @@ ServerConnector.getConfigurationUrl = function (queryParams, filterParams) {
});
};
+ServerConnector.getLicensesUrl = function (queryParams, filterParams) {
+ return this.getApiUrl({
+ type: "licenses/",
+ params: filterParams
+ });
+};
+
ServerConnector.getConfigurationOptionUrl = function (queryParams, filterParams) {
var self = this;
return self.getApiUrl({
@@ -1361,12 +1370,18 @@ ServerConnector.updateProject = function (project) {
};
var filterParams = {
project: {
+ owner: project.getOwner(),
name: project.getName(),
version: project.getVersion(),
notifyEmail: project.getNotifyEmail(),
organism: self.serialize(project.getOrganism()),
disease: self.serialize(project.getDisease()),
- mapCanvasType: project.getMapCanvasType()
+ mapCanvasType: project.getMapCanvasType(),
+ license: {
+ id: project.getLicenseId()
+ },
+ customLicenseName: project.getCustomLicenseName(),
+ customLicenseUrl: project.getCustomLicenseUrl()
}
};
if (project.getOrganism() === undefined) {
@@ -3662,4 +3677,20 @@ ServerConnector.getStacktraceById = function (id) {
});
};
+ServerConnector.getLicenses = function () {
+ var self = this;
+ if (this._licenses === undefined) {
+ return self.sendGetRequest(self.getLicensesUrl() + "?size=1000").then(function (content) {
+ self._licenses = [];
+ var data = JSON.parse(content);
+ for (var i = 0; i < data.data.length; i++) {
+ self._licenses.push(new License(data.data[i]));
+ }
+ return self._licenses;
+ });
+ } else {
+ return Promise.resolve(self._licenses);
+ }
+};
+
module.exports = ServerConnector;
diff --git a/frontend-js/src/main/js/gui/admin/AddProjectDialog.js b/frontend-js/src/main/js/gui/admin/AddProjectDialog.js
index e32def51a474634d30c93d0c37f82ba59c16a40b..bc8f1be47f657767997d947460d80d4b2fe8e154 100644
--- a/frontend-js/src/main/js/gui/admin/AddProjectDialog.js
+++ b/frontend-js/src/main/js/gui/admin/AddProjectDialog.js
@@ -203,6 +203,34 @@ AddProjectDialog.prototype.createGeneralTabContent = function () {
table.appendChild(self.createRow([guiUtils.createLabel("File format: "), fileFormatSelect]));
+ var licenseTypeSelect = Functions.createElement({
+ type: "select",
+ name: "project-license",
+ style: "width: 172px;",
+ onchange: function () {
+ var license = self.getLicense();
+ if (license !== null) {
+ $("div:has(> div > [name='project-custom-license-name'])", self.getElement()).hide();
+ $("div:has(> div > [name='project-custom-license-url'])", self.getElement()).hide();
+ } else {
+ $("div:has(> div > [name='project-custom-license-name'])", self.getElement()).show();
+ $("div:has(> div > [name='project-custom-license-url'])", self.getElement()).show();
+ }
+ }
+ });
+
+ table.appendChild(self.createRow([guiUtils.createLabel("License: "), licenseTypeSelect]));
+
+ table.appendChild(self.createInputRow({
+ labelName: "Custom license name",
+ inputName: "project-custom-license-name"
+ }));
+
+ table.appendChild(self.createInputRow({
+ labelName: "Custom license url",
+ inputName: "project-custom-license-url"
+ }));
+
var mapCanvasTypeSelect = Functions.createElement({
type: "select",
name: "project-map-canvas-type"
@@ -752,6 +780,25 @@ AddProjectDialog.prototype.init = function () {
self.bindProjectUploadPreferences(user, "validateMiriam", "project-verify-annotations");
self.bindProjectUploadPreferences(user, "cacheData", "project-cache-data");
self.bindProjectUploadPreferences(user, "sbgn", "project-sbgn-visualization");
+ return ServerConnector.getLicenses();
+ }).then(function (licenses) {
+ self._licenses = licenses;
+ var select = $("[name='project-license']", self.getElement())[0];
+ $(select).empty();
+ select.appendChild(Functions.createElement({
+ type: "option",
+ content: "--OTHER--"
+ }));
+ for (var i = 0; i < licenses.length; i++) {
+ var license = licenses[i];
+ var option = Functions.createElement({
+ type: "option",
+ content: license.getName(),
+ value: license.getId(),
+ data: license.getContent()
+ });
+ select.appendChild(option);
+ }
});
};
@@ -1021,6 +1068,24 @@ AddProjectDialog.prototype.getMapCanvasTypeId = function () {
return $("[name='project-map-canvas-type']", this.getElement()).val();
};
+
+/**
+ *
+ * @returns {?License}
+ */
+AddProjectDialog.prototype.getLicense = function () {
+ var self = this;
+ var id = parseInt($("[name='project-license']", this.getElement()).val());
+ for (var i = 0; i < self._licenses.length; i++) {
+ var license = self._licenses[i];
+ if (license.getId() === id) {
+ return license;
+ }
+ }
+ return null;
+};
+
+
/**
*
* @returns {string}
@@ -1085,6 +1150,22 @@ AddProjectDialog.prototype.getVersion = function () {
return $("[name='project-version']", this.getElement()).val();
};
+/**
+ *
+ * @returns {string}
+ */
+AddProjectDialog.prototype.getCustomLicenseName = function () {
+ return $("[name='project-custom-license-name']", this.getElement()).val();
+};
+
+/**
+ *
+ * @returns {string}
+ */
+AddProjectDialog.prototype.getCustomLicenseUrl = function () {
+ return $("[name='project-custom-license-url']", this.getElement()).val();
+};
+
/**
*
* @returns {string}
@@ -1224,6 +1305,12 @@ AddProjectDialog.prototype.onSaveClicked = function () {
GuiConnector.showProcessing("Uploading...");
return self.getServerConnector().uploadFile({filename: self._filename, content: self.getFileContent()});
}).then(function (file) {
+ var license = self.getLicense();
+
+ var licenseId = null;
+ if (license != null) {
+ licenseId = license.getId();
+ }
var options = {
"projectId": self.getProjectId(),
"name": self.getName(),
@@ -1235,6 +1322,9 @@ AddProjectDialog.prototype.onSaveClicked = function () {
"disease": self.getDisease(),
"version": self.getVersion(),
"organism": self.getOrganism(),
+ "license-id": licenseId,
+ 'custom-license-name': self.getCustomLicenseName(),
+ 'custom-license-url': self.getCustomLicenseUrl(),
"mapCanvasType": self.getMapCanvasTypeId(),
"sbgn": self.isSbgn(),
"annotate": self.isAnnotateAutomatically(),
@@ -1417,6 +1507,9 @@ AddProjectDialog.prototype.setZipFileContent = function (file) {
} else {
guiUtils.hideTab(self, $(".minerva-project-overview-images-tab", self.getElement())[0]);
}
+ if (maps === 0) {
+ throw new ValidationError("Cannot find valid map file in the archive");
+ }
return self.setZipEntries(entries).then(function () {
self._filename = file.name;
@@ -1449,16 +1542,17 @@ AddProjectDialog.prototype.createZipEntry = function (jsZipEntry, zipObject) {
var processingPromise = Promise.resolve();
if (this.isIgnoredZipEntry(lowercaseFilename)) {
type = undefined;
- } else if (lowercaseFilename.indexOf("submaps") === 0) {
+ } else if (lowercaseFilename.indexOf("submaps/") >= 0 || lowercaseFilename.indexOf("submaps\\") >= 0) {
type = "MAP";
if (lowercaseFilename.endsWith("mapping.xml")) {
data.mapping = true;
}
- } else if (lowercaseFilename.indexOf("images") === 0) {
+ } else if (lowercaseFilename.indexOf("images/") >= 0 || lowercaseFilename.indexOf("images\\") >= 0) {
type = "IMAGE";
- } else if (lowercaseFilename.indexOf("glyphs") === 0) {
+ } else if (lowercaseFilename.indexOf("glyphs/") >= 0 || lowercaseFilename.indexOf("glyphs\\") >= 0) {
type = "GLYPH";
- } else if (lowercaseFilename.indexOf("layouts") === 0 || lowercaseFilename.indexOf("overlays") === 0) {
+ } else if (lowercaseFilename.indexOf("layouts/") >= 0 || lowercaseFilename.indexOf("overlays/") >= 0
+ || lowercaseFilename.indexOf("layouts\\") >= 0 || lowercaseFilename.indexOf("overlays\\") >= 0) {
type = "OVERLAY";
processingPromise = zipObject.file(jsZipEntry.name).async("string").then(function (content) {
var overlayParser = new OverlayParser();
@@ -1477,7 +1571,7 @@ AddProjectDialog.prototype.createZipEntry = function (jsZipEntry, zipObject) {
data.description = "";
}
});
- } else if (lowercaseFilename.indexOf("\\") === -1 && lowercaseFilename.indexOf("/") === -1) {
+ } else if ((lowercaseFilename.match(/\/\\/g) || []).length <= 1) {
type = "MAP";
data.root = true;
} else {
@@ -1519,8 +1613,11 @@ AddProjectDialog.prototype.createZipEntry = function (jsZipEntry, zipObject) {
});
}
+ var extensions = self.getValidExtensions();
+
return processingPromise.then(function () {
- if (type !== undefined) {
+ var extension = filename.toLowerCase().substring(filename.lastIndexOf(".") + 1);
+ if (type !== undefined && (type !== "MAP" || extensions.indexOf(extension) >= 0)) {
return new ZipEntry({filename: filename, type: type, data: data});
} else {
return null;
@@ -1528,6 +1625,17 @@ AddProjectDialog.prototype.createZipEntry = function (jsZipEntry, zipObject) {
});
};
+AddProjectDialog.prototype.getValidExtensions = function () {
+ var configuration = this.getConfiguration();
+ var converters = configuration.getModelConverters();
+ var extensions = [];
+ for (var i = 0; i < converters.length; i++) {
+ var converter = converters[i];
+ extensions = extensions.concat(converter.extensions);
+ }
+ return extensions;
+};
+
/**
*
* @returns {ZipEntry[]}
diff --git a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
index bfcaf3be5f680abbc8841fa42a615f582ae1c868..13c8d7b144f4cbc863b34c7514fd488365d3d2b5 100644
--- a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
+++ b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
@@ -216,6 +216,104 @@ EditProjectDialog.prototype.createGeneralTabContent = function () {
})
}));
+ var licenseRow = Functions.createElement({
+ type: "div",
+ style: "display:table-row"
+ });
+ table.appendChild(licenseRow);
+
+ licenseRow.appendChild(Functions.createElement({
+ type: "div",
+ style: "display:table-cell",
+ content: "License: "
+ }));
+ licenseRow.appendChild(Functions.createElement({
+ type: "div",
+ style: "display:table-cell",
+ content: Functions.createElement({
+ type: "select",
+ name: "project-license",
+ style: "width: 172px;"
+ }),
+ onchange: function () {
+ var select = this;
+ var project = self.getProject();
+ var license = self.getLicense();
+ project.setLicense(license);
+ if (license !== null) {
+ $("[name='project-license-show']", self.getElement()).show();
+ $("[name='custom-license-name-row']", self.getElement()).hide();
+ $("[name='custom-license-url-row']", self.getElement()).hide();
+ } else {
+ $("[name='project-license-show']", self.getElement()).hide();
+ $("[name='custom-license-name-row']", self.getElement()).show();
+ $("[name='custom-license-url-row']", self.getElement()).show();
+ }
+ return self.updateProject(project);
+ }
+
+ }));
+ licenseRow.appendChild(Functions.createElement({
+ type: "a",
+ name: "project-license-show",
+ content: "<i class=\"fa fa-solid fa-eye\"></i>",
+ xss: false,
+ href: "#",
+ onclick: function () {
+ var license = self.getLicense();
+ if (license !== null) {
+ GuiConnector.info("<a href='" + license.getUrl() + "'>link</a><br/>" + license.getContent());
+ }
+ }
+ }));
+
+ var customLicenseNameRow = Functions.createElement({
+ type: "div",
+ style: "display:table-row",
+ name: "custom-license-name-row"
+ });
+ table.appendChild(customLicenseNameRow);
+ customLicenseNameRow.appendChild(Functions.createElement({
+ type: "div",
+ style: "display:table-cell",
+ content: "License name"
+ }));
+ customLicenseNameRow.appendChild(Functions.createElement({
+ type: "div",
+ style: "display:table-cell",
+ content: "<input name='customLicenseName'/>",
+ xss: false,
+ onchange: function () {
+ var project = self.getProject();
+ project.setCustomLicenseName($("[name='customLicenseName']", this).val());
+ return self.updateProject(project);
+ }
+ }));
+
+ var customLicenseUrlRow = Functions.createElement({
+ type: "div",
+ style: "display:table-row",
+ name: "custom-license-url-row"
+ });
+ table.appendChild(customLicenseUrlRow);
+ customLicenseUrlRow.appendChild(Functions.createElement({
+ type: "div",
+ style: "display:table-cell",
+ content: "License url"
+ }));
+ customLicenseUrlRow.appendChild(Functions.createElement({
+ type: "div",
+ style: "display:table-cell",
+ content: "<input name='customLicenseUrl'/>",
+ xss: false,
+ onchange: function () {
+ var project = self.getProject();
+ project.setCustomLicenseUrl($("[name='customLicenseUrl']", this).val());
+ return self.updateProject(project);
+ }
+ }));
+
+
var googleLicenseRow = Functions.createElement({
type: "div",
style: "display:table-row"
@@ -711,8 +809,23 @@ EditProjectDialog.prototype._createBackgroundsTable = function () {
$(backgroundsTable).on("change", "[name='defaultBackground']", function () {
var backgroundId = parseInt($(this).attr("data"));
var background = self._backgroundById[backgroundId];
- background.setDefaultOverlay($(this).prop('checked'));
- return self.updateBackground(background);
+ var checked = $(this).prop('checked');
+ background.setDefaultOverlay(checked);
+ return self.updateBackground(background).then(function () {
+ if (checked) {
+ var checkboxes = $("[name='defaultBackground']", backgroundsTable);
+ for (var i = 0; i < checkboxes.length; i++) {
+ var checkbox = checkboxes[i];
+ var otherBackgroundId = parseInt($(checkbox).attr("data"));
+ if (otherBackgroundId !== backgroundId) {
+ var otherChecked = $(checkbox).prop('checked');
+ if (otherChecked) {
+ $(checkbox).prop('checked', false).trigger('change');
+ }
+ }
+ }
+ }
+ });
});
return result;
@@ -899,6 +1012,8 @@ EditProjectDialog.prototype.projectDataUpdated = function (project) {
$("[name='projectName']", element).val(xss(project.getName()));
$("[name='projectId']", element).html(xss(project.getProjectId()));
$("[name='projectVersion']", element).val(xss(project.getVersion()));
+ $("[name='customLicenseName']", element).val(xss(project.getCustomLicenseName()));
+ $("[name='customLicenseUrl']", element).val(xss(project.getCustomLicenseUrl()));
var disease = "";
if (project.getDisease() !== undefined) {
@@ -962,6 +1077,32 @@ EditProjectDialog.prototype.refresh = function () {
}
select.appendChild(option);
}
+ return ServerConnector.getLicenses();
+ }).then(function (licenses) {
+ self._licenses = licenses;
+ var select = $("[name='project-license']", self.getElement())[0];
+ $(select).empty();
+ $("[name='project-license-show']", self.getElement()).hide();
+ select.appendChild(Functions.createElement({
+ type: "option",
+ content: "--OTHER--"
+ }));
+ for (var i = 0; i < licenses.length; i++) {
+ var license = licenses[i];
+ var option = Functions.createElement({
+ type: "option",
+ content: license.getName(),
+ value: license.getId(),
+ data: license.getContent()
+ });
+ if (license.getId() === self.getProject().getLicenseId()) {
+ option.selected = true;
+ $("[name='project-license-show']", self.getElement()).show();
+ $("[name='custom-license-name-row']", self.getElement()).hide();
+ $("[name='custom-license-url-row']", self.getElement()).hide();
+ }
+ select.appendChild(option);
+ }
});
};
@@ -1626,6 +1767,21 @@ EditProjectDialog.prototype.getMapCanvasTypeId = function () {
return $("[name='project-map-canvas-type']", this.getElement()).val();
};
+/**
+ * @returns {?License}
+ */
+EditProjectDialog.prototype.getLicense = function () {
+ var self = this;
+ var id = parseInt($("[name='project-license']", this.getElement()).val());
+ for (var i = 0; i < self._licenses.length; i++) {
+ var license = self._licenses[i];
+ if (license.getId() === id) {
+ return license;
+ }
+ }
+ return null;
+};
+
/**
*
* @param {boolean} isLicenseAccepted
diff --git a/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js b/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
index d40f5020a4b240cff19ab8c339257c1743a32ee7..d0823490e432fc9f82cb339a1dd9fd1dcb6eddc2 100644
--- a/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
@@ -155,13 +155,47 @@ UsersAdminPanel.prototype._createUsersTableRow = function () {
$(usersTable).on("click", "[name='removeUser']", function () {
var button = this;
- return self.askConfirmRemoval({
- title: "INFO",
- content: "Do you really want to remove '" + $(button).attr("data") + "'user?",
- input: false
+ var login = $(button).attr("data");
+ var loggedUser;
+ return self.getServerConnector().getLoggedUser().then(function (user) {
+ loggedUser = user;
+
+ return self.askConfirmRemoval({
+ title: "INFO",
+ content: "Do you really want to remove '" + login + "'user?",
+ input: false
+ });
}).then(function (param) {
if (param.status) {
- return self.removeUser($(button).attr("data"))
+ var projects;
+ return self.getUserProjects(login).then(function (result) {
+ projects = result;
+ return self.askProjectRemovalBehaviour(projects)
+ }).then(function (result) {
+ var promises = [];
+ if (result.status === 'cancel') {
+ //continue
+ } else if (result.status === 'remove') {
+ for (var j = 0; j < projects.length; j++) {
+ promises.push(ServerConnector.removeProject(projects[j].getProjectId()));
+ }
+ return Promise.all(promises).then(function () {
+ return self.removeUser(login);
+ });
+ } else if (result.status === 'reassign') {
+ for (var i = 0; i < projects.length; i++) {
+ projects[i].setOwner(loggedUser.getLogin());
+ promises.push(ServerConnector.updateProject(projects[i]));
+ }
+ return Promise.all(promises).then(function () {
+ return self.removeUser(login);
+ });
+ } else if (result.status === 'orphan') {
+ return self.removeUser(login);
+ } else {
+ throw new Error('Unknown status: ' + result.status);
+ }
+ });
}
}).catch(GuiConnector.alert);
});
@@ -192,6 +226,62 @@ UsersAdminPanel.prototype._createUsersTableRow = function () {
return projectsRow;
};
+/**
+ *
+ * @param {array<Project>} projects
+ * @returns {Promise}
+ */
+UsersAdminPanel.prototype.askProjectRemovalBehaviour = function (projects) {
+ return new Promise(function (resolve) {
+ var content = 'What should happen with the following projects owned by the user:<ul>';
+ for (var i = 0; i < projects.length; i++) {
+ content += "<li>" + projects[i].getProjectId() + "</li>";
+ }
+ content += "</ul>";
+ var html = Functions.createElement({type: 'div', content: content});
+ $(html).dialog({
+ modal: true,
+ title: 'There are projects owned by the user.',
+ close: function () {
+ $(this).dialog('destroy').remove();
+ resolve({status: "cancel"});
+ },
+ buttons: {
+ 'Remove': function () {
+ var reason = $('input[name="reason-value"]').val();
+ $(this).dialog('destroy').remove();
+ resolve({status: "remove"});
+ },
+ 'Reassign': function () {
+ $(this).dialog('destroy').remove();
+ resolve({status: "reassign"});
+ },
+ 'Orphan': function () {
+ $(this).dialog('destroy').remove();
+ resolve({status: "orphan"});
+ }
+ }
+ });
+ })
+};
+
+/**
+ *
+ * @param {string} login
+ * @return Promise<Project>
+ */
+UsersAdminPanel.prototype.getUserProjects = function (login) {
+ return ServerConnector.getProjects().then(function (projects) {
+ var result = [];
+ for (var i = 0; i < projects.length; i++) {
+ if (projects[i].getOwner() === login) {
+ result.push(projects[i]);
+ }
+ }
+ return result;
+ });
+}
+
/**
*
* @param {String} login
diff --git a/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js b/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js
index 7b44e78d353f9a027b978c6adb830b594b745979..520d4b0760a7bea85e6c44237f2c852662028c4a 100644
--- a/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js
@@ -158,6 +158,21 @@ ProjectInfoPanel.prototype._createInfoPanelGui = function () {
liElement.appendChild(projectOriginalFileButton);
dataTab.appendChild(liElement);
+ var projectLicenseButton = Functions.createElement({
+ type: "a",
+ name: "projectLicenseButton",
+ href: "#",
+ xss: false,
+ content: "License: <span name='projectLicenseText'>---</span>",
+ onclick: function () {
+ }
+ });
+ liElement = Functions.createElement({
+ type: "li"
+ });
+ liElement.appendChild(projectLicenseButton);
+ dataTab.appendChild(liElement);
+
var exportButton = Functions.createElement({
type: "a",
href: ServerConnector.getServerBaseUrl() + "export.xhtml?id=" + projectId,
@@ -292,6 +307,8 @@ ProjectInfoPanel.prototype.refresh = function () {
var projectOrganismText = $("[name='projectOrganism']", self.getElement())[0];
var projectDiseaseText = $("[name='projectDisease']", self.getElement())[0];
+ var projectLicenseText = $("[name='projectLicenseText']", self.getElement())[0];
+
var project = self.getProject();
projectNameText.innerHTML = xss(project.getName());
projectVersionText.innerHTML = xss(project.getVersion());
@@ -314,6 +331,16 @@ ProjectInfoPanel.prototype.refresh = function () {
}));
}
+ $("[name='projectLicenseButton']", self.getElement()).off('click');
+ if (project.getLicense() !== null) {
+ projectLicenseText.innerHTML = project.getLicense().getName();
+ $("[name='projectLicenseButton']", self.getElement()).on('click', function(){
+ GuiConnector.info(project.getLicense().getContent());
+ });
+ } else {
+ projectLicenseText.innerHTML = "---";
+ }
+
return Promise.all(promises);
};
diff --git a/frontend-js/src/main/js/map/data/License.js b/frontend-js/src/main/js/map/data/License.js
new file mode 100644
index 0000000000000000000000000000000000000000..7e2775c26a032e57dad24a92c66ffa3a9dddfed3
--- /dev/null
+++ b/frontend-js/src/main/js/map/data/License.js
@@ -0,0 +1,88 @@
+"use strict";
+
+/**
+ * @typedef {Object} LicenseOptions
+ * @property {number} id
+ * @property {string} name
+ * @property {string} content
+ */
+
+
+/**
+ *
+ * @param {LicenseOptions} jsonObject
+ * @constructor
+ */
+function License(jsonObject) {
+ var self = this;
+ self.setName(jsonObject.name);
+ self.setId(jsonObject.id);
+ self.setContent(jsonObject.content);
+ self.setUrl(jsonObject.url);
+}
+
+/**
+ *
+ * @param {string} content
+ */
+License.prototype.setContent = function (content) {
+ this._content = content;
+};
+
+/**
+ *
+ * @returns {string}
+ */
+License.prototype.getContent = function () {
+ return this._content;
+};
+
+/**
+ *
+ * @param {string} url
+ */
+License.prototype.setUrl = function (url) {
+ this._url = url;
+};
+
+/**
+ *
+ * @returns {string}
+ */
+License.prototype.getUrl = function () {
+ return this._url;
+};
+
+/**
+ *
+ * @param {number} id
+ */
+License.prototype.setId = function (id) {
+ this._id = id;
+};
+
+/**
+ *
+ * @returns {number}
+ */
+License.prototype.getId = function () {
+ return this._id;
+};
+
+/**
+ *
+ * @param {string} name
+ */
+License.prototype.setName = function (name) {
+ this._name = name;
+};
+
+/**
+ *
+ * @returns {string}
+ */
+License.prototype.getName = function () {
+ return this._name;
+};
+
+module.exports = License;
diff --git a/frontend-js/src/main/js/map/data/Project.js b/frontend-js/src/main/js/map/data/Project.js
index bc82f08e86dbc6f8056e06b73606fb4bff134e4d..027c0e02a6b40a1e6eee5f45b3442e5709257b41 100644
--- a/frontend-js/src/main/js/map/data/Project.js
+++ b/frontend-js/src/main/js/map/data/Project.js
@@ -6,6 +6,7 @@ var ObjectWithListeners = require('../../ObjectWithListeners');
var Annotation = require("./Annotation");
var DataOverlay = require("./DataOverlay");
+var License = require("./License");
var Model = require('./MapModel');
var Functions = require('../../Functions');
@@ -89,7 +90,17 @@ Project.prototype.loadFromData = function (data) {
self.setProgress(data.progress);
self.setHasLogEntries(data.logEntries);
self.setMapCanvasType(data.mapCanvasType);
+ if (data.license !== null && data.license !== undefined) {
+ self.setLicense(new License(data.license));
+ }
self.setSharedInMinervaNet(data.sharedInMinervaNet);
+ if (data.license !== null && data.license !== undefined) {
+ self.setLicense(new License(data.license));
+ } else {
+ self.setLicense(null);
+ }
+ self.setCustomLicenseName(data.customLicenseName);
+ self.setCustomLicenseUrl(data.customLicenseUrl);
}
};
@@ -126,6 +137,7 @@ Project.prototype._update = function (data) {
self.setHasLogEntries(data.hasLogEntries());
self.setMapCanvasType(data.getMapCanvasType());
self.setSharedInMinervaNet(data.getSharedInMinervaNet());
+ self.setLicense(data.getLicense());
if (data.getModels() !== undefined) {
var models = data.getModels();
@@ -232,6 +244,38 @@ Project.prototype.setName = function (name) {
this._name = name;
};
+/**
+ *
+ * @returns {string}
+ */
+Project.prototype.getCustomLicenseName = function () {
+ return this._customLicenseName;
+};
+
+/**
+ *
+ * @param {string} customLicenseName
+ */
+Project.prototype.setCustomLicenseName = function (customLicenseName) {
+ this._customLicenseName = customLicenseName;
+};
+
+/**
+ *
+ * @returns {string}
+ */
+Project.prototype.getCustomLicenseUrl = function () {
+ return this._customLicenseUrl;
+};
+
+/**
+ *
+ * @param {string} customLicenseUrl
+ */
+Project.prototype.setCustomLicenseUrl = function (customLicenseUrl) {
+ this._customLicenseUrl = customLicenseUrl;
+};
+
/**
*
* @returns {MapModel[]}
@@ -426,6 +470,34 @@ Project.prototype.setNotifyEmail = function (notifyEmail) {
this._notifyEmail = notifyEmail;
};
+/**
+ *
+ * @returns {License}
+ */
+Project.prototype.getLicense = function () {
+ return this._license;
+};
+
+/**
+ *
+ * @returns {?number}
+ */
+Project.prototype.getLicenseId = function () {
+ if (this._license !== null && this._license !== undefined) {
+ return this._license.getId();
+ } else {
+ return null;
+ }
+};
+
+/**
+ *
+ * @param {License} license
+ */
+Project.prototype.setLicense = function (license) {
+ this._license = license;
+};
+
/**
*
* @param {DataOverlay} overlay
@@ -632,7 +704,7 @@ Project.prototype.getElementsPointingToSubmap = function (modelId, direct) {
}
if (!alreadyAdded) {
self._elementsPointingToSubmap[modelId][false].push(elementToAdd);
- if (id ===modelId) {
+ if (id === modelId) {
self._elementsPointingToSubmap[modelId][true].push(elementToAdd);
}
queue.push(elementToAdd.getModelId());
diff --git a/frontend-js/src/test/js/gui/admin/AddProjectDialog-test.js b/frontend-js/src/test/js/gui/admin/AddProjectDialog-test.js
index 7135ba2522896a0165906176d4f3066d06f7e3b0..965eaeb3b1e9e1e1d31a4e6e3d6a05d13d261693 100644
--- a/frontend-js/src/test/js/gui/admin/AddProjectDialog-test.js
+++ b/frontend-js/src/test/js/gui/admin/AddProjectDialog-test.js
@@ -106,6 +106,22 @@ describe('AddProjectDialog', function () {
return dialog.destroy();
});
});
+ it('zip with no map', function () {
+ var dialog = createDialog();
+
+ var buf = fs.readFileSync("testFiles/map/no-map.zip");
+ buf.name = "invalid-project.zip";
+ return dialog.init().then(function () {
+ return dialog.setZipFileContent(buf);
+ }).then(function () {
+ assert.ok(false);
+ }).catch(function (e) {
+ console.log(e);
+ assert.ok(e instanceof ValidationError);
+ }).finally(function () {
+ return dialog.destroy();
+ });
+ });
it('CellDesigner file', function () {
var dialog = createDialog();
diff --git a/frontend-js/src/test/js/minerva-test.js b/frontend-js/src/test/js/minerva-test.js
index e4bb33f9de107a5e657d0d80832d655f29792b80..baee879ef9f26ed0aff2a523ce78615f41a2b745 100644
--- a/frontend-js/src/test/js/minerva-test.js
+++ b/frontend-js/src/test/js/minerva-test.js
@@ -262,7 +262,7 @@ describe('minerva global', function () {
});
describe('createAdmin', function () {
- this.timeout(3000);
+ this.timeout(5000);
it('as admin', function () {
helper.loginAsAdmin();
var options = helper.createCustomMapOptions(null);
diff --git a/frontend-js/testFiles/apiCalls/licenses/?size=1000/token=ADMIN_TOKEN_ID& b/frontend-js/testFiles/apiCalls/licenses/?size=1000/token=ADMIN_TOKEN_ID&
new file mode 100644
index 0000000000000000000000000000000000000000..a50aace60fb1a908f67548964e8fb43a5f0376ca
--- /dev/null
+++ b/frontend-js/testFiles/apiCalls/licenses/?size=1000/token=ADMIN_TOKEN_ID&
@@ -0,0 +1 @@
+{"data":[{"id":1,"name":"CC0 1.0 Universal","content":"\n<h3><em>Statement of Purpose</em></h3>\n<p>The laws of most jurisdictions throughout the world\nautomatically confer exclusive Copyright and Related Rights\n(defined below) upon the creator and subsequent owner(s) (each\nand all, an \"owner\") of an original work of authorship and/or\na database (each, a \"Work\").</p>\n<p>Certain owners wish to permanently relinquish those rights\nto a Work for the purpose of contributing to a commons of\ncreative, cultural and scientific works (\"Commons\") that the\npublic can reliably and without fear of later claims of\ninfringement build upon, modify, incorporate in other works,\nreuse and redistribute as freely as possible in any form\nwhatsoever and for any purposes, including without limitation\ncommercial purposes. These owners may contribute to the\nCommons to promote the ideal of a free culture and the further\nproduction of creative, cultural and scientific works, or to\ngain reputation or greater distribution for their Work in part\nthrough the use and efforts of others.</p>\n<p>For these and/or other purposes and motivations, and\nwithout any expectation of additional consideration or\ncompensation, the person associating CC0 with a Work (the\n\"Affirmer\"), to the extent that he or she is an owner of\nCopyright and Related Rights in the Work, voluntarily elects\nto apply CC0 to the Work and publicly distribute the Work\nunder its terms, with knowledge of his or her Copyright and\nRelated Rights in the Work and the meaning and intended legal\neffect of CC0 on those rights.</p>\n<p><strong>1. Copyright and Related Rights.</strong>\nA Work made available under CC0 may be protected by\ncopyright and related or neighboring rights (\"Copyright and\nRelated Rights\"). Copyright and Related Rights include, but\nare not limited to, the following:\n</p>\n<ol type=\"i\">\n<li>the right to reproduce, adapt, distribute, perform,\ndisplay, communicate, and translate a Work;</li>\n<li> moral rights retained by the original author(s) and/or\nperformer(s);</li>\n<li>publicity and privacy rights pertaining to a person's\nimage or likeness depicted in a Work;</li>\n<li>rights protecting against unfair competition in regards\nto a Work, subject to the limitations in paragraph 4(a),\nbelow;</li>\n<li>rights protecting the extraction, dissemination, use and\nreuse of data in a Work;</li>\n<li>database rights (such as those arising under Directive\n96/9/EC of the European Parliament and of the Council of 11\nMarch 1996 on the legal protection of databases, and under\nany national implementation thereof, including any amended\nor successor version of such directive); and</li>\n<li>other similar, equivalent or corresponding rights\nthroughout the world based on applicable law or treaty, and\nany national implementations thereof.</li>\n</ol>\n<p><strong>2. Waiver.</strong> To the greatest extent\npermitted by, but not in contravention of, applicable law,\nAffirmer hereby overtly, fully, permanently, irrevocably and\nunconditionally waives, abandons, and surrenders all of\nAffirmer's Copyright and Related Rights and associated claims\nand causes of action, whether now known or unknown (including\nexisting as well as future claims and causes of action), in\nthe Work (i) in all territories worldwide, (ii) for the\nmaximum duration provided by applicable law or treaty\n(including future time extensions), (iii) in any current or\nfuture medium and for any number of copies, and (iv) for any\npurpose whatsoever, including without limitation commercial,\nadvertising or promotional purposes (the \"Waiver\"). Affirmer\nmakes the Waiver for the benefit of each member of the public\nat large and to the detriment of Affirmer's heirs and\nsuccessors, fully intending that such Waiver shall not be\nsubject to revocation, rescission, cancellation, termination,\nor any other legal or equitable action to disrupt the quiet\nenjoyment of the Work by the public as contemplated by\nAffirmer's express Statement of Purpose.\n</p>\n<p><strong>3. Public License Fallback.</strong> Should any\npart of the Waiver for any reason be judged legally invalid or\nineffective under applicable law, then the Waiver shall be\npreserved to the maximum extent permitted taking into account\nAffirmer's express Statement of Purpose. In addition, to the\nextent the Waiver is so judged Affirmer hereby grants to each\naffected person a royalty-free, non transferable, non\nsublicensable, non exclusive, irrevocable and unconditional\nlicense to exercise Affirmer's Copyright and Related Rights\nin the Work (i) in all territories worldwide, (ii) for the\nmaximum duration provided by applicable law or treaty\n(including future time extensions), (iii) in any current or\nfuture medium and for any number of copies, and (iv) for any\npurpose whatsoever, including without limitation commercial,\nadvertising or promotional purposes (the \"License\"). The\nLicense shall be deemed effective as of the date CC0 was\napplied by Affirmer to the Work. Should any part of the\nLicense for any reason be judged legally invalid or\nineffective under applicable law, such partial invalidity or\nineffectiveness shall not invalidate the remainder of the\nLicense, and in such case Affirmer hereby affirms that he or\nshe will not (i) exercise any of his or her remaining\nCopyright and Related Rights in the Work or (ii) assert any\nassociated claims and causes of action with respect to the\nWork, in either case contrary to Affirmer's express Statement\nof Purpose.</p>\n<p><strong>4. Limitations and Disclaimers.</strong></p>\n<ol type=\"a\">\n<li>No trademark or patent rights held by Affirmer are\nwaived, abandoned, surrendered, licensed or otherwise\naffected by this document.</li>\n<li>Affirmer offers the Work as-is and makes no\nrepresentations or warranties of any kind concerning the\nWork, express, implied, statutory or otherwise, including\nwithout limitation warranties of title, merchantability,\nfitness for a particular purpose, non infringement, or the\nabsence of latent or other defects, accuracy, or the present\nor absence of errors, whether or not discoverable, all to\nthe greatest extent permissible under applicable law.</li>\n<li>Affirmer disclaims responsibility for clearing rights of\nother persons that may apply to the Work or any use thereof,\nincluding without limitation any person's Copyright and\nRelated Rights in the Work. Further, Affirmer disclaims\nresponsibility for obtaining any necessary consents,\npermissions or other rights required for any use of the\nWork.</li>\n<li>Affirmer understands and acknowledges that Creative\nCommons is not a party to this document and has no duty or\nobligation with respect to this CC0 or use of the Work.</li>\n</ol>\n"},{"id":2,"name":"Creative Commons Attribution 4.0 International Public License","content":"\n<h3>Creative Commons Attribution 4.0 International Public License</h3>\n<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License (\"Public License\"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>\n<p id=\"s1\"><strong>Section 1 – Definitions.</strong></p>\n<ol type=\"a\">\n<li id=\"s1a\"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>\n<li id=\"s1b\"><strong>Adapter's License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>\n<li id=\"s1c\"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href=\"#s2b\">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>\n<li id=\"s1d\"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not\nbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar\ninternational agreements.</li>\n<li id=\"s1e\"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>\n<li id=\"s1f\"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>\n<li id=\"s1g\"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>\n<li id=\"s1h\"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>\n<li id=\"s1i\"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>\n<li id=\"s1j\"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>\n<li id=\"s1k\"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>\n</ol>\n<p id=\"s2\"><strong>Section 2 – Scope.</strong></p>\n<ol type=\"a\">\n<li id=\"s2a\"><strong>License grant</strong>.\n<ol>\n<li id=\"s2a1\">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:\n<ol type=\"A\">\n<li id=\"s2a1A\">reproduce and Share the Licensed Material, in whole or in part; and</li>\n<li id=\"s2a1B\">produce, reproduce, and Share Adapted Material.</li>\n</ol>\n</li><li id=\"s2a2\"><span style=\"text-decoration: underline;\">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>\n<li id=\"s2a3\"><span style=\"text-decoration: underline;\">Term</span>. The term of this Public License is specified in Section <a href=\"#s6a\">6(a)</a>.</li>\n<li id=\"s2a4\"><span style=\"text-decoration: underline;\">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href=\"#s2a4\">2(a)(4)</a> never produces Adapted Material.</li>\n<li id=\"s2a5\"><span style=\"text-decoration: underline;\">Downstream recipients</span>.\n<div class=\"para\">\n<ol type=\"A\">\n<li id=\"s2a5A\"><span style=\"text-decoration: underline;\">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>\n<li id=\"s2a5B\"><span style=\"text-decoration: underline;\">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>\n</ol>\n</div>\n</li><li id=\"s2a6\"><span style=\"text-decoration: underline;\">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href=\"#s3a1Ai\">3(a)(1)(A)(i)</a>.</li>\n</ol>\n</li><li id=\"s2b\"><p><strong>Other rights</strong>.</p>\n<ol>\n<li id=\"s2b1\">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>\n<li id=\"s2b2\">Patent and trademark rights are not licensed under this Public License.</li>\n<li id=\"s2b3\">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s3\"><strong>Section 3 – License Conditions.</strong></p>\n<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>\n<ol type=\"a\">\n<li id=\"s3a\"><p><strong>Attribution</strong>.</p>\n<ol>\n<li id=\"s3a1\"><p>If You Share the Licensed Material (including in modified form), You must:</p>\n<ol type=\"A\">\n<li id=\"s3a1A\">retain the following if it is supplied by the Licensor with the Licensed Material:\n<ol type=\"i\">\n<li id=\"s3a1Ai\">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>\n<li id=\"s3a1Aii\">a copyright notice;</li>\n<li id=\"s3a1Aiii\">a notice that refers to this Public License; </li>\n<li id=\"s3a1Aiv\">a notice that refers to the disclaimer of warranties;</li>\n<li id=\"s3a1Av\">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>\n</ol>\n</li><li id=\"s3a1B\">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>\n<li id=\"s3a1C\">indicate the Licensed Material is licensed under this Public License,\nand include the text of, or the URI or hyperlink to, this Public\nLicense.</li>\n</ol>\n</li>\n<li id=\"s3a2\">You may satisfy the conditions in Section <a href=\"#s3a1\">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>\n<li id=\"s3a3\">If requested by the Licensor, You must remove any of the information required by Section <a href=\"#s3a1A\">3(a)(1)(A)</a> to the extent reasonably practicable.</li>\n<li id=\"s3a4\">If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s4\"><strong>Section 4 – Sui Generis Database Rights.</strong></p>\n<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>\n<ol type=\"a\">\n<li id=\"s4a\">for the avoidance of doubt, Section <a href=\"#s2a1\">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;</li>\n<li id=\"s4b\">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>\n<li id=\"s4c\">You must comply with the conditions in Section <a href=\"#s3a\">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>\n</ol>\nFor the avoidance of doubt, this Section\n<a href=\"#s4\">4</a>\n supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.\n<p id=\"s5\"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>\n<ol style=\"font-weight: bold;\" type=\"a\">\n<li id=\"s5a\"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>\n<li id=\"s5b\"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>\n</ol>\n<ol start=\"3\" type=\"a\">\n<li id=\"s5c\">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>\n</ol>\n<p id=\"s6\"><strong>Section 6 – Term and Termination.</strong></p>\n<ol type=\"a\">\n<li id=\"s6a\">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>\n<li id=\"s6b\">\n<p>Where Your right to use the Licensed Material has terminated under Section <a href=\"#s6a\">6(a)</a>, it reinstates:</p>\n<ol>\n<li id=\"s6b1\">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>\n<li id=\"s6b2\">upon express reinstatement by the Licensor.</li>\n</ol>\nFor the avoidance of doubt, this Section <a href=\"#s6b\">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>\n<li id=\"s6c\">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>\n<li id=\"s6d\">Sections <a href=\"#s1\">1</a>, <a href=\"#s5\">5</a>, <a href=\"#s6\">6</a>, <a href=\"#s7\">7</a>, and <a href=\"#s8\">8</a> survive termination of this Public License.</li>\n</ol>\n<p id=\"s7\"><strong>Section 7 – Other Terms and Conditions.</strong></p>\n<ol type=\"a\">\n<li id=\"s7a\">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>\n<li id=\"s7b\">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>\n</ol>\n<p id=\"s8\"><strong>Section 8 – Interpretation.</strong></p>\n<ol type=\"a\">\n<li id=\"s8a\">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>\n<li id=\"s8b\">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>\n<li id=\"s8c\">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>\n<li id=\"s8d\">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>\n</ol>"},{"id":3,"name":"Creative Commons Attribution-ShareAlike 4.0 International Public License","content":"\n<h3>Creative Commons Attribution-ShareAlike 4.0 International Public License</h3>\n<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License (\"Public License\"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>\n<p id=\"s1\"><strong>Section 1 – Definitions.</strong></p>\n<ol type=\"a\">\n<li id=\"s1a\"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>\n<li id=\"s1b\"><strong>Adapter's License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>\n<li id=\"s1c\"><strong>BY-SA Compatible License</strong> means a license listed at <a href=\"//creativecommons.org/compatiblelicenses\"> creativecommons.org/compatiblelicenses</a>, approved by Creative Commons as essentially the equivalent of this Public License.</li>\n<li id=\"s1d\"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href=\"#s2b\">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>\n<li id=\"s1e\"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not\nbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar\ninternational agreements.</li>\n<li id=\"s1f\"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>\n<li id=\"s1g\"><strong>License Elements</strong> means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.</li>\n<li id=\"s1h\"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>\n<li id=\"s1i\"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>\n<li id=\"s1j\"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>\n<li id=\"s1k\"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>\n<li id=\"s1l\"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>\n<li id=\"s1m\"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>\n</ol>\n<p id=\"s2\"><strong>Section 2 – Scope.</strong></p>\n<ol type=\"a\">\n<li id=\"s2a\"><strong>License grant</strong>.\n<ol>\n<li id=\"s2a1\">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:\n<ol type=\"A\">\n<li id=\"s2a1A\">reproduce and Share the Licensed Material, in whole or in part; and</li>\n<li id=\"s2a1B\">produce, reproduce, and Share Adapted Material.</li>\n</ol>\n</li><li id=\"s2a2\"><span style=\"text-decoration: underline;\">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>\n<li id=\"s2a3\"><span style=\"text-decoration: underline;\">Term</span>. The term of this Public License is specified in Section <a href=\"#s6a\">6(a)</a>.</li>\n<li id=\"s2a4\"><span style=\"text-decoration: underline;\">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href=\"#s2a4\">2(a)(4)</a> never produces Adapted Material.</li>\n<li id=\"s2a5\"><span style=\"text-decoration: underline;\">Downstream recipients</span>.\n<div class=\"para\">\n<ol type=\"A\">\n<li id=\"s2a5A\"><span style=\"text-decoration: underline;\">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>\n<li id=\"s2a5B\"><span style=\"text-decoration: underline;\">Additional offer from the Licensor – Adapted Material</span>. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.</li>\n<li id=\"s2a5C\"><span style=\"text-decoration: underline;\">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>\n</ol>\n</div>\n</li><li id=\"s2a6\"><span style=\"text-decoration: underline;\">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href=\"#s3a1Ai\">3(a)(1)(A)(i)</a>.</li>\n</ol>\n</li><li id=\"s2b\"><p><strong>Other rights</strong>.</p>\n<ol>\n<li id=\"s2b1\">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>\n<li id=\"s2b2\">Patent and trademark rights are not licensed under this Public License.</li>\n<li id=\"s2b3\">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s3\"><strong>Section 3 – License Conditions.</strong></p>\n<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>\n<ol type=\"a\">\n<li id=\"s3a\"><p><strong>Attribution</strong>.</p>\n<ol>\n<li id=\"s3a1\"><p>If You Share the Licensed Material (including in modified form), You must:</p>\n<ol type=\"A\">\n<li id=\"s3a1A\">retain the following if it is supplied by the Licensor with the Licensed Material:\n<ol type=\"i\">\n<li id=\"s3a1Ai\">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>\n<li id=\"s3a1Aii\">a copyright notice;</li>\n<li id=\"s3a1Aiii\">a notice that refers to this Public License; </li>\n<li id=\"s3a1Aiv\">a notice that refers to the disclaimer of warranties;</li>\n<li id=\"s3a1Av\">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>\n</ol>\n</li><li id=\"s3a1B\">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>\n<li id=\"s3a1C\">indicate the Licensed Material is licensed under this Public License,\nand include the text of, or the URI or hyperlink to, this Public\nLicense.</li>\n</ol>\n</li>\n<li id=\"s3a2\">You may satisfy the conditions in Section <a href=\"#s3a1\">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>\n<li id=\"s3a3\">If requested by the Licensor, You must remove any of the information required by Section <a href=\"#s3a1A\">3(a)(1)(A)</a> to the extent reasonably practicable.</li>\n</ol>\n</li>\n<li id=\"s3b\"><strong>ShareAlike</strong>.\n<p>In addition to the conditions in Section <a href=\"#s3a\">3(a)</a>, if You Share Adapted Material You produce, the following conditions also apply.</p>\n<ol>\n<li id=\"s3b1\">The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.</li>\n<li id=\"s3b2\">You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.</li>\n<li id=\"s3b3\">You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.</li>\n</ol>\n</li>\n</ol>\n<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>\n<ol type=\"a\">\n<li id=\"s4a\">for the avoidance of doubt, Section <a href=\"#s2a1\">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;</li>\n<li id=\"s4b\">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section <a href=\"#s3b\">3(b)</a>; and</li>\n<li id=\"s4c\">You must comply with the conditions in Section <a href=\"#s3a\">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>\n</ol>\nFor the avoidance of doubt, this Section \n<a href=\"#s4\">4</a>\n supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.\n<p id=\"s5\"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>\n<ol style=\"font-weight: bold;\" type=\"a\">\n<li id=\"s5a\"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>\n<li id=\"s5b\"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>\n</ol>\n<ol start=\"3\" type=\"a\">\n<li id=\"s5c\">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>\n</ol>\n<p id=\"s6\"><strong>Section 6 – Term and Termination.</strong></p>\n<ol type=\"a\">\n<li id=\"s6a\">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>\n<li id=\"s6b\">\n<p>Where Your right to use the Licensed Material has terminated under Section <a href=\"#s6a\">6(a)</a>, it reinstates:</p>\n<ol>\n<li id=\"s6b1\">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>\n<li id=\"s6b2\">upon express reinstatement by the Licensor.</li>\n</ol>\nFor the avoidance of doubt, this Section <a href=\"#s6b\">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>\n<li id=\"s6c\">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>\n<li id=\"s6d\">Sections <a href=\"#s1\">1</a>, <a href=\"#s5\">5</a>, <a href=\"#s6\">6</a>, <a href=\"#s7\">7</a>, and <a href=\"#s8\">8</a> survive termination of this Public License.</li>\n</ol>\n<p id=\"s7\"><strong>Section 7 – Other Terms and Conditions.</strong></p>\n<ol type=\"a\">\n<li id=\"s7a\">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>\n<li id=\"s7b\">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>\n</ol>\n<p id=\"s8\"><strong>Section 8 – Interpretation.</strong></p>\n<ol type=\"a\">\n<li id=\"s8a\">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>\n<li id=\"s8b\">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>\n<li id=\"s8c\">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>\n<li id=\"s8d\">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>\n</ol>\n"},{"id":4,"name":"Creative Commons Attribution-NonCommercial 4.0 International","content":"\n<h3>Creative Commons Attribution-NonCommercial 4.0 International Public License</h3>\n<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial 4.0 International Public License (\"Public License\"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>\n<p id=\"s1\"><strong>Section 1 – Definitions.</strong></p>\n<ol type=\"a\">\n<li id=\"s1a\"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>\n<li id=\"s1b\"><strong>Adapter's License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>\n<li id=\"s1c\"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href=\"#s2b\">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>\n<li id=\"s1d\"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not\nbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar\ninternational agreements.</li>\n<li id=\"s1e\"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>\n<li id=\"s1f\"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>\n<li id=\"s1g\"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>\n<li id=\"s1h\"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>\n<li id=\"s1i\"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li>\n<li id=\"s1j\"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>\n<li id=\"s1k\"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>\n<li id=\"s1l\"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>\n</ol>\n<p id=\"s2\"><strong>Section 2 – Scope.</strong></p>\n<ol type=\"a\">\n<li id=\"s2a\"><strong>License grant</strong>.\n<ol>\n<li id=\"s2a1\">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:\n<ol type=\"A\">\n<li id=\"s2a1A\">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li>\n<li id=\"s2a1B\">produce, reproduce, and Share Adapted Material for NonCommercial purposes only.</li>\n</ol>\n</li><li id=\"s2a2\"><span style=\"text-decoration: underline;\">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>\n<li id=\"s2a3\"><span style=\"text-decoration: underline;\">Term</span>. The term of this Public License is specified in Section <a href=\"#s6a\">6(a)</a>.</li>\n<li id=\"s2a4\"><span style=\"text-decoration: underline;\">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href=\"#s2a4\">2(a)(4)</a> never produces Adapted Material.</li>\n<li id=\"s2a5\"><span style=\"text-decoration: underline;\">Downstream recipients</span>.\n<div class=\"para\">\n<ol type=\"A\">\n<li id=\"s2a5A\"><span style=\"text-decoration: underline;\">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>\n<li id=\"s2a5B\"><span style=\"text-decoration: underline;\">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>\n</ol>\n</div>\n</li><li id=\"s2a6\"><span style=\"text-decoration: underline;\">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href=\"#s3a1Ai\">3(a)(1)(A)(i)</a>.</li>\n</ol>\n</li><li id=\"s2b\"><p><strong>Other rights</strong>.</p>\n<ol>\n<li id=\"s2b1\">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>\n<li id=\"s2b2\">Patent and trademark rights are not licensed under this Public License.</li>\n<li id=\"s2b3\">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s3\"><strong>Section 3 – License Conditions.</strong></p>\n<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>\n<ol type=\"a\">\n<li id=\"s3a\"><p><strong>Attribution</strong>.</p>\n<ol>\n<li id=\"s3a1\"><p>If You Share the Licensed Material (including in modified form), You must:</p>\n<ol type=\"A\">\n<li id=\"s3a1A\">retain the following if it is supplied by the Licensor with the Licensed Material:\n<ol type=\"i\">\n<li id=\"s3a1Ai\">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>\n<li id=\"s3a1Aii\">a copyright notice;</li>\n<li id=\"s3a1Aiii\">a notice that refers to this Public License; </li>\n<li id=\"s3a1Aiv\">a notice that refers to the disclaimer of warranties;</li>\n<li id=\"s3a1Av\">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>\n</ol>\n</li><li id=\"s3a1B\">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>\n<li id=\"s3a1C\">indicate the Licensed Material is licensed under this Public License,\nand include the text of, or the URI or hyperlink to, this Public\nLicense.</li>\n</ol>\n</li>\n<li id=\"s3a2\">You may satisfy the conditions in Section <a href=\"#s3a1\">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>\n<li id=\"s3a3\">If requested by the Licensor, You must remove any of the information required by Section <a href=\"#s3a1A\">3(a)(1)(A)</a> to the extent reasonably practicable.</li>\n<li id=\"s3a4\">If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s4\"><strong>Section 4 – Sui Generis Database Rights.</strong></p>\n<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>\n<ol type=\"a\">\n<li id=\"s4a\">for the avoidance of doubt, Section <a href=\"#s2a1\">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only;</li>\n<li id=\"s4b\">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>\n<li id=\"s4c\">You must comply with the conditions in Section <a href=\"#s3a\">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>\n</ol>\nFor the avoidance of doubt, this Section \n<a href=\"#s4\">4</a>\n supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.\n<p id=\"s5\"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>\n<ol style=\"font-weight: bold;\" type=\"a\">\n<li id=\"s5a\"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>\n<li id=\"s5b\"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>\n</ol>\n<ol start=\"3\" type=\"a\">\n<li id=\"s5c\">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>\n</ol>\n<p id=\"s6\"><strong>Section 6 – Term and Termination.</strong></p>\n<ol type=\"a\">\n<li id=\"s6a\">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>\n<li id=\"s6b\">\n<p>Where Your right to use the Licensed Material has terminated under Section <a href=\"#s6a\">6(a)</a>, it reinstates:</p>\n<ol>\n<li id=\"s6b1\">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>\n<li id=\"s6b2\">upon express reinstatement by the Licensor.</li>\n</ol>\nFor the avoidance of doubt, this Section <a href=\"#s6b\">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>\n<li id=\"s6c\">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>\n<li id=\"s6d\">Sections <a href=\"#s1\">1</a>, <a href=\"#s5\">5</a>, <a href=\"#s6\">6</a>, <a href=\"#s7\">7</a>, and <a href=\"#s8\">8</a> survive termination of this Public License.</li>\n</ol>\n<p id=\"s7\"><strong>Section 7 – Other Terms and Conditions.</strong></p>\n<ol type=\"a\">\n<li id=\"s7a\">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>\n<li id=\"s7b\">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>\n</ol>\n<p id=\"s8\"><strong>Section 8 – Interpretation.</strong></p>\n<ol type=\"a\">\n<li id=\"s8a\">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>\n<li id=\"s8b\">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>\n<li id=\"s8c\">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>\n<li id=\"s8d\">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>\n</ol>\n"},{"id":5,"name":"Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License","content":"\n<h3>Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License</h3>\n<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License (\"Public License\"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>\n<p id=\"s1\"><strong>Section 1 – Definitions.</strong></p>\n<ol type=\"a\">\n<li id=\"s1a\"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>\n<li id=\"s1b\"><strong>Adapter's License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>\n<li id=\"s1c\"><strong>BY-NC-SA Compatible License</strong> means a license listed at <a href=\"//creativecommons.org/compatiblelicenses\"> creativecommons.org/compatiblelicenses</a>, approved by Creative Commons as essentially the equivalent of this Public License.</li>\n<li id=\"s1d\"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href=\"#s2b\">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>\n<li id=\"s1e\"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not\nbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar\ninternational agreements.</li>\n<li id=\"s1f\"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>\n<li id=\"s1g\"><strong>License Elements</strong> means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution, NonCommercial, and ShareAlike.</li>\n<li id=\"s1h\"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>\n<li id=\"s1i\"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>\n<li id=\"s1j\"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>\n<li id=\"s1k\"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li>\n<li id=\"s1l\"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>\n<li id=\"s1m\"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>\n<li id=\"s1n\"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>\n</ol>\n<p id=\"s2\"><strong>Section 2 – Scope.</strong></p>\n<ol type=\"a\">\n<li id=\"s2a\"><strong>License grant</strong>.\n<ol>\n<li id=\"s2a1\">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:\n<ol type=\"A\">\n<li id=\"s2a1A\">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li>\n<li id=\"s2a1B\">produce, reproduce, and Share Adapted Material for NonCommercial purposes only.</li>\n</ol>\n</li><li id=\"s2a2\"><span style=\"text-decoration: underline;\">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>\n<li id=\"s2a3\"><span style=\"text-decoration: underline;\">Term</span>. The term of this Public License is specified in Section <a href=\"#s6a\">6(a)</a>.</li>\n<li id=\"s2a4\"><span style=\"text-decoration: underline;\">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href=\"#s2a4\">2(a)(4)</a> never produces Adapted Material.</li>\n<li id=\"s2a5\"><span style=\"text-decoration: underline;\">Downstream recipients</span>.\n<div class=\"para\">\n<ol type=\"A\">\n<li id=\"s2a5A\"><span style=\"text-decoration: underline;\">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>\n<li id=\"s2a5B\"><span style=\"text-decoration: underline;\">Additional offer from the Licensor – Adapted Material</span>. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.</li>\n<li id=\"s2a5C\"><span style=\"text-decoration: underline;\">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>\n</ol>\n</div>\n</li><li id=\"s2a6\"><span style=\"text-decoration: underline;\">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href=\"#s3a1Ai\">3(a)(1)(A)(i)</a>.</li>\n</ol>\n</li><li id=\"s2b\"><p><strong>Other rights</strong>.</p>\n<ol>\n<li id=\"s2b1\">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>\n<li id=\"s2b2\">Patent and trademark rights are not licensed under this Public License.</li>\n<li id=\"s2b3\">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s3\"><strong>Section 3 – License Conditions.</strong></p>\n<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>\n<ol type=\"a\">\n<li id=\"s3a\"><p><strong>Attribution</strong>.</p>\n<ol>\n<li id=\"s3a1\"><p>If You Share the Licensed Material (including in modified form), You must:</p>\n<ol type=\"A\">\n<li id=\"s3a1A\">retain the following if it is supplied by the Licensor with the Licensed Material:\n<ol type=\"i\">\n<li id=\"s3a1Ai\">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>\n<li id=\"s3a1Aii\">a copyright notice;</li>\n<li id=\"s3a1Aiii\">a notice that refers to this Public License; </li>\n<li id=\"s3a1Aiv\">a notice that refers to the disclaimer of warranties;</li>\n<li id=\"s3a1Av\">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>\n</ol>\n</li><li id=\"s3a1B\">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>\n<li id=\"s3a1C\">indicate the Licensed Material is licensed under this Public License,\nand include the text of, or the URI or hyperlink to, this Public\nLicense.</li>\n</ol>\n</li>\n<li id=\"s3a2\">You may satisfy the conditions in Section <a href=\"#s3a1\">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>\n<li id=\"s3a3\">If requested by the Licensor, You must remove any of the information required by Section <a href=\"#s3a1A\">3(a)(1)(A)</a> to the extent reasonably practicable.</li>\n</ol>\n</li>\n<li id=\"s3b\"><strong>ShareAlike</strong>.\n<p>In addition to the conditions in Section <a href=\"#s3a\">3(a)</a>, if You Share Adapted Material You produce, the following conditions also apply.</p>\n<ol>\n<li id=\"s3b1\">The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-NC-SA Compatible License.</li>\n<li id=\"s3b2\">You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.</li>\n<li id=\"s3b3\">You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s4\"><strong>Section 4 – Sui Generis Database Rights.</strong></p>\n<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>\n<ol type=\"a\">\n<li id=\"s4a\">for the avoidance of doubt, Section <a href=\"#s2a1\">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only;</li>\n<li id=\"s4b\">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section <a href=\"#s3b\">3(b)</a>; and</li>\n<li id=\"s4c\">You must comply with the conditions in Section <a href=\"#s3a\">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>\n</ol>\nFor the avoidance of doubt, this Section \n<a href=\"#s4\">4</a>\n supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.\n<p id=\"s5\"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>\n<ol style=\"font-weight: bold;\" type=\"a\">\n<li id=\"s5a\"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>\n<li id=\"s5b\"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>\n</ol>\n<ol start=\"3\" type=\"a\">\n<li id=\"s5c\">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>\n</ol>\n<p id=\"s6\"><strong>Section 6 – Term and Termination.</strong></p>\n<ol type=\"a\">\n<li id=\"s6a\">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>\n<li id=\"s6b\">\n<p>Where Your right to use the Licensed Material has terminated under Section <a href=\"#s6a\">6(a)</a>, it reinstates:</p>\n<ol>\n<li id=\"s6b1\">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>\n<li id=\"s6b2\">upon express reinstatement by the Licensor.</li>\n</ol>\nFor the avoidance of doubt, this Section <a href=\"#s6b\">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>\n<li id=\"s6c\">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>\n<li id=\"s6d\">Sections <a href=\"#s1\">1</a>, <a href=\"#s5\">5</a>, <a href=\"#s6\">6</a>, <a href=\"#s7\">7</a>, and <a href=\"#s8\">8</a> survive termination of this Public License.</li>\n</ol>\n<p id=\"s7\"><strong>Section 7 – Other Terms and Conditions.</strong></p>\n<ol type=\"a\">\n<li id=\"s7a\">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>\n<li id=\"s7b\">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>\n</ol>\n<p id=\"s8\"><strong>Section 8 – Interpretation.</strong></p>\n<ol type=\"a\">\n<li id=\"s8a\">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>\n<li id=\"s8b\">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>\n<li id=\"s8c\">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>\n<li id=\"s8d\">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>\n</ol>\n"},{"id":6,"name":"Creative Commons Attribution-NoDerivatives 4.0 International Public License","content":"\n<h3>Creative Commons Attribution-NoDerivatives 4.0 International Public License</h3>\n<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NoDerivatives 4.0 International Public License (\"Public License\"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>\n<p id=\"s1\"><strong>Section 1 – Definitions.</strong></p>\n<ol type=\"a\">\n<li id=\"s1a\"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>\n<li id=\"s1b\"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href=\"#s2b\">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>\n<li id=\"s1c\"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not\nbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar\ninternational agreements.</li>\n<li id=\"s1d\"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>\n<li id=\"s1e\"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>\n<li id=\"s1f\"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>\n<li id=\"s1g\"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>\n<li id=\"s1h\"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>\n<li id=\"s1i\"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>\n<li id=\"s1j\"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>\n</ol>\n<p id=\"s2\"><strong>Section 2 – Scope.</strong></p>\n<ol type=\"a\">\n<li id=\"s2a\"><strong>License grant</strong>.\n<ol>\n<li id=\"s2a1\">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:\n<ol type=\"A\">\n<li id=\"s2a1A\">reproduce and Share the Licensed Material, in whole or in part; and</li>\n<li id=\"s2a1B\">produce and reproduce, but not Share, Adapted Material.</li>\n</ol>\n</li><li id=\"s2a2\"><span style=\"text-decoration: underline;\">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>\n<li id=\"s2a3\"><span style=\"text-decoration: underline;\">Term</span>. The term of this Public License is specified in Section <a href=\"#s6a\">6(a)</a>.</li>\n<li id=\"s2a4\"><span style=\"text-decoration: underline;\">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href=\"#s2a4\">2(a)(4)</a> never produces Adapted Material.</li>\n<li id=\"s2a5\"><span style=\"text-decoration: underline;\">Downstream recipients</span>.\n<div class=\"para\">\n<ol type=\"A\">\n<li id=\"s2a5A\"><span style=\"text-decoration: underline;\">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>\n<li id=\"s2a5B\"><span style=\"text-decoration: underline;\">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>\n</ol>\n</div>\n</li><li id=\"s2a6\"><span style=\"text-decoration: underline;\">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href=\"#s3a1Ai\">3(a)(1)(A)(i)</a>.</li>\n</ol>\n</li><li id=\"s2b\"><p><strong>Other rights</strong>.</p>\n<ol>\n<li id=\"s2b1\">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>\n<li id=\"s2b2\">Patent and trademark rights are not licensed under this Public License.</li>\n<li id=\"s2b3\">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s3\"><strong>Section 3 – License Conditions.</strong></p>\n<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>\n<ol type=\"a\">\n<li id=\"s3a\"><p><strong>Attribution</strong>.</p>\n<ol>\n<li id=\"s3a1\"><p>If You Share the Licensed Material, You must:</p>\n<ol type=\"A\">\n<li id=\"s3a1A\">retain the following if it is supplied by the Licensor with the Licensed Material:\n<ol type=\"i\">\n<li id=\"s3a1Ai\">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>\n<li id=\"s3a1Aii\">a copyright notice;</li>\n<li id=\"s3a1Aiii\">a notice that refers to this Public License; </li>\n<li id=\"s3a1Aiv\">a notice that refers to the disclaimer of warranties;</li>\n<li id=\"s3a1Av\">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>\n</ol>\n</li><li id=\"s3a1B\">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>\n<li id=\"s3a1C\">indicate the Licensed Material is licensed under this Public License,\nand include the text of, or the URI or hyperlink to, this Public\nLicense.</li>\n</ol>\nFor the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material.\n</li>\n<li id=\"s3a2\">You may satisfy the conditions in Section <a href=\"#s3a1\">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>\n<li id=\"s3a3\">If requested by the Licensor, You must remove any of the information required by Section <a href=\"#s3a1A\">3(a)(1)(A)</a> to the extent reasonably practicable.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s4\"><strong>Section 4 – Sui Generis Database Rights.</strong></p>\n<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>\n<ol type=\"a\">\n<li id=\"s4a\">for the avoidance of doubt, Section <a href=\"#s2a1\">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database, provided You do not Share Adapted Material;</li>\n<li id=\"s4b\">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>\n<li id=\"s4c\">You must comply with the conditions in Section <a href=\"#s3a\">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>\n</ol>\nFor the avoidance of doubt, this Section\n<a href=\"#s4\">4</a>\n supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.\n<p id=\"s5\"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>\n<ol style=\"font-weight: bold;\" type=\"a\">\n<li id=\"s5a\"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>\n<li id=\"s5b\"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>\n</ol>\n<ol start=\"3\" type=\"a\">\n<li id=\"s5c\">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>\n</ol>\n<p id=\"s6\"><strong>Section 6 – Term and Termination.</strong></p>\n<ol type=\"a\">\n<li id=\"s6a\">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>\n<li id=\"s6b\">\n<p>Where Your right to use the Licensed Material has terminated under Section <a href=\"#s6a\">6(a)</a>, it reinstates:</p>\n<ol>\n<li id=\"s6b1\">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>\n<li id=\"s6b2\">upon express reinstatement by the Licensor.</li>\n</ol>\nFor the avoidance of doubt, this Section <a href=\"#s6b\">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>\n<li id=\"s6c\">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>\n<li id=\"s6d\">Sections <a href=\"#s1\">1</a>, <a href=\"#s5\">5</a>, <a href=\"#s6\">6</a>, <a href=\"#s7\">7</a>, and <a href=\"#s8\">8</a> survive termination of this Public License.</li>\n</ol>\n<p id=\"s7\"><strong>Section 7 – Other Terms and Conditions.</strong></p>\n<ol type=\"a\">\n<li id=\"s7a\">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>\n<li id=\"s7b\">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>\n</ol>\n<p id=\"s8\"><strong>Section 8 – Interpretation.</strong></p>\n<ol type=\"a\">\n<li id=\"s8a\">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>\n<li id=\"s8b\">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>\n<li id=\"s8c\">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>\n<li id=\"s8d\">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>\n</ol>\n"},{"id":7,"name":"Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License","content":"\n<h3>Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License</h3>\n<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License (\"Public License\"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>\n<p id=\"s1\"><strong>Section 1 – Definitions.</strong></p>\n<ol type=\"a\">\n<li id=\"s1a\"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>\n<li id=\"s1b\"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href=\"#s2b\">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>\n<li id=\"s1c\"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not\nbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar\ninternational agreements.</li>\n<li id=\"s1d\"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>\n<li id=\"s1e\"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>\n<li id=\"s1f\"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>\n<li id=\"s1g\"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>\n<li id=\"s1h\"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li>\n<li id=\"s1i\"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>\n<li id=\"s1j\"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>\n<li id=\"s1k\"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>\n</ol>\n<p id=\"s2\"><strong>Section 2 – Scope.</strong></p>\n<ol type=\"a\">\n<li id=\"s2a\"><strong>License grant</strong>.\n<ol>\n<li id=\"s2a1\">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:\n<ol type=\"A\">\n<li id=\"s2a1A\">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li>\n<li id=\"s2a1B\">produce and reproduce, but not Share, Adapted Material for NonCommercial purposes only.</li>\n</ol>\n</li><li id=\"s2a2\"><span style=\"text-decoration: underline;\">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>\n<li id=\"s2a3\"><span style=\"text-decoration: underline;\">Term</span>. The term of this Public License is specified in Section <a href=\"#s6a\">6(a)</a>.</li>\n<li id=\"s2a4\"><span style=\"text-decoration: underline;\">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href=\"#s2a4\">2(a)(4)</a> never produces Adapted Material.</li>\n<li id=\"s2a5\"><span style=\"text-decoration: underline;\">Downstream recipients</span>.\n<div class=\"para\">\n<ol type=\"A\">\n<li id=\"s2a5A\"><span style=\"text-decoration: underline;\">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>\n<li id=\"s2a5B\"><span style=\"text-decoration: underline;\">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>\n</ol>\n</div>\n</li><li id=\"s2a6\"><span style=\"text-decoration: underline;\">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href=\"#s3a1Ai\">3(a)(1)(A)(i)</a>.</li>\n</ol>\n</li><li id=\"s2b\"><p><strong>Other rights</strong>.</p>\n<ol>\n<li id=\"s2b1\">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>\n<li id=\"s2b2\">Patent and trademark rights are not licensed under this Public License.</li>\n<li id=\"s2b3\">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s3\"><strong>Section 3 – License Conditions.</strong></p>\n<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>\n<ol type=\"a\">\n<li id=\"s3a\"><p><strong>Attribution</strong>.</p>\n<ol>\n<li id=\"s3a1\"><p>If You Share the Licensed Material, You must:</p>\n<ol type=\"A\">\n<li id=\"s3a1A\">retain the following if it is supplied by the Licensor with the Licensed Material:\n<ol type=\"i\">\n<li id=\"s3a1Ai\">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>\n<li id=\"s3a1Aii\">a copyright notice;</li>\n<li id=\"s3a1Aiii\">a notice that refers to this Public License; </li>\n<li id=\"s3a1Aiv\">a notice that refers to the disclaimer of warranties;</li>\n<li id=\"s3a1Av\">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>\n</ol>\n</li><li id=\"s3a1B\">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>\n<li id=\"s3a1C\">indicate the Licensed Material is licensed under this Public License,\nand include the text of, or the URI or hyperlink to, this Public\nLicense.</li>\n</ol>\nFor the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material.\n</li>\n<li id=\"s3a2\">You may satisfy the conditions in Section <a href=\"#s3a1\">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>\n<li id=\"s3a3\">If requested by the Licensor, You must remove any of the information required by Section <a href=\"#s3a1A\">3(a)(1)(A)</a> to the extent reasonably practicable.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s4\"><strong>Section 4 – Sui Generis Database Rights.</strong></p>\n<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>\n<ol type=\"a\">\n<li id=\"s4a\">for the avoidance of doubt, Section <a href=\"#s2a1\">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only and provided You do not Share Adapted Material;</li>\n<li id=\"s4b\">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>\n<li id=\"s4c\">You must comply with the conditions in Section <a href=\"#s3a\">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>\n</ol>\nFor the avoidance of doubt, this Section \n<a href=\"#s4\">4</a>\n supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.\n<p id=\"s5\"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>\n<ol style=\"font-weight: bold;\" type=\"a\">\n<li id=\"s5a\"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>\n<li id=\"s5b\"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>\n</ol>\n<ol start=\"3\" type=\"a\">\n<li id=\"s5c\">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>\n</ol>\n<p id=\"s6\"><strong>Section 6 – Term and Termination.</strong></p>\n<ol type=\"a\">\n<li id=\"s6a\">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>\n<li id=\"s6b\">\n<p>Where Your right to use the Licensed Material has terminated under Section <a href=\"#s6a\">6(a)</a>, it reinstates:</p>\n<ol>\n<li id=\"s6b1\">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>\n<li id=\"s6b2\">upon express reinstatement by the Licensor.</li>\n</ol>\nFor the avoidance of doubt, this Section <a href=\"#s6b\">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>\n<li id=\"s6c\">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>\n<li id=\"s6d\">Sections <a href=\"#s1\">1</a>, <a href=\"#s5\">5</a>, <a href=\"#s6\">6</a>, <a href=\"#s7\">7</a>, and <a href=\"#s8\">8</a> survive termination of this Public License.</li>\n</ol>\n<p id=\"s7\"><strong>Section 7 – Other Terms and Conditions.</strong></p>\n<ol type=\"a\">\n<li id=\"s7a\">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>\n<li id=\"s7b\">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>\n</ol>\n<p id=\"s8\"><strong>Section 8 – Interpretation.</strong></p>\n<ol type=\"a\">\n<li id=\"s8a\">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>\n<li id=\"s8b\">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>\n<li id=\"s8c\">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>\n<li id=\"s8d\">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>\n</ol>\n"}],"totalSize":1,"filteredSize":0,"length":1000,"page":0}
\ No newline at end of file
diff --git a/frontend-js/testFiles/apiCalls/licenses/?size=1000/token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/licenses/?size=1000/token=MOCK_TOKEN_ID&
new file mode 100644
index 0000000000000000000000000000000000000000..a50aace60fb1a908f67548964e8fb43a5f0376ca
--- /dev/null
+++ b/frontend-js/testFiles/apiCalls/licenses/?size=1000/token=MOCK_TOKEN_ID&
@@ -0,0 +1 @@
+{"data":[{"id":1,"name":"CC0 1.0 Universal","content":"\n<h3><em>Statement of Purpose</em></h3>\n<p>The laws of most jurisdictions throughout the world\nautomatically confer exclusive Copyright and Related Rights\n(defined below) upon the creator and subsequent owner(s) (each\nand all, an \"owner\") of an original work of authorship and/or\na database (each, a \"Work\").</p>\n<p>Certain owners wish to permanently relinquish those rights\nto a Work for the purpose of contributing to a commons of\ncreative, cultural and scientific works (\"Commons\") that the\npublic can reliably and without fear of later claims of\ninfringement build upon, modify, incorporate in other works,\nreuse and redistribute as freely as possible in any form\nwhatsoever and for any purposes, including without limitation\ncommercial purposes. These owners may contribute to the\nCommons to promote the ideal of a free culture and the further\nproduction of creative, cultural and scientific works, or to\ngain reputation or greater distribution for their Work in part\nthrough the use and efforts of others.</p>\n<p>For these and/or other purposes and motivations, and\nwithout any expectation of additional consideration or\ncompensation, the person associating CC0 with a Work (the\n\"Affirmer\"), to the extent that he or she is an owner of\nCopyright and Related Rights in the Work, voluntarily elects\nto apply CC0 to the Work and publicly distribute the Work\nunder its terms, with knowledge of his or her Copyright and\nRelated Rights in the Work and the meaning and intended legal\neffect of CC0 on those rights.</p>\n<p><strong>1. Copyright and Related Rights.</strong>\nA Work made available under CC0 may be protected by\ncopyright and related or neighboring rights (\"Copyright and\nRelated Rights\"). Copyright and Related Rights include, but\nare not limited to, the following:\n</p>\n<ol type=\"i\">\n<li>the right to reproduce, adapt, distribute, perform,\ndisplay, communicate, and translate a Work;</li>\n<li> moral rights retained by the original author(s) and/or\nperformer(s);</li>\n<li>publicity and privacy rights pertaining to a person's\nimage or likeness depicted in a Work;</li>\n<li>rights protecting against unfair competition in regards\nto a Work, subject to the limitations in paragraph 4(a),\nbelow;</li>\n<li>rights protecting the extraction, dissemination, use and\nreuse of data in a Work;</li>\n<li>database rights (such as those arising under Directive\n96/9/EC of the European Parliament and of the Council of 11\nMarch 1996 on the legal protection of databases, and under\nany national implementation thereof, including any amended\nor successor version of such directive); and</li>\n<li>other similar, equivalent or corresponding rights\nthroughout the world based on applicable law or treaty, and\nany national implementations thereof.</li>\n</ol>\n<p><strong>2. Waiver.</strong> To the greatest extent\npermitted by, but not in contravention of, applicable law,\nAffirmer hereby overtly, fully, permanently, irrevocably and\nunconditionally waives, abandons, and surrenders all of\nAffirmer's Copyright and Related Rights and associated claims\nand causes of action, whether now known or unknown (including\nexisting as well as future claims and causes of action), in\nthe Work (i) in all territories worldwide, (ii) for the\nmaximum duration provided by applicable law or treaty\n(including future time extensions), (iii) in any current or\nfuture medium and for any number of copies, and (iv) for any\npurpose whatsoever, including without limitation commercial,\nadvertising or promotional purposes (the \"Waiver\"). Affirmer\nmakes the Waiver for the benefit of each member of the public\nat large and to the detriment of Affirmer's heirs and\nsuccessors, fully intending that such Waiver shall not be\nsubject to revocation, rescission, cancellation, termination,\nor any other legal or equitable action to disrupt the quiet\nenjoyment of the Work by the public as contemplated by\nAffirmer's express Statement of Purpose.\n</p>\n<p><strong>3. Public License Fallback.</strong> Should any\npart of the Waiver for any reason be judged legally invalid or\nineffective under applicable law, then the Waiver shall be\npreserved to the maximum extent permitted taking into account\nAffirmer's express Statement of Purpose. In addition, to the\nextent the Waiver is so judged Affirmer hereby grants to each\naffected person a royalty-free, non transferable, non\nsublicensable, non exclusive, irrevocable and unconditional\nlicense to exercise Affirmer's Copyright and Related Rights\nin the Work (i) in all territories worldwide, (ii) for the\nmaximum duration provided by applicable law or treaty\n(including future time extensions), (iii) in any current or\nfuture medium and for any number of copies, and (iv) for any\npurpose whatsoever, including without limitation commercial,\nadvertising or promotional purposes (the \"License\"). The\nLicense shall be deemed effective as of the date CC0 was\napplied by Affirmer to the Work. Should any part of the\nLicense for any reason be judged legally invalid or\nineffective under applicable law, such partial invalidity or\nineffectiveness shall not invalidate the remainder of the\nLicense, and in such case Affirmer hereby affirms that he or\nshe will not (i) exercise any of his or her remaining\nCopyright and Related Rights in the Work or (ii) assert any\nassociated claims and causes of action with respect to the\nWork, in either case contrary to Affirmer's express Statement\nof Purpose.</p>\n<p><strong>4. Limitations and Disclaimers.</strong></p>\n<ol type=\"a\">\n<li>No trademark or patent rights held by Affirmer are\nwaived, abandoned, surrendered, licensed or otherwise\naffected by this document.</li>\n<li>Affirmer offers the Work as-is and makes no\nrepresentations or warranties of any kind concerning the\nWork, express, implied, statutory or otherwise, including\nwithout limitation warranties of title, merchantability,\nfitness for a particular purpose, non infringement, or the\nabsence of latent or other defects, accuracy, or the present\nor absence of errors, whether or not discoverable, all to\nthe greatest extent permissible under applicable law.</li>\n<li>Affirmer disclaims responsibility for clearing rights of\nother persons that may apply to the Work or any use thereof,\nincluding without limitation any person's Copyright and\nRelated Rights in the Work. Further, Affirmer disclaims\nresponsibility for obtaining any necessary consents,\npermissions or other rights required for any use of the\nWork.</li>\n<li>Affirmer understands and acknowledges that Creative\nCommons is not a party to this document and has no duty or\nobligation with respect to this CC0 or use of the Work.</li>\n</ol>\n"},{"id":2,"name":"Creative Commons Attribution 4.0 International Public License","content":"\n<h3>Creative Commons Attribution 4.0 International Public License</h3>\n<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License (\"Public License\"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>\n<p id=\"s1\"><strong>Section 1 – Definitions.</strong></p>\n<ol type=\"a\">\n<li id=\"s1a\"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>\n<li id=\"s1b\"><strong>Adapter's License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>\n<li id=\"s1c\"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href=\"#s2b\">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>\n<li id=\"s1d\"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not\nbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar\ninternational agreements.</li>\n<li id=\"s1e\"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>\n<li id=\"s1f\"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>\n<li id=\"s1g\"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>\n<li id=\"s1h\"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>\n<li id=\"s1i\"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>\n<li id=\"s1j\"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>\n<li id=\"s1k\"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>\n</ol>\n<p id=\"s2\"><strong>Section 2 – Scope.</strong></p>\n<ol type=\"a\">\n<li id=\"s2a\"><strong>License grant</strong>.\n<ol>\n<li id=\"s2a1\">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:\n<ol type=\"A\">\n<li id=\"s2a1A\">reproduce and Share the Licensed Material, in whole or in part; and</li>\n<li id=\"s2a1B\">produce, reproduce, and Share Adapted Material.</li>\n</ol>\n</li><li id=\"s2a2\"><span style=\"text-decoration: underline;\">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>\n<li id=\"s2a3\"><span style=\"text-decoration: underline;\">Term</span>. The term of this Public License is specified in Section <a href=\"#s6a\">6(a)</a>.</li>\n<li id=\"s2a4\"><span style=\"text-decoration: underline;\">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href=\"#s2a4\">2(a)(4)</a> never produces Adapted Material.</li>\n<li id=\"s2a5\"><span style=\"text-decoration: underline;\">Downstream recipients</span>.\n<div class=\"para\">\n<ol type=\"A\">\n<li id=\"s2a5A\"><span style=\"text-decoration: underline;\">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>\n<li id=\"s2a5B\"><span style=\"text-decoration: underline;\">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>\n</ol>\n</div>\n</li><li id=\"s2a6\"><span style=\"text-decoration: underline;\">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href=\"#s3a1Ai\">3(a)(1)(A)(i)</a>.</li>\n</ol>\n</li><li id=\"s2b\"><p><strong>Other rights</strong>.</p>\n<ol>\n<li id=\"s2b1\">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>\n<li id=\"s2b2\">Patent and trademark rights are not licensed under this Public License.</li>\n<li id=\"s2b3\">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s3\"><strong>Section 3 – License Conditions.</strong></p>\n<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>\n<ol type=\"a\">\n<li id=\"s3a\"><p><strong>Attribution</strong>.</p>\n<ol>\n<li id=\"s3a1\"><p>If You Share the Licensed Material (including in modified form), You must:</p>\n<ol type=\"A\">\n<li id=\"s3a1A\">retain the following if it is supplied by the Licensor with the Licensed Material:\n<ol type=\"i\">\n<li id=\"s3a1Ai\">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>\n<li id=\"s3a1Aii\">a copyright notice;</li>\n<li id=\"s3a1Aiii\">a notice that refers to this Public License; </li>\n<li id=\"s3a1Aiv\">a notice that refers to the disclaimer of warranties;</li>\n<li id=\"s3a1Av\">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>\n</ol>\n</li><li id=\"s3a1B\">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>\n<li id=\"s3a1C\">indicate the Licensed Material is licensed under this Public License,\nand include the text of, or the URI or hyperlink to, this Public\nLicense.</li>\n</ol>\n</li>\n<li id=\"s3a2\">You may satisfy the conditions in Section <a href=\"#s3a1\">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>\n<li id=\"s3a3\">If requested by the Licensor, You must remove any of the information required by Section <a href=\"#s3a1A\">3(a)(1)(A)</a> to the extent reasonably practicable.</li>\n<li id=\"s3a4\">If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s4\"><strong>Section 4 – Sui Generis Database Rights.</strong></p>\n<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>\n<ol type=\"a\">\n<li id=\"s4a\">for the avoidance of doubt, Section <a href=\"#s2a1\">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;</li>\n<li id=\"s4b\">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>\n<li id=\"s4c\">You must comply with the conditions in Section <a href=\"#s3a\">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>\n</ol>\nFor the avoidance of doubt, this Section\n<a href=\"#s4\">4</a>\n supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.\n<p id=\"s5\"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>\n<ol style=\"font-weight: bold;\" type=\"a\">\n<li id=\"s5a\"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>\n<li id=\"s5b\"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>\n</ol>\n<ol start=\"3\" type=\"a\">\n<li id=\"s5c\">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>\n</ol>\n<p id=\"s6\"><strong>Section 6 – Term and Termination.</strong></p>\n<ol type=\"a\">\n<li id=\"s6a\">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>\n<li id=\"s6b\">\n<p>Where Your right to use the Licensed Material has terminated under Section <a href=\"#s6a\">6(a)</a>, it reinstates:</p>\n<ol>\n<li id=\"s6b1\">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>\n<li id=\"s6b2\">upon express reinstatement by the Licensor.</li>\n</ol>\nFor the avoidance of doubt, this Section <a href=\"#s6b\">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>\n<li id=\"s6c\">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>\n<li id=\"s6d\">Sections <a href=\"#s1\">1</a>, <a href=\"#s5\">5</a>, <a href=\"#s6\">6</a>, <a href=\"#s7\">7</a>, and <a href=\"#s8\">8</a> survive termination of this Public License.</li>\n</ol>\n<p id=\"s7\"><strong>Section 7 – Other Terms and Conditions.</strong></p>\n<ol type=\"a\">\n<li id=\"s7a\">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>\n<li id=\"s7b\">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>\n</ol>\n<p id=\"s8\"><strong>Section 8 – Interpretation.</strong></p>\n<ol type=\"a\">\n<li id=\"s8a\">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>\n<li id=\"s8b\">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>\n<li id=\"s8c\">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>\n<li id=\"s8d\">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>\n</ol>"},{"id":3,"name":"Creative Commons Attribution-ShareAlike 4.0 International Public License","content":"\n<h3>Creative Commons Attribution-ShareAlike 4.0 International Public License</h3>\n<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License (\"Public License\"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>\n<p id=\"s1\"><strong>Section 1 – Definitions.</strong></p>\n<ol type=\"a\">\n<li id=\"s1a\"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>\n<li id=\"s1b\"><strong>Adapter's License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>\n<li id=\"s1c\"><strong>BY-SA Compatible License</strong> means a license listed at <a href=\"//creativecommons.org/compatiblelicenses\"> creativecommons.org/compatiblelicenses</a>, approved by Creative Commons as essentially the equivalent of this Public License.</li>\n<li id=\"s1d\"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href=\"#s2b\">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>\n<li id=\"s1e\"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not\nbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar\ninternational agreements.</li>\n<li id=\"s1f\"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>\n<li id=\"s1g\"><strong>License Elements</strong> means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.</li>\n<li id=\"s1h\"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>\n<li id=\"s1i\"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>\n<li id=\"s1j\"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>\n<li id=\"s1k\"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>\n<li id=\"s1l\"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>\n<li id=\"s1m\"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>\n</ol>\n<p id=\"s2\"><strong>Section 2 – Scope.</strong></p>\n<ol type=\"a\">\n<li id=\"s2a\"><strong>License grant</strong>.\n<ol>\n<li id=\"s2a1\">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:\n<ol type=\"A\">\n<li id=\"s2a1A\">reproduce and Share the Licensed Material, in whole or in part; and</li>\n<li id=\"s2a1B\">produce, reproduce, and Share Adapted Material.</li>\n</ol>\n</li><li id=\"s2a2\"><span style=\"text-decoration: underline;\">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>\n<li id=\"s2a3\"><span style=\"text-decoration: underline;\">Term</span>. The term of this Public License is specified in Section <a href=\"#s6a\">6(a)</a>.</li>\n<li id=\"s2a4\"><span style=\"text-decoration: underline;\">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href=\"#s2a4\">2(a)(4)</a> never produces Adapted Material.</li>\n<li id=\"s2a5\"><span style=\"text-decoration: underline;\">Downstream recipients</span>.\n<div class=\"para\">\n<ol type=\"A\">\n<li id=\"s2a5A\"><span style=\"text-decoration: underline;\">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>\n<li id=\"s2a5B\"><span style=\"text-decoration: underline;\">Additional offer from the Licensor – Adapted Material</span>. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.</li>\n<li id=\"s2a5C\"><span style=\"text-decoration: underline;\">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>\n</ol>\n</div>\n</li><li id=\"s2a6\"><span style=\"text-decoration: underline;\">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href=\"#s3a1Ai\">3(a)(1)(A)(i)</a>.</li>\n</ol>\n</li><li id=\"s2b\"><p><strong>Other rights</strong>.</p>\n<ol>\n<li id=\"s2b1\">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>\n<li id=\"s2b2\">Patent and trademark rights are not licensed under this Public License.</li>\n<li id=\"s2b3\">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s3\"><strong>Section 3 – License Conditions.</strong></p>\n<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>\n<ol type=\"a\">\n<li id=\"s3a\"><p><strong>Attribution</strong>.</p>\n<ol>\n<li id=\"s3a1\"><p>If You Share the Licensed Material (including in modified form), You must:</p>\n<ol type=\"A\">\n<li id=\"s3a1A\">retain the following if it is supplied by the Licensor with the Licensed Material:\n<ol type=\"i\">\n<li id=\"s3a1Ai\">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>\n<li id=\"s3a1Aii\">a copyright notice;</li>\n<li id=\"s3a1Aiii\">a notice that refers to this Public License; </li>\n<li id=\"s3a1Aiv\">a notice that refers to the disclaimer of warranties;</li>\n<li id=\"s3a1Av\">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>\n</ol>\n</li><li id=\"s3a1B\">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>\n<li id=\"s3a1C\">indicate the Licensed Material is licensed under this Public License,\nand include the text of, or the URI or hyperlink to, this Public\nLicense.</li>\n</ol>\n</li>\n<li id=\"s3a2\">You may satisfy the conditions in Section <a href=\"#s3a1\">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>\n<li id=\"s3a3\">If requested by the Licensor, You must remove any of the information required by Section <a href=\"#s3a1A\">3(a)(1)(A)</a> to the extent reasonably practicable.</li>\n</ol>\n</li>\n<li id=\"s3b\"><strong>ShareAlike</strong>.\n<p>In addition to the conditions in Section <a href=\"#s3a\">3(a)</a>, if You Share Adapted Material You produce, the following conditions also apply.</p>\n<ol>\n<li id=\"s3b1\">The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.</li>\n<li id=\"s3b2\">You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.</li>\n<li id=\"s3b3\">You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.</li>\n</ol>\n</li>\n</ol>\n<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>\n<ol type=\"a\">\n<li id=\"s4a\">for the avoidance of doubt, Section <a href=\"#s2a1\">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;</li>\n<li id=\"s4b\">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section <a href=\"#s3b\">3(b)</a>; and</li>\n<li id=\"s4c\">You must comply with the conditions in Section <a href=\"#s3a\">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>\n</ol>\nFor the avoidance of doubt, this Section \n<a href=\"#s4\">4</a>\n supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.\n<p id=\"s5\"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>\n<ol style=\"font-weight: bold;\" type=\"a\">\n<li id=\"s5a\"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>\n<li id=\"s5b\"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>\n</ol>\n<ol start=\"3\" type=\"a\">\n<li id=\"s5c\">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>\n</ol>\n<p id=\"s6\"><strong>Section 6 – Term and Termination.</strong></p>\n<ol type=\"a\">\n<li id=\"s6a\">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>\n<li id=\"s6b\">\n<p>Where Your right to use the Licensed Material has terminated under Section <a href=\"#s6a\">6(a)</a>, it reinstates:</p>\n<ol>\n<li id=\"s6b1\">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>\n<li id=\"s6b2\">upon express reinstatement by the Licensor.</li>\n</ol>\nFor the avoidance of doubt, this Section <a href=\"#s6b\">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>\n<li id=\"s6c\">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>\n<li id=\"s6d\">Sections <a href=\"#s1\">1</a>, <a href=\"#s5\">5</a>, <a href=\"#s6\">6</a>, <a href=\"#s7\">7</a>, and <a href=\"#s8\">8</a> survive termination of this Public License.</li>\n</ol>\n<p id=\"s7\"><strong>Section 7 – Other Terms and Conditions.</strong></p>\n<ol type=\"a\">\n<li id=\"s7a\">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>\n<li id=\"s7b\">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>\n</ol>\n<p id=\"s8\"><strong>Section 8 – Interpretation.</strong></p>\n<ol type=\"a\">\n<li id=\"s8a\">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>\n<li id=\"s8b\">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>\n<li id=\"s8c\">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>\n<li id=\"s8d\">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>\n</ol>\n"},{"id":4,"name":"Creative Commons Attribution-NonCommercial 4.0 International","content":"\n<h3>Creative Commons Attribution-NonCommercial 4.0 International Public License</h3>\n<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial 4.0 International Public License (\"Public License\"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>\n<p id=\"s1\"><strong>Section 1 – Definitions.</strong></p>\n<ol type=\"a\">\n<li id=\"s1a\"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>\n<li id=\"s1b\"><strong>Adapter's License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>\n<li id=\"s1c\"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href=\"#s2b\">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>\n<li id=\"s1d\"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not\nbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar\ninternational agreements.</li>\n<li id=\"s1e\"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>\n<li id=\"s1f\"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>\n<li id=\"s1g\"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>\n<li id=\"s1h\"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>\n<li id=\"s1i\"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li>\n<li id=\"s1j\"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>\n<li id=\"s1k\"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>\n<li id=\"s1l\"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>\n</ol>\n<p id=\"s2\"><strong>Section 2 – Scope.</strong></p>\n<ol type=\"a\">\n<li id=\"s2a\"><strong>License grant</strong>.\n<ol>\n<li id=\"s2a1\">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:\n<ol type=\"A\">\n<li id=\"s2a1A\">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li>\n<li id=\"s2a1B\">produce, reproduce, and Share Adapted Material for NonCommercial purposes only.</li>\n</ol>\n</li><li id=\"s2a2\"><span style=\"text-decoration: underline;\">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>\n<li id=\"s2a3\"><span style=\"text-decoration: underline;\">Term</span>. The term of this Public License is specified in Section <a href=\"#s6a\">6(a)</a>.</li>\n<li id=\"s2a4\"><span style=\"text-decoration: underline;\">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href=\"#s2a4\">2(a)(4)</a> never produces Adapted Material.</li>\n<li id=\"s2a5\"><span style=\"text-decoration: underline;\">Downstream recipients</span>.\n<div class=\"para\">\n<ol type=\"A\">\n<li id=\"s2a5A\"><span style=\"text-decoration: underline;\">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>\n<li id=\"s2a5B\"><span style=\"text-decoration: underline;\">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>\n</ol>\n</div>\n</li><li id=\"s2a6\"><span style=\"text-decoration: underline;\">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href=\"#s3a1Ai\">3(a)(1)(A)(i)</a>.</li>\n</ol>\n</li><li id=\"s2b\"><p><strong>Other rights</strong>.</p>\n<ol>\n<li id=\"s2b1\">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>\n<li id=\"s2b2\">Patent and trademark rights are not licensed under this Public License.</li>\n<li id=\"s2b3\">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s3\"><strong>Section 3 – License Conditions.</strong></p>\n<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>\n<ol type=\"a\">\n<li id=\"s3a\"><p><strong>Attribution</strong>.</p>\n<ol>\n<li id=\"s3a1\"><p>If You Share the Licensed Material (including in modified form), You must:</p>\n<ol type=\"A\">\n<li id=\"s3a1A\">retain the following if it is supplied by the Licensor with the Licensed Material:\n<ol type=\"i\">\n<li id=\"s3a1Ai\">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>\n<li id=\"s3a1Aii\">a copyright notice;</li>\n<li id=\"s3a1Aiii\">a notice that refers to this Public License; </li>\n<li id=\"s3a1Aiv\">a notice that refers to the disclaimer of warranties;</li>\n<li id=\"s3a1Av\">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>\n</ol>\n</li><li id=\"s3a1B\">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>\n<li id=\"s3a1C\">indicate the Licensed Material is licensed under this Public License,\nand include the text of, or the URI or hyperlink to, this Public\nLicense.</li>\n</ol>\n</li>\n<li id=\"s3a2\">You may satisfy the conditions in Section <a href=\"#s3a1\">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>\n<li id=\"s3a3\">If requested by the Licensor, You must remove any of the information required by Section <a href=\"#s3a1A\">3(a)(1)(A)</a> to the extent reasonably practicable.</li>\n<li id=\"s3a4\">If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s4\"><strong>Section 4 – Sui Generis Database Rights.</strong></p>\n<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>\n<ol type=\"a\">\n<li id=\"s4a\">for the avoidance of doubt, Section <a href=\"#s2a1\">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only;</li>\n<li id=\"s4b\">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>\n<li id=\"s4c\">You must comply with the conditions in Section <a href=\"#s3a\">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>\n</ol>\nFor the avoidance of doubt, this Section \n<a href=\"#s4\">4</a>\n supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.\n<p id=\"s5\"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>\n<ol style=\"font-weight: bold;\" type=\"a\">\n<li id=\"s5a\"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>\n<li id=\"s5b\"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>\n</ol>\n<ol start=\"3\" type=\"a\">\n<li id=\"s5c\">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>\n</ol>\n<p id=\"s6\"><strong>Section 6 – Term and Termination.</strong></p>\n<ol type=\"a\">\n<li id=\"s6a\">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>\n<li id=\"s6b\">\n<p>Where Your right to use the Licensed Material has terminated under Section <a href=\"#s6a\">6(a)</a>, it reinstates:</p>\n<ol>\n<li id=\"s6b1\">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>\n<li id=\"s6b2\">upon express reinstatement by the Licensor.</li>\n</ol>\nFor the avoidance of doubt, this Section <a href=\"#s6b\">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>\n<li id=\"s6c\">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>\n<li id=\"s6d\">Sections <a href=\"#s1\">1</a>, <a href=\"#s5\">5</a>, <a href=\"#s6\">6</a>, <a href=\"#s7\">7</a>, and <a href=\"#s8\">8</a> survive termination of this Public License.</li>\n</ol>\n<p id=\"s7\"><strong>Section 7 – Other Terms and Conditions.</strong></p>\n<ol type=\"a\">\n<li id=\"s7a\">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>\n<li id=\"s7b\">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>\n</ol>\n<p id=\"s8\"><strong>Section 8 – Interpretation.</strong></p>\n<ol type=\"a\">\n<li id=\"s8a\">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>\n<li id=\"s8b\">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>\n<li id=\"s8c\">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>\n<li id=\"s8d\">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>\n</ol>\n"},{"id":5,"name":"Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License","content":"\n<h3>Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License</h3>\n<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License (\"Public License\"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>\n<p id=\"s1\"><strong>Section 1 – Definitions.</strong></p>\n<ol type=\"a\">\n<li id=\"s1a\"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>\n<li id=\"s1b\"><strong>Adapter's License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>\n<li id=\"s1c\"><strong>BY-NC-SA Compatible License</strong> means a license listed at <a href=\"//creativecommons.org/compatiblelicenses\"> creativecommons.org/compatiblelicenses</a>, approved by Creative Commons as essentially the equivalent of this Public License.</li>\n<li id=\"s1d\"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href=\"#s2b\">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>\n<li id=\"s1e\"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not\nbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar\ninternational agreements.</li>\n<li id=\"s1f\"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>\n<li id=\"s1g\"><strong>License Elements</strong> means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution, NonCommercial, and ShareAlike.</li>\n<li id=\"s1h\"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>\n<li id=\"s1i\"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>\n<li id=\"s1j\"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>\n<li id=\"s1k\"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li>\n<li id=\"s1l\"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>\n<li id=\"s1m\"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>\n<li id=\"s1n\"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>\n</ol>\n<p id=\"s2\"><strong>Section 2 – Scope.</strong></p>\n<ol type=\"a\">\n<li id=\"s2a\"><strong>License grant</strong>.\n<ol>\n<li id=\"s2a1\">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:\n<ol type=\"A\">\n<li id=\"s2a1A\">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li>\n<li id=\"s2a1B\">produce, reproduce, and Share Adapted Material for NonCommercial purposes only.</li>\n</ol>\n</li><li id=\"s2a2\"><span style=\"text-decoration: underline;\">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>\n<li id=\"s2a3\"><span style=\"text-decoration: underline;\">Term</span>. The term of this Public License is specified in Section <a href=\"#s6a\">6(a)</a>.</li>\n<li id=\"s2a4\"><span style=\"text-decoration: underline;\">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href=\"#s2a4\">2(a)(4)</a> never produces Adapted Material.</li>\n<li id=\"s2a5\"><span style=\"text-decoration: underline;\">Downstream recipients</span>.\n<div class=\"para\">\n<ol type=\"A\">\n<li id=\"s2a5A\"><span style=\"text-decoration: underline;\">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>\n<li id=\"s2a5B\"><span style=\"text-decoration: underline;\">Additional offer from the Licensor – Adapted Material</span>. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.</li>\n<li id=\"s2a5C\"><span style=\"text-decoration: underline;\">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>\n</ol>\n</div>\n</li><li id=\"s2a6\"><span style=\"text-decoration: underline;\">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href=\"#s3a1Ai\">3(a)(1)(A)(i)</a>.</li>\n</ol>\n</li><li id=\"s2b\"><p><strong>Other rights</strong>.</p>\n<ol>\n<li id=\"s2b1\">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>\n<li id=\"s2b2\">Patent and trademark rights are not licensed under this Public License.</li>\n<li id=\"s2b3\">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s3\"><strong>Section 3 – License Conditions.</strong></p>\n<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>\n<ol type=\"a\">\n<li id=\"s3a\"><p><strong>Attribution</strong>.</p>\n<ol>\n<li id=\"s3a1\"><p>If You Share the Licensed Material (including in modified form), You must:</p>\n<ol type=\"A\">\n<li id=\"s3a1A\">retain the following if it is supplied by the Licensor with the Licensed Material:\n<ol type=\"i\">\n<li id=\"s3a1Ai\">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>\n<li id=\"s3a1Aii\">a copyright notice;</li>\n<li id=\"s3a1Aiii\">a notice that refers to this Public License; </li>\n<li id=\"s3a1Aiv\">a notice that refers to the disclaimer of warranties;</li>\n<li id=\"s3a1Av\">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>\n</ol>\n</li><li id=\"s3a1B\">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>\n<li id=\"s3a1C\">indicate the Licensed Material is licensed under this Public License,\nand include the text of, or the URI or hyperlink to, this Public\nLicense.</li>\n</ol>\n</li>\n<li id=\"s3a2\">You may satisfy the conditions in Section <a href=\"#s3a1\">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>\n<li id=\"s3a3\">If requested by the Licensor, You must remove any of the information required by Section <a href=\"#s3a1A\">3(a)(1)(A)</a> to the extent reasonably practicable.</li>\n</ol>\n</li>\n<li id=\"s3b\"><strong>ShareAlike</strong>.\n<p>In addition to the conditions in Section <a href=\"#s3a\">3(a)</a>, if You Share Adapted Material You produce, the following conditions also apply.</p>\n<ol>\n<li id=\"s3b1\">The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-NC-SA Compatible License.</li>\n<li id=\"s3b2\">You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.</li>\n<li id=\"s3b3\">You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s4\"><strong>Section 4 – Sui Generis Database Rights.</strong></p>\n<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>\n<ol type=\"a\">\n<li id=\"s4a\">for the avoidance of doubt, Section <a href=\"#s2a1\">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only;</li>\n<li id=\"s4b\">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section <a href=\"#s3b\">3(b)</a>; and</li>\n<li id=\"s4c\">You must comply with the conditions in Section <a href=\"#s3a\">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>\n</ol>\nFor the avoidance of doubt, this Section \n<a href=\"#s4\">4</a>\n supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.\n<p id=\"s5\"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>\n<ol style=\"font-weight: bold;\" type=\"a\">\n<li id=\"s5a\"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>\n<li id=\"s5b\"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>\n</ol>\n<ol start=\"3\" type=\"a\">\n<li id=\"s5c\">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>\n</ol>\n<p id=\"s6\"><strong>Section 6 – Term and Termination.</strong></p>\n<ol type=\"a\">\n<li id=\"s6a\">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>\n<li id=\"s6b\">\n<p>Where Your right to use the Licensed Material has terminated under Section <a href=\"#s6a\">6(a)</a>, it reinstates:</p>\n<ol>\n<li id=\"s6b1\">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>\n<li id=\"s6b2\">upon express reinstatement by the Licensor.</li>\n</ol>\nFor the avoidance of doubt, this Section <a href=\"#s6b\">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>\n<li id=\"s6c\">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>\n<li id=\"s6d\">Sections <a href=\"#s1\">1</a>, <a href=\"#s5\">5</a>, <a href=\"#s6\">6</a>, <a href=\"#s7\">7</a>, and <a href=\"#s8\">8</a> survive termination of this Public License.</li>\n</ol>\n<p id=\"s7\"><strong>Section 7 – Other Terms and Conditions.</strong></p>\n<ol type=\"a\">\n<li id=\"s7a\">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>\n<li id=\"s7b\">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>\n</ol>\n<p id=\"s8\"><strong>Section 8 – Interpretation.</strong></p>\n<ol type=\"a\">\n<li id=\"s8a\">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>\n<li id=\"s8b\">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>\n<li id=\"s8c\">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>\n<li id=\"s8d\">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>\n</ol>\n"},{"id":6,"name":"Creative Commons Attribution-NoDerivatives 4.0 International Public License","content":"\n<h3>Creative Commons Attribution-NoDerivatives 4.0 International Public License</h3>\n<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NoDerivatives 4.0 International Public License (\"Public License\"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>\n<p id=\"s1\"><strong>Section 1 – Definitions.</strong></p>\n<ol type=\"a\">\n<li id=\"s1a\"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>\n<li id=\"s1b\"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href=\"#s2b\">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>\n<li id=\"s1c\"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not\nbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar\ninternational agreements.</li>\n<li id=\"s1d\"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>\n<li id=\"s1e\"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>\n<li id=\"s1f\"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>\n<li id=\"s1g\"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>\n<li id=\"s1h\"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>\n<li id=\"s1i\"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>\n<li id=\"s1j\"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>\n</ol>\n<p id=\"s2\"><strong>Section 2 – Scope.</strong></p>\n<ol type=\"a\">\n<li id=\"s2a\"><strong>License grant</strong>.\n<ol>\n<li id=\"s2a1\">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:\n<ol type=\"A\">\n<li id=\"s2a1A\">reproduce and Share the Licensed Material, in whole or in part; and</li>\n<li id=\"s2a1B\">produce and reproduce, but not Share, Adapted Material.</li>\n</ol>\n</li><li id=\"s2a2\"><span style=\"text-decoration: underline;\">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>\n<li id=\"s2a3\"><span style=\"text-decoration: underline;\">Term</span>. The term of this Public License is specified in Section <a href=\"#s6a\">6(a)</a>.</li>\n<li id=\"s2a4\"><span style=\"text-decoration: underline;\">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href=\"#s2a4\">2(a)(4)</a> never produces Adapted Material.</li>\n<li id=\"s2a5\"><span style=\"text-decoration: underline;\">Downstream recipients</span>.\n<div class=\"para\">\n<ol type=\"A\">\n<li id=\"s2a5A\"><span style=\"text-decoration: underline;\">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>\n<li id=\"s2a5B\"><span style=\"text-decoration: underline;\">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>\n</ol>\n</div>\n</li><li id=\"s2a6\"><span style=\"text-decoration: underline;\">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href=\"#s3a1Ai\">3(a)(1)(A)(i)</a>.</li>\n</ol>\n</li><li id=\"s2b\"><p><strong>Other rights</strong>.</p>\n<ol>\n<li id=\"s2b1\">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>\n<li id=\"s2b2\">Patent and trademark rights are not licensed under this Public License.</li>\n<li id=\"s2b3\">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s3\"><strong>Section 3 – License Conditions.</strong></p>\n<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>\n<ol type=\"a\">\n<li id=\"s3a\"><p><strong>Attribution</strong>.</p>\n<ol>\n<li id=\"s3a1\"><p>If You Share the Licensed Material, You must:</p>\n<ol type=\"A\">\n<li id=\"s3a1A\">retain the following if it is supplied by the Licensor with the Licensed Material:\n<ol type=\"i\">\n<li id=\"s3a1Ai\">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>\n<li id=\"s3a1Aii\">a copyright notice;</li>\n<li id=\"s3a1Aiii\">a notice that refers to this Public License; </li>\n<li id=\"s3a1Aiv\">a notice that refers to the disclaimer of warranties;</li>\n<li id=\"s3a1Av\">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>\n</ol>\n</li><li id=\"s3a1B\">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>\n<li id=\"s3a1C\">indicate the Licensed Material is licensed under this Public License,\nand include the text of, or the URI or hyperlink to, this Public\nLicense.</li>\n</ol>\nFor the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material.\n</li>\n<li id=\"s3a2\">You may satisfy the conditions in Section <a href=\"#s3a1\">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>\n<li id=\"s3a3\">If requested by the Licensor, You must remove any of the information required by Section <a href=\"#s3a1A\">3(a)(1)(A)</a> to the extent reasonably practicable.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s4\"><strong>Section 4 – Sui Generis Database Rights.</strong></p>\n<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>\n<ol type=\"a\">\n<li id=\"s4a\">for the avoidance of doubt, Section <a href=\"#s2a1\">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database, provided You do not Share Adapted Material;</li>\n<li id=\"s4b\">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>\n<li id=\"s4c\">You must comply with the conditions in Section <a href=\"#s3a\">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>\n</ol>\nFor the avoidance of doubt, this Section\n<a href=\"#s4\">4</a>\n supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.\n<p id=\"s5\"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>\n<ol style=\"font-weight: bold;\" type=\"a\">\n<li id=\"s5a\"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>\n<li id=\"s5b\"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>\n</ol>\n<ol start=\"3\" type=\"a\">\n<li id=\"s5c\">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>\n</ol>\n<p id=\"s6\"><strong>Section 6 – Term and Termination.</strong></p>\n<ol type=\"a\">\n<li id=\"s6a\">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>\n<li id=\"s6b\">\n<p>Where Your right to use the Licensed Material has terminated under Section <a href=\"#s6a\">6(a)</a>, it reinstates:</p>\n<ol>\n<li id=\"s6b1\">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>\n<li id=\"s6b2\">upon express reinstatement by the Licensor.</li>\n</ol>\nFor the avoidance of doubt, this Section <a href=\"#s6b\">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>\n<li id=\"s6c\">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>\n<li id=\"s6d\">Sections <a href=\"#s1\">1</a>, <a href=\"#s5\">5</a>, <a href=\"#s6\">6</a>, <a href=\"#s7\">7</a>, and <a href=\"#s8\">8</a> survive termination of this Public License.</li>\n</ol>\n<p id=\"s7\"><strong>Section 7 – Other Terms and Conditions.</strong></p>\n<ol type=\"a\">\n<li id=\"s7a\">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>\n<li id=\"s7b\">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>\n</ol>\n<p id=\"s8\"><strong>Section 8 – Interpretation.</strong></p>\n<ol type=\"a\">\n<li id=\"s8a\">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>\n<li id=\"s8b\">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>\n<li id=\"s8c\">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>\n<li id=\"s8d\">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>\n</ol>\n"},{"id":7,"name":"Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License","content":"\n<h3>Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License</h3>\n<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License (\"Public License\"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>\n<p id=\"s1\"><strong>Section 1 – Definitions.</strong></p>\n<ol type=\"a\">\n<li id=\"s1a\"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>\n<li id=\"s1b\"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href=\"#s2b\">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>\n<li id=\"s1c\"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not\nbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar\ninternational agreements.</li>\n<li id=\"s1d\"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>\n<li id=\"s1e\"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>\n<li id=\"s1f\"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>\n<li id=\"s1g\"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>\n<li id=\"s1h\"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li>\n<li id=\"s1i\"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>\n<li id=\"s1j\"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>\n<li id=\"s1k\"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>\n</ol>\n<p id=\"s2\"><strong>Section 2 – Scope.</strong></p>\n<ol type=\"a\">\n<li id=\"s2a\"><strong>License grant</strong>.\n<ol>\n<li id=\"s2a1\">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:\n<ol type=\"A\">\n<li id=\"s2a1A\">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li>\n<li id=\"s2a1B\">produce and reproduce, but not Share, Adapted Material for NonCommercial purposes only.</li>\n</ol>\n</li><li id=\"s2a2\"><span style=\"text-decoration: underline;\">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>\n<li id=\"s2a3\"><span style=\"text-decoration: underline;\">Term</span>. The term of this Public License is specified in Section <a href=\"#s6a\">6(a)</a>.</li>\n<li id=\"s2a4\"><span style=\"text-decoration: underline;\">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href=\"#s2a4\">2(a)(4)</a> never produces Adapted Material.</li>\n<li id=\"s2a5\"><span style=\"text-decoration: underline;\">Downstream recipients</span>.\n<div class=\"para\">\n<ol type=\"A\">\n<li id=\"s2a5A\"><span style=\"text-decoration: underline;\">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>\n<li id=\"s2a5B\"><span style=\"text-decoration: underline;\">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>\n</ol>\n</div>\n</li><li id=\"s2a6\"><span style=\"text-decoration: underline;\">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href=\"#s3a1Ai\">3(a)(1)(A)(i)</a>.</li>\n</ol>\n</li><li id=\"s2b\"><p><strong>Other rights</strong>.</p>\n<ol>\n<li id=\"s2b1\">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>\n<li id=\"s2b2\">Patent and trademark rights are not licensed under this Public License.</li>\n<li id=\"s2b3\">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s3\"><strong>Section 3 – License Conditions.</strong></p>\n<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>\n<ol type=\"a\">\n<li id=\"s3a\"><p><strong>Attribution</strong>.</p>\n<ol>\n<li id=\"s3a1\"><p>If You Share the Licensed Material, You must:</p>\n<ol type=\"A\">\n<li id=\"s3a1A\">retain the following if it is supplied by the Licensor with the Licensed Material:\n<ol type=\"i\">\n<li id=\"s3a1Ai\">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>\n<li id=\"s3a1Aii\">a copyright notice;</li>\n<li id=\"s3a1Aiii\">a notice that refers to this Public License; </li>\n<li id=\"s3a1Aiv\">a notice that refers to the disclaimer of warranties;</li>\n<li id=\"s3a1Av\">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>\n</ol>\n</li><li id=\"s3a1B\">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>\n<li id=\"s3a1C\">indicate the Licensed Material is licensed under this Public License,\nand include the text of, or the URI or hyperlink to, this Public\nLicense.</li>\n</ol>\nFor the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material.\n</li>\n<li id=\"s3a2\">You may satisfy the conditions in Section <a href=\"#s3a1\">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>\n<li id=\"s3a3\">If requested by the Licensor, You must remove any of the information required by Section <a href=\"#s3a1A\">3(a)(1)(A)</a> to the extent reasonably practicable.</li>\n</ol>\n</li>\n</ol>\n<p id=\"s4\"><strong>Section 4 – Sui Generis Database Rights.</strong></p>\n<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>\n<ol type=\"a\">\n<li id=\"s4a\">for the avoidance of doubt, Section <a href=\"#s2a1\">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only and provided You do not Share Adapted Material;</li>\n<li id=\"s4b\">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>\n<li id=\"s4c\">You must comply with the conditions in Section <a href=\"#s3a\">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>\n</ol>\nFor the avoidance of doubt, this Section \n<a href=\"#s4\">4</a>\n supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.\n<p id=\"s5\"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>\n<ol style=\"font-weight: bold;\" type=\"a\">\n<li id=\"s5a\"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>\n<li id=\"s5b\"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>\n</ol>\n<ol start=\"3\" type=\"a\">\n<li id=\"s5c\">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>\n</ol>\n<p id=\"s6\"><strong>Section 6 – Term and Termination.</strong></p>\n<ol type=\"a\">\n<li id=\"s6a\">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>\n<li id=\"s6b\">\n<p>Where Your right to use the Licensed Material has terminated under Section <a href=\"#s6a\">6(a)</a>, it reinstates:</p>\n<ol>\n<li id=\"s6b1\">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>\n<li id=\"s6b2\">upon express reinstatement by the Licensor.</li>\n</ol>\nFor the avoidance of doubt, this Section <a href=\"#s6b\">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>\n<li id=\"s6c\">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>\n<li id=\"s6d\">Sections <a href=\"#s1\">1</a>, <a href=\"#s5\">5</a>, <a href=\"#s6\">6</a>, <a href=\"#s7\">7</a>, and <a href=\"#s8\">8</a> survive termination of this Public License.</li>\n</ol>\n<p id=\"s7\"><strong>Section 7 – Other Terms and Conditions.</strong></p>\n<ol type=\"a\">\n<li id=\"s7a\">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>\n<li id=\"s7b\">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>\n</ol>\n<p id=\"s8\"><strong>Section 8 – Interpretation.</strong></p>\n<ol type=\"a\">\n<li id=\"s8a\">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>\n<li id=\"s8b\">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>\n<li id=\"s8c\">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>\n<li id=\"s8d\">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>\n</ol>\n"}],"totalSize":1,"filteredSize":0,"length":1000,"page":0}
\ No newline at end of file
diff --git a/frontend-js/testFiles/map/complex_model_with_glyphs.zip b/frontend-js/testFiles/map/complex_model_with_glyphs.zip
index 089b4d20d98443c03ba01edd432ebe761b6c6d2c..de3a6439f6ce0adad2d64f22b85574ef0247efc7 100644
Binary files a/frontend-js/testFiles/map/complex_model_with_glyphs.zip and b/frontend-js/testFiles/map/complex_model_with_glyphs.zip differ
diff --git a/frontend-js/testFiles/map/no-map.zip b/frontend-js/testFiles/map/no-map.zip
new file mode 100644
index 0000000000000000000000000000000000000000..8119d299731adc1d674e2093e8772066e532f61f
Binary files /dev/null and b/frontend-js/testFiles/map/no-map.zip differ
diff --git a/model-command/pom.xml b/model-command/pom.xml
index 3582ea7f4af09609a27e1eea4f229494fa49685f..0bb694f02687ab670477188c538472b74c1781ca 100644
--- a/model-command/pom.xml
+++ b/model-command/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>model-command</artifactId>
<name>Model commands</name>
@@ -16,7 +16,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
@@ -24,7 +24,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- Log4J2-->
diff --git a/model-command/src/main/java/lcsb/mapviewer/commands/SubModelCommand.java b/model-command/src/main/java/lcsb/mapviewer/commands/SubModelCommand.java
index d70b50c701fba73ee93b5da8e1721aa7672c7fc6..f26bee9c0a572d8a5990f8cfa431e773912aa904 100644
--- a/model-command/src/main/java/lcsb/mapviewer/commands/SubModelCommand.java
+++ b/model-command/src/main/java/lcsb/mapviewer/commands/SubModelCommand.java
@@ -1,5 +1,6 @@
package lcsb.mapviewer.commands;
+import java.awt.geom.Line2D;
import java.awt.geom.Path2D;
import java.util.ArrayList;
import java.util.HashSet;
@@ -34,6 +35,8 @@ public class SubModelCommand extends NewModelCommand {
private Set<Integer> reactionIds;
+ private boolean strictCutoff = true;
+
/**
* Default constructor.
*
@@ -43,7 +46,12 @@ public class SubModelCommand extends NewModelCommand {
* #polygon that limits the area for the new model
*/
public SubModelCommand(final Model model, final Path2D polygon) {
- this(model, polygon, new HashSet<>(), new HashSet<>());
+ this(model, polygon, new HashSet<>(), new HashSet<>(), true);
+ }
+
+ public SubModelCommand(final Model model, final Path2D polygon, final Set<Integer> elementIds,
+ final Set<Integer> reactionIds) {
+ this(model, polygon, elementIds, reactionIds, true);
}
/**
@@ -55,11 +63,12 @@ public class SubModelCommand extends NewModelCommand {
* #polygon that limits the area for the new model
*/
public SubModelCommand(final Model model, final Path2D polygon, final Set<Integer> elementIds,
- final Set<Integer> reactionIds) {
+ final Set<Integer> reactionIds, final boolean strictCutoff) {
super(model);
this.polygon = polygon;
this.elementIds = elementIds;
this.reactionIds = reactionIds;
+ this.strictCutoff = strictCutoff;
}
@Override
@@ -85,6 +94,23 @@ public class SubModelCommand extends NewModelCommand {
aliasNotToRemove.add(alias);
}
}
+ if (!strictCutoff) {
+ Set<Element> keepElements = new HashSet<>();
+ for (Reaction reaction : result.getReactions()) {
+ boolean keep = false;
+ for (Line2D line : reaction.getLines()) {
+ if (polygon.contains(line.getP1()) || polygon.contains(line.getP2())) {
+ keep = true;
+ }
+ }
+ if (keep) {
+ for (final ReactionNode node : reaction.getReactionNodes()) {
+ keepElements.add(node.getElement());
+ }
+ }
+ }
+ aliasNotToRemove.addAll(keepElements);
+ }
aliasNotToRemove.retainAll(inputElements);
boolean added = false;
diff --git a/model-command/src/test/java/lcsb/mapviewer/commands/SubModelCommandTest.java b/model-command/src/test/java/lcsb/mapviewer/commands/SubModelCommandTest.java
index 4150cb89665bd91763b6489f68ed1b3ce1580e9b..4086e83e143c69262d1f4046331d4c9aba6a3074 100644
--- a/model-command/src/test/java/lcsb/mapviewer/commands/SubModelCommandTest.java
+++ b/model-command/src/test/java/lcsb/mapviewer/commands/SubModelCommandTest.java
@@ -63,6 +63,23 @@ public class SubModelCommandTest extends CommandTestFunctions {
assertEquals(1, copy.getReactions().size());
}
+ @Test
+ public void testGetSubmodelWithDisableStrictCutoof() throws Exception {
+ Model model = getModelForFile("testFiles/spliting_test_Case.xml", true);
+
+ Path2D polygon = new Path2D.Double();
+ polygon.moveTo(50, 50);
+ polygon.lineTo(350, 50);
+ polygon.lineTo(350, 200);
+ polygon.lineTo(50, 200);
+ polygon.closePath();
+
+ Model copy = new SubModelCommand(model, polygon, new HashSet<>(), new HashSet<>(), false).execute();
+
+ assertEquals(10, copy.getElements().size());
+ assertEquals(3, copy.getReactions().size());
+ }
+
@Test
public void testGetSubmodel3() throws Exception {
Model model = getModelForFile("testFiles/spliting_test_Case.xml", true);
@@ -187,7 +204,7 @@ public class SubModelCommandTest extends CommandTestFunctions {
polygon.lineTo(1000, 0);
polygon.closePath();
- Model copy = new SubModelCommand(model, polygon, new HashSet<>(), new HashSet<>()).execute();
+ Model copy = new SubModelCommand(model, polygon, new HashSet<>(), new HashSet<>(), true).execute();
assertEquals(12, copy.getElements().size());
assertEquals(3, copy.getReactions().size());
@@ -205,7 +222,7 @@ public class SubModelCommandTest extends CommandTestFunctions {
polygon.closePath();
model.getReactions().iterator().next().setId(-2);
- Model copy = new SubModelCommand(model, polygon, new HashSet<>(), new HashSet<>(Arrays.asList(-2))).execute();
+ Model copy = new SubModelCommand(model, polygon, new HashSet<>(), new HashSet<>(Arrays.asList(-2)), true).execute();
assertEquals(1, copy.getReactions().size());
}
diff --git a/model/pom.xml b/model/pom.xml
index 839389611e559eb562b45ba2939fc01c7e6cd9b1..e5f15286b35ad29e78b435022f993bc668804e8f 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>model</artifactId>
<name>model MapViewer</name>
@@ -15,7 +15,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>commons</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- Java xml serialization -->
diff --git a/model/src/main/java/lcsb/mapviewer/model/License.java b/model/src/main/java/lcsb/mapviewer/model/License.java
new file mode 100644
index 0000000000000000000000000000000000000000..f3284f63d83bd6315e761d4b32de6b3cf6a20dd9
--- /dev/null
+++ b/model/src/main/java/lcsb/mapviewer/model/License.java
@@ -0,0 +1,56 @@
+package lcsb.mapviewer.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+
+@Entity
+@XmlRootElement
+public class License implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private int id;
+
+ @Column(length = 255)
+ private String name;
+
+ @Column(columnDefinition = "TEXT")
+ private String content;
+
+ @Column(length = 1024)
+ private String url;
+
+ protected License() {
+ }
+
+ public License(final String name, final String content, final String url) {
+ this.name = name;
+ this.content = content;
+ this.url = url;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+}
diff --git a/model/src/main/java/lcsb/mapviewer/model/Project.java b/model/src/main/java/lcsb/mapviewer/model/Project.java
index 9262feec296d29fa1280e9f0d5ececaef1e4f9df..b00c4ae5fee6cc54fcc01cfe9dfc4eb2fe618cde 100644
--- a/model/src/main/java/lcsb/mapviewer/model/Project.java
+++ b/model/src/main/java/lcsb/mapviewer/model/Project.java
@@ -1,13 +1,25 @@
package lcsb.mapviewer.model;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lcsb.mapviewer.common.exception.InvalidArgumentException;
+import lcsb.mapviewer.model.cache.UploadedFileEntry;
+import lcsb.mapviewer.model.graphics.MapCanvasType;
+import lcsb.mapviewer.model.map.MiriamData;
+import lcsb.mapviewer.model.map.OverviewImage;
+import lcsb.mapviewer.model.map.layout.ProjectBackground;
+import lcsb.mapviewer.model.map.layout.graphics.Glyph;
+import lcsb.mapviewer.model.map.model.Model;
+import lcsb.mapviewer.model.map.model.ModelData;
+import lcsb.mapviewer.model.map.model.ModelFullIndexed;
+import lcsb.mapviewer.model.overlay.DataOverlay;
+import lcsb.mapviewer.model.user.User;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.annotations.LazyCollection;
+import org.hibernate.annotations.LazyCollectionOption;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -22,29 +34,14 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.OrderBy;
-
-import org.apache.commons.lang3.StringUtils;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CascadeType;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-import org.hibernate.annotations.LazyCollection;
-import org.hibernate.annotations.LazyCollectionOption;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import lcsb.mapviewer.common.exception.InvalidArgumentException;
-import lcsb.mapviewer.model.cache.UploadedFileEntry;
-import lcsb.mapviewer.model.graphics.MapCanvasType;
-import lcsb.mapviewer.model.map.MiriamData;
-import lcsb.mapviewer.model.map.OverviewImage;
-import lcsb.mapviewer.model.map.layout.ProjectBackground;
-import lcsb.mapviewer.model.map.layout.graphics.Glyph;
-import lcsb.mapviewer.model.map.model.Model;
-import lcsb.mapviewer.model.map.model.ModelData;
-import lcsb.mapviewer.model.map.model.ModelFullIndexed;
-import lcsb.mapviewer.model.overlay.DataOverlay;
-import lcsb.mapviewer.model.user.User;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
@Entity
public class Project implements Serializable {
@@ -58,7 +55,7 @@ public class Project implements Serializable {
@Column(unique = true, nullable = false, length = 255)
private String projectId;
- @Cascade({ CascadeType.ALL })
+ @Cascade({CascadeType.ALL})
@OneToOne
private MiriamData disease;
@@ -85,7 +82,7 @@ public class Project implements Serializable {
*/
private double progress = 0;
- @Cascade({ CascadeType.ALL })
+ @Cascade({CascadeType.ALL})
@OneToMany(mappedBy = "project", orphanRemoval = true)
@LazyCollection(LazyCollectionOption.EXTRA)
private Set<ProjectLogEntry> logEntries = new HashSet<>();
@@ -100,48 +97,56 @@ public class Project implements Serializable {
/**
* Top map of the project.
*/
- @Cascade({ CascadeType.ALL })
+ @Cascade({CascadeType.ALL})
@OneToOne(fetch = FetchType.LAZY)
private ModelData topModel;
- @Cascade({ CascadeType.ALL })
+ @Cascade({CascadeType.ALL})
@OneToMany(mappedBy = "project")
private Set<ModelData> models = new HashSet<>();
- @Cascade({ CascadeType.ALL })
+ @Cascade({CascadeType.ALL})
@OneToMany(mappedBy = "project", orphanRemoval = true)
@OrderBy("orderIndex")
private List<ProjectBackground> projectBackgrounds = new ArrayList<>();
- @Cascade({ CascadeType.ALL })
+ @Cascade({CascadeType.ALL})
@OneToMany(mappedBy = "project", orphanRemoval = true)
@OrderBy("id")
private List<DataOverlay> dataOverlays = new ArrayList<>();
- @Cascade({ CascadeType.SAVE_UPDATE })
+ @Cascade({CascadeType.SAVE_UPDATE})
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "file_entry_id")
private UploadedFileEntry inputData;
- @Cascade({ CascadeType.ALL })
+ @Cascade({CascadeType.ALL})
@OneToOne
private MiriamData organism;
+ @ManyToOne
+ private License license;
+
+ @Column(length = 255)
+ private String customLicenseUrl = "";
+
+ @Column(length = 1023)
+ private String customLicenseName = "";
+
private boolean sbgnFormat = false;
/**
- * List of overview images describing this {@link Project}. The elements on
- * the list can create a hierarchy that describe dependencies, however now
- * matter if the image is a top-level object or a leaf it should be placed on
- * this list.
+ * List of overview images describing this {@link Project}. The elements on the
+ * list can create a hierarchy that describe dependencies, however now matter if
+ * the image is a top-level object or a leaf it should be placed on this list.
*/
- @Cascade({ CascadeType.ALL })
+ @Cascade({CascadeType.ALL})
@OneToMany(mappedBy = "project", orphanRemoval = true, fetch = FetchType.EAGER)
@OrderBy("id")
@Fetch(FetchMode.SUBSELECT)
private List<OverviewImage> overviewImages = new ArrayList<>();
- @Cascade({ CascadeType.ALL })
+ @Cascade({CascadeType.ALL})
@OneToMany(mappedBy = "project", orphanRemoval = true)
@OrderBy("id")
@LazyCollection(LazyCollectionOption.FALSE)
@@ -263,6 +268,10 @@ public class Project implements Serializable {
return overviewImages;
}
+ protected void setOverviewImages(final List<OverviewImage> overviewImages) {
+ this.overviewImages = overviewImages;
+ }
+
public void addOverviewImage(final OverviewImage oi) {
this.overviewImages.add(oi);
oi.setProject(this);
@@ -335,6 +344,10 @@ public class Project implements Serializable {
return projectBackgrounds;
}
+ protected void setProjectBackgrounds(final List<ProjectBackground> projectBackgrounds) {
+ this.projectBackgrounds = projectBackgrounds;
+ }
+
public void removeProjectBackground(final ProjectBackground projectBackground) {
this.projectBackgrounds.remove(projectBackground);
projectBackground.setProject(null);
@@ -399,10 +412,6 @@ public class Project implements Serializable {
return topModel.getModel();
}
- public ModelData getTopModelData() {
- return topModel;
- }
-
public void setTopModel(final ModelData topModel) {
this.topModel = topModel;
addModel(topModel);
@@ -413,8 +422,12 @@ public class Project implements Serializable {
setTopModel(topModel.getModelData());
}
+ public ModelData getTopModelData() {
+ return topModel;
+ }
+
public ModelData getMapById(final String id) {
- if (id == null || !StringUtils.isNumeric(id)) {
+ if (!StringUtils.isNumeric(id)) {
throw new InvalidArgumentException("Invalid map id: " + id);
}
int integerId = Integer.valueOf(id);
@@ -452,12 +465,27 @@ public class Project implements Serializable {
dataOverlay.setProject(this);
}
- protected void setOverviewImages(final List<OverviewImage> overviewImages) {
- this.overviewImages = overviewImages;
+ public License getLicense() {
+ return license;
}
- protected void setProjectBackgrounds(final List<ProjectBackground> projectBackgrounds) {
- this.projectBackgrounds = projectBackgrounds;
+ public void setLicense(final License license) {
+ this.license = license;
+ }
+
+ public String getCustomLicenseUrl() {
+ return customLicenseUrl;
}
+ public void setCustomLicenseUrl(final String customLicenseUrl) {
+ this.customLicenseUrl = customLicenseUrl;
+ }
+
+ public String getCustomLicenseName() {
+ return customLicenseName;
+ }
+
+ public void setCustomLicenseName(final String customLicenseName) {
+ this.customLicenseName = customLicenseName;
+ }
}
diff --git a/model/src/main/java/lcsb/mapviewer/model/job/MinervaJobType.java b/model/src/main/java/lcsb/mapviewer/model/job/MinervaJobType.java
index f90016f9143b3c862159c4fff07c8bc8b36ce0a7..409561f504bd51465cc7b5e5dab49eeb0e9f07e0 100644
--- a/model/src/main/java/lcsb/mapviewer/model/job/MinervaJobType.java
+++ b/model/src/main/java/lcsb/mapviewer/model/job/MinervaJobType.java
@@ -4,6 +4,12 @@ public enum MinervaJobType {
REFRESH_CACHE,
REFRESH_MIRIAM_INFO,
+ REFRESH_DRUG_INFO,
+
+ REFRESH_CHEMICAL_INFO,
+
+ REFRESH_MI_RNA_INFO,
+
DELETE_PROJECT,
CREATE_PROJECT,
CREATE_PROJECT_FAILURE,
diff --git a/model/src/main/java/lcsb/mapviewer/model/map/MiriamData.java b/model/src/main/java/lcsb/mapviewer/model/map/MiriamData.java
index 1ef5f096e041a7fb1681b31b06c792c3f1f3953e..71c1fd0ca684c574e20095ef551678b88a8f057d 100644
--- a/model/src/main/java/lcsb/mapviewer/model/map/MiriamData.java
+++ b/model/src/main/java/lcsb/mapviewer/model/map/MiriamData.java
@@ -62,7 +62,7 @@ public class MiriamData implements Comparable<MiriamData>, Serializable {
/**
* Resource identifier in the database.
*/
- @Column(nullable = false)
+ @Column(nullable = false, length = 512)
private String resource = "";
/**
diff --git a/pathvisio/pom.xml b/pathvisio/pom.xml
index a84aee0627b8554420fdcd91ca35a75268d85c67..97ea99b0d414c5d16b5b4b64755fb78878610a0b 100644
--- a/pathvisio/pom.xml
+++ b/pathvisio/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>pathvisio</artifactId>
<name>Pathvisio plugin</name>
@@ -77,26 +77,26 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-graphics</artifactId>
<scope>test</scope>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model-command</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- Log4J2 -->
diff --git a/persist/pom.xml b/persist/pom.xml
index a5eb98d21804a19336a34d102c2c13ee036faec7..b7b4648513e72b72eac0b3221c837da62b60ddc3 100644
--- a/persist/pom.xml
+++ b/persist/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>persist</artifactId>
@@ -26,7 +26,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- Hibernate -->
diff --git a/persist/src/main/java/lcsb/mapviewer/persist/CustomDatabasePopulator.java b/persist/src/main/java/lcsb/mapviewer/persist/CustomDatabasePopulator.java
index 7e0f8128d039f829d4362f0521d7159b081697da..357cd3346e04eba9c99234b9e5d3c1b213492e49 100644
--- a/persist/src/main/java/lcsb/mapviewer/persist/CustomDatabasePopulator.java
+++ b/persist/src/main/java/lcsb/mapviewer/persist/CustomDatabasePopulator.java
@@ -1,12 +1,5 @@
package lcsb.mapviewer.persist;
-import java.sql.Connection;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.sql.DataSource;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.flywaydb.core.Flyway;
@@ -15,12 +8,18 @@ import org.springframework.jdbc.datasource.init.DatabasePopulator;
import org.springframework.jdbc.datasource.init.ScriptException;
import org.springframework.stereotype.Service;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
@Service
public class CustomDatabasePopulator implements DatabasePopulator {
- private Logger logger = LogManager.getLogger();
+ private final Logger logger = LogManager.getLogger();
- private ConfigurationHolder config;
+ private final ConfigurationHolder config;
private DataSource dataSource;
@@ -34,11 +33,13 @@ public class CustomDatabasePopulator implements DatabasePopulator {
public void populate(final Connection connection) throws ScriptException {
String migrationFolder = "postgres";
if (config.getDbDriver().equals("org.hsqldb.jdbcDriver")) {
- migrationFolder = "hsql";
+ migrationFolder = "db.migration.hsql";
}
- List<String> locations = new ArrayList<>(
+ final List<String> locations = new ArrayList<>(
Arrays.asList("classpath:lcsb.mapviewer.persist/migration/" + migrationFolder,
- "classpath:db.migration." + migrationFolder));
+ "classpath:db.migration." + migrationFolder,
+ "classpath:" + migrationFolder
+ ));
if (config.getPathToDataScripts() != null) {
logger.info("Additional SQL scripts located at: " + config.getPathToDataScripts());
locations.add("filesystem:" + config.getPathToDataScripts());
diff --git a/persist/src/main/java/lcsb/mapviewer/persist/dao/LicenseDao.java b/persist/src/main/java/lcsb/mapviewer/persist/dao/LicenseDao.java
new file mode 100644
index 0000000000000000000000000000000000000000..e0efd27687c73f49bc9f097d47accdf7fa11931f
--- /dev/null
+++ b/persist/src/main/java/lcsb/mapviewer/persist/dao/LicenseDao.java
@@ -0,0 +1,39 @@
+package lcsb.mapviewer.persist.dao;
+
+import java.util.List;
+
+import org.hibernate.query.Query;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+import lcsb.mapviewer.common.exception.NotImplementedException;
+import lcsb.mapviewer.model.License;
+
+@Repository
+public class LicenseDao extends BaseDao<License> {
+
+ public LicenseDao() {
+ super(License.class);
+ }
+
+ @SuppressWarnings("unchecked")
+ public Page<License> getByFilter(final Pageable pageable) {
+ String queryString = "from " + this.getClazz().getSimpleName();
+ Query<?> query = getSession().createQuery(queryString);
+
+ if (pageable.getSort().isUnsorted()) {
+ queryString += " order by id";
+ } else {
+ throw new NotImplementedException("Sorting is not implemented");
+ }
+
+ if (pageable.isPaged()) {
+ query.setFirstResult(pageable.getPageNumber() * pageable.getPageSize());
+ query.setMaxResults(pageable.getPageSize());
+ }
+ return new PageImpl<License>((List<License>) query.list(), pageable, getCount());
+ }
+
+}
diff --git a/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.2__cc_0.sql b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.2__cc_0.sql
new file mode 100644
index 0000000000000000000000000000000000000000..b2d6d171fcd0fc05d4ec90df5d0be0e7c4a846bb
--- /dev/null
+++ b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.2__cc_0.sql
@@ -0,0 +1,129 @@
+SET DATABASE SQL SYNTAX PGS TRUE;
+
+INSERT INTO license_table (name, content) values ('CC0 1.0 Universal', '
+<h3><em>Statement of Purpose</em></h3>
+<p>The laws of most jurisdictions throughout the world
+automatically confer exclusive Copyright and Related Rights
+(defined below) upon the creator and subsequent owner(s) (each
+and all, an "owner") of an original work of authorship and/or
+a database (each, a "Work").</p>
+<p>Certain owners wish to permanently relinquish those rights
+to a Work for the purpose of contributing to a commons of
+creative, cultural and scientific works ("Commons") that the
+public can reliably and without fear of later claims of
+infringement build upon, modify, incorporate in other works,
+reuse and redistribute as freely as possible in any form
+whatsoever and for any purposes, including without limitation
+commercial purposes. These owners may contribute to the
+Commons to promote the ideal of a free culture and the further
+production of creative, cultural and scientific works, or to
+gain reputation or greater distribution for their Work in part
+through the use and efforts of others.</p>
+<p>For these and/or other purposes and motivations, and
+without any expectation of additional consideration or
+compensation, the person associating CC0 with a Work (the
+"Affirmer"), to the extent that he or she is an owner of
+Copyright and Related Rights in the Work, voluntarily elects
+to apply CC0 to the Work and publicly distribute the Work
+under its terms, with knowledge of his or her Copyright and
+Related Rights in the Work and the meaning and intended legal
+effect of CC0 on those rights.</p>
+<p><strong>1. Copyright and Related Rights.</strong>
+A Work made available under CC0 may be protected by
+copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but
+are not limited to, the following:
+</p>
+<ol type="i">
+<li>the right to reproduce, adapt, distribute, perform,
+display, communicate, and translate a Work;</li>
+<li> moral rights retained by the original author(s) and/or
+performer(s);</li>
+<li>publicity and privacy rights pertaining to a person''s
+image or likeness depicted in a Work;</li>
+<li>rights protecting against unfair competition in regards
+to a Work, subject to the limitations in paragraph 4(a),
+below;</li>
+<li>rights protecting the extraction, dissemination, use and
+reuse of data in a Work;</li>
+<li>database rights (such as those arising under Directive
+96/9/EC of the European Parliament and of the Council of 11
+March 1996 on the legal protection of databases, and under
+any national implementation thereof, including any amended
+or successor version of such directive); and</li>
+<li>other similar, equivalent or corresponding rights
+throughout the world based on applicable law or treaty, and
+any national implementations thereof.</li>
+</ol>
+<p><strong>2. Waiver.</strong> To the greatest extent
+permitted by, but not in contravention of, applicable law,
+Affirmer hereby overtly, fully, permanently, irrevocably and
+unconditionally waives, abandons, and surrenders all of
+Affirmer''s Copyright and Related Rights and associated claims
+and causes of action, whether now known or unknown (including
+existing as well as future claims and causes of action), in
+the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty
+(including future time extensions), (iii) in any current or
+future medium and for any number of copies, and (iv) for any
+purpose whatsoever, including without limitation commercial,
+advertising or promotional purposes (the "Waiver"). Affirmer
+makes the Waiver for the benefit of each member of the public
+at large and to the detriment of Affirmer''s heirs and
+successors, fully intending that such Waiver shall not be
+subject to revocation, rescission, cancellation, termination,
+or any other legal or equitable action to disrupt the quiet
+enjoyment of the Work by the public as contemplated by
+Affirmer''s express Statement of Purpose.
+</p>
+<p><strong>3. Public License Fallback.</strong> Should any
+part of the Waiver for any reason be judged legally invalid or
+ineffective under applicable law, then the Waiver shall be
+preserved to the maximum extent permitted taking into account
+Affirmer''s express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each
+affected person a royalty-free, non transferable, non
+sublicensable, non exclusive, irrevocable and unconditional
+license to exercise Affirmer''s Copyright and Related Rights
+in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty
+(including future time extensions), (iii) in any current or
+future medium and for any number of copies, and (iv) for any
+purpose whatsoever, including without limitation commercial,
+advertising or promotional purposes (the "License"). The
+License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the
+License for any reason be judged legally invalid or
+ineffective under applicable law, such partial invalidity or
+ineffectiveness shall not invalidate the remainder of the
+License, and in such case Affirmer hereby affirms that he or
+she will not (i) exercise any of his or her remaining
+Copyright and Related Rights in the Work or (ii) assert any
+associated claims and causes of action with respect to the
+Work, in either case contrary to Affirmer''s express Statement
+of Purpose.</p>
+<p><strong>4. Limitations and Disclaimers.</strong></p>
+<ol type="a">
+<li>No trademark or patent rights held by Affirmer are
+waived, abandoned, surrendered, licensed or otherwise
+affected by this document.</li>
+<li>Affirmer offers the Work as-is and makes no
+representations or warranties of any kind concerning the
+Work, express, implied, statutory or otherwise, including
+without limitation warranties of title, merchantability,
+fitness for a particular purpose, non infringement, or the
+absence of latent or other defects, accuracy, or the present
+or absence of errors, whether or not discoverable, all to
+the greatest extent permissible under applicable law.</li>
+<li>Affirmer disclaims responsibility for clearing rights of
+other persons that may apply to the Work or any use thereof,
+including without limitation any person''s Copyright and
+Related Rights in the Work. Further, Affirmer disclaims
+responsibility for obtaining any necessary consents,
+permissions or other rights required for any use of the
+Work.</li>
+<li>Affirmer understands and acknowledges that Creative
+Commons is not a party to this document and has no duty or
+obligation with respect to this CC0 or use of the Work.</li>
+</ol>
+');
\ No newline at end of file
diff --git a/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.3__cc_by.sql b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.3__cc_by.sql
new file mode 100644
index 0000000000000000000000000000000000000000..083f1cf26005c7792b0cc7cb02bd9869a811995a
--- /dev/null
+++ b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.3__cc_by.sql
@@ -0,0 +1,120 @@
+SET DATABASE SQL SYNTAX PGS TRUE;
+
+INSERT INTO license_table (name, content) values ('Creative Commons Attribution 4.0 International Public License', '
+<h3>Creative Commons Attribution 4.0 International Public License</h3>
+<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
+<p id="s1"><strong>Section 1 – Definitions.</strong></p>
+<ol type="a">
+<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
+<li id="s1b"><strong>Adapter''s License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>
+<li id="s1c"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>
+<li id="s1d"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not
+be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar
+international agreements.</li>
+<li id="s1e"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
+<li id="s1f"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
+<li id="s1g"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
+<li id="s1h"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
+<li id="s1i"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
+<li id="s1j"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
+<li id="s1k"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
+</ol>
+<p id="s2"><strong>Section 2 – Scope.</strong></p>
+<ol type="a">
+<li id="s2a"><strong>License grant</strong>.
+<ol>
+<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+<ol type="A">
+<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part; and</li>
+<li id="s2a1B">produce, reproduce, and Share Adapted Material.</li>
+</ol>
+</li><li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
+<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li>
+<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li>
+<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>.
+<div class="para">
+<ol type="A">
+<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
+<li id="s2a5B"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
+</ol>
+</div>
+</li><li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li>
+</ol>
+</li><li id="s2b"><p><strong>Other rights</strong>.</p>
+<ol>
+<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
+<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li>
+<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>
+</ol>
+</li>
+</ol>
+<p id="s3"><strong>Section 3 – License Conditions.</strong></p>
+<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
+<ol type="a">
+<li id="s3a"><p><strong>Attribution</strong>.</p>
+<ol>
+<li id="s3a1"><p>If You Share the Licensed Material (including in modified form), You must:</p>
+<ol type="A">
+<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material:
+<ol type="i">
+<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
+<li id="s3a1Aii">a copyright notice;</li>
+<li id="s3a1Aiii">a notice that refers to this Public License; </li>
+<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li>
+<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
+</ol>
+</li><li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
+<li id="s3a1C">indicate the Licensed Material is licensed under this Public License,
+and include the text of, or the URI or hyperlink to, this Public
+License.</li>
+</ol>
+</li>
+<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
+<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li>
+<li id="s3a4">If You Share Adapted Material You produce, the Adapter''s License You apply must not prevent recipients of the Adapted Material from complying with this Public License.</li>
+</ol>
+</li>
+</ol>
+<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p>
+<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
+<ol type="a">
+<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;</li>
+<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>
+<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>
+</ol>
+For the avoidance of doubt, this Section
+<a href="#s4">4</a>
+ supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
+<ol style="font-weight: bold;" type="a">
+<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
+<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
+</ol>
+<ol start="3" type="a">
+<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
+</ol>
+<p id="s6"><strong>Section 6 – Term and Termination.</strong></p>
+<ol type="a">
+<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
+<li id="s6b">
+<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p>
+<ol>
+<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
+<li id="s6b2">upon express reinstatement by the Licensor.</li>
+</ol>
+For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>
+<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
+<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li>
+</ol>
+<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p>
+<ol type="a">
+<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
+<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
+</ol>
+<p id="s8"><strong>Section 8 – Interpretation.</strong></p>
+<ol type="a">
+<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
+<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
+<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
+<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
+</ol>');
\ No newline at end of file
diff --git a/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.4__cc_by_sa.sql b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.4__cc_by_sa.sql
new file mode 100644
index 0000000000000000000000000000000000000000..7c9cce45ecbaccb075aace89b88e5c2a0a822a8c
--- /dev/null
+++ b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.4__cc_by_sa.sql
@@ -0,0 +1,130 @@
+SET DATABASE SQL SYNTAX PGS TRUE;
+
+INSERT INTO license_table (name, content) values ('Creative Commons Attribution-ShareAlike 4.0 International Public License', '
+<h3>Creative Commons Attribution-ShareAlike 4.0 International Public License</h3>
+<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
+<p id="s1"><strong>Section 1 – Definitions.</strong></p>
+<ol type="a">
+<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
+<li id="s1b"><strong>Adapter''s License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>
+<li id="s1c"><strong>BY-SA Compatible License</strong> means a license listed at <a href="//creativecommons.org/compatiblelicenses"> creativecommons.org/compatiblelicenses</a>, approved by Creative Commons as essentially the equivalent of this Public License.</li>
+<li id="s1d"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>
+<li id="s1e"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not
+be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar
+international agreements.</li>
+<li id="s1f"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
+<li id="s1g"><strong>License Elements</strong> means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.</li>
+<li id="s1h"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
+<li id="s1i"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
+<li id="s1j"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
+<li id="s1k"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
+<li id="s1l"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
+<li id="s1m"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
+</ol>
+<p id="s2"><strong>Section 2 – Scope.</strong></p>
+<ol type="a">
+<li id="s2a"><strong>License grant</strong>.
+<ol>
+<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+<ol type="A">
+<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part; and</li>
+<li id="s2a1B">produce, reproduce, and Share Adapted Material.</li>
+</ol>
+</li><li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
+<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li>
+<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li>
+<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>.
+<div class="para">
+<ol type="A">
+<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
+<li id="s2a5B"><span style="text-decoration: underline;">Additional offer from the Licensor – Adapted Material</span>. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.</li>
+<li id="s2a5C"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
+</ol>
+</div>
+</li><li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li>
+</ol>
+</li><li id="s2b"><p><strong>Other rights</strong>.</p>
+<ol>
+<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
+<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li>
+<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>
+</ol>
+</li>
+</ol>
+<p id="s3"><strong>Section 3 – License Conditions.</strong></p>
+<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
+<ol type="a">
+<li id="s3a"><p><strong>Attribution</strong>.</p>
+<ol>
+<li id="s3a1"><p>If You Share the Licensed Material (including in modified form), You must:</p>
+<ol type="A">
+<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material:
+<ol type="i">
+<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
+<li id="s3a1Aii">a copyright notice;</li>
+<li id="s3a1Aiii">a notice that refers to this Public License; </li>
+<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li>
+<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
+</ol>
+</li><li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
+<li id="s3a1C">indicate the Licensed Material is licensed under this Public License,
+and include the text of, or the URI or hyperlink to, this Public
+License.</li>
+</ol>
+</li>
+<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
+<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li>
+</ol>
+</li>
+<li id="s3b"><strong>ShareAlike</strong>.
+<p>In addition to the conditions in Section <a href="#s3a">3(a)</a>, if You Share Adapted Material You produce, the following conditions also apply.</p>
+<ol>
+<li id="s3b1">The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.</li>
+<li id="s3b2">You must include the text of, or the URI or hyperlink to, the Adapter''s License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.</li>
+<li id="s3b3">You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter''s License You apply.</li>
+</ol>
+</li>
+</ol>
+<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
+<ol type="a">
+<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;</li>
+<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section <a href="#s3b">3(b)</a>; and</li>
+<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>
+</ol>
+For the avoidance of doubt, this Section
+<a href="#s4">4</a>
+ supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
+<ol style="font-weight: bold;" type="a">
+<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
+<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
+</ol>
+<ol start="3" type="a">
+<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
+</ol>
+<p id="s6"><strong>Section 6 – Term and Termination.</strong></p>
+<ol type="a">
+<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
+<li id="s6b">
+<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p>
+<ol>
+<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
+<li id="s6b2">upon express reinstatement by the Licensor.</li>
+</ol>
+For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>
+<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
+<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li>
+</ol>
+<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p>
+<ol type="a">
+<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
+<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
+</ol>
+<p id="s8"><strong>Section 8 – Interpretation.</strong></p>
+<ol type="a">
+<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
+<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
+<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
+<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
+</ol>
+');
\ No newline at end of file
diff --git a/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.5__cc_by_nc.sql b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.5__cc_by_nc.sql
new file mode 100644
index 0000000000000000000000000000000000000000..65115dcea2c4b0efccc959bdd7901856dbb22e9a
--- /dev/null
+++ b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.5__cc_by_nc.sql
@@ -0,0 +1,122 @@
+SET DATABASE SQL SYNTAX PGS TRUE;
+
+INSERT INTO license_table (name, content) values ('Creative Commons Attribution-NonCommercial 4.0 International', '
+<h3>Creative Commons Attribution-NonCommercial 4.0 International Public License</h3>
+<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
+<p id="s1"><strong>Section 1 – Definitions.</strong></p>
+<ol type="a">
+<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
+<li id="s1b"><strong>Adapter''s License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>
+<li id="s1c"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>
+<li id="s1d"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not
+be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar
+international agreements.</li>
+<li id="s1e"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
+<li id="s1f"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
+<li id="s1g"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
+<li id="s1h"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
+<li id="s1i"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li>
+<li id="s1j"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
+<li id="s1k"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
+<li id="s1l"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
+</ol>
+<p id="s2"><strong>Section 2 – Scope.</strong></p>
+<ol type="a">
+<li id="s2a"><strong>License grant</strong>.
+<ol>
+<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+<ol type="A">
+<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li>
+<li id="s2a1B">produce, reproduce, and Share Adapted Material for NonCommercial purposes only.</li>
+</ol>
+</li><li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
+<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li>
+<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li>
+<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>.
+<div class="para">
+<ol type="A">
+<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
+<li id="s2a5B"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
+</ol>
+</div>
+</li><li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li>
+</ol>
+</li><li id="s2b"><p><strong>Other rights</strong>.</p>
+<ol>
+<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
+<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li>
+<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li>
+</ol>
+</li>
+</ol>
+<p id="s3"><strong>Section 3 – License Conditions.</strong></p>
+<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
+<ol type="a">
+<li id="s3a"><p><strong>Attribution</strong>.</p>
+<ol>
+<li id="s3a1"><p>If You Share the Licensed Material (including in modified form), You must:</p>
+<ol type="A">
+<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material:
+<ol type="i">
+<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
+<li id="s3a1Aii">a copyright notice;</li>
+<li id="s3a1Aiii">a notice that refers to this Public License; </li>
+<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li>
+<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
+</ol>
+</li><li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
+<li id="s3a1C">indicate the Licensed Material is licensed under this Public License,
+and include the text of, or the URI or hyperlink to, this Public
+License.</li>
+</ol>
+</li>
+<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
+<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li>
+<li id="s3a4">If You Share Adapted Material You produce, the Adapter''s License You apply must not prevent recipients of the Adapted Material from complying with this Public License.</li>
+</ol>
+</li>
+</ol>
+<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p>
+<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
+<ol type="a">
+<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only;</li>
+<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>
+<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>
+</ol>
+For the avoidance of doubt, this Section
+<a href="#s4">4</a>
+ supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
+<ol style="font-weight: bold;" type="a">
+<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
+<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
+</ol>
+<ol start="3" type="a">
+<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
+</ol>
+<p id="s6"><strong>Section 6 – Term and Termination.</strong></p>
+<ol type="a">
+<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
+<li id="s6b">
+<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p>
+<ol>
+<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
+<li id="s6b2">upon express reinstatement by the Licensor.</li>
+</ol>
+For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>
+<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
+<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li>
+</ol>
+<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p>
+<ol type="a">
+<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
+<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
+</ol>
+<p id="s8"><strong>Section 8 – Interpretation.</strong></p>
+<ol type="a">
+<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
+<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
+<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
+<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
+</ol>
+');
\ No newline at end of file
diff --git a/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.6__cc_by_nc_sa.sql b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.6__cc_by_nc_sa.sql
new file mode 100644
index 0000000000000000000000000000000000000000..b4693e14ce76b09e936ea6aeb71acd417ec3dc2b
--- /dev/null
+++ b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.6__cc_by_nc_sa.sql
@@ -0,0 +1,132 @@
+SET DATABASE SQL SYNTAX PGS TRUE;
+
+INSERT INTO license_table (name, content) values ('Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License', '
+<h3>Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License</h3>
+<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
+<p id="s1"><strong>Section 1 – Definitions.</strong></p>
+<ol type="a">
+<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
+<li id="s1b"><strong>Adapter''s License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>
+<li id="s1c"><strong>BY-NC-SA Compatible License</strong> means a license listed at <a href="//creativecommons.org/compatiblelicenses"> creativecommons.org/compatiblelicenses</a>, approved by Creative Commons as essentially the equivalent of this Public License.</li>
+<li id="s1d"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>
+<li id="s1e"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not
+be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar
+international agreements.</li>
+<li id="s1f"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
+<li id="s1g"><strong>License Elements</strong> means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution, NonCommercial, and ShareAlike.</li>
+<li id="s1h"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
+<li id="s1i"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
+<li id="s1j"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
+<li id="s1k"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li>
+<li id="s1l"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
+<li id="s1m"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
+<li id="s1n"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
+</ol>
+<p id="s2"><strong>Section 2 – Scope.</strong></p>
+<ol type="a">
+<li id="s2a"><strong>License grant</strong>.
+<ol>
+<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+<ol type="A">
+<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li>
+<li id="s2a1B">produce, reproduce, and Share Adapted Material for NonCommercial purposes only.</li>
+</ol>
+</li><li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
+<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li>
+<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li>
+<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>.
+<div class="para">
+<ol type="A">
+<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
+<li id="s2a5B"><span style="text-decoration: underline;">Additional offer from the Licensor – Adapted Material</span>. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.</li>
+<li id="s2a5C"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
+</ol>
+</div>
+</li><li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li>
+</ol>
+</li><li id="s2b"><p><strong>Other rights</strong>.</p>
+<ol>
+<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
+<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li>
+<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li>
+</ol>
+</li>
+</ol>
+<p id="s3"><strong>Section 3 – License Conditions.</strong></p>
+<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
+<ol type="a">
+<li id="s3a"><p><strong>Attribution</strong>.</p>
+<ol>
+<li id="s3a1"><p>If You Share the Licensed Material (including in modified form), You must:</p>
+<ol type="A">
+<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material:
+<ol type="i">
+<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
+<li id="s3a1Aii">a copyright notice;</li>
+<li id="s3a1Aiii">a notice that refers to this Public License; </li>
+<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li>
+<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
+</ol>
+</li><li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
+<li id="s3a1C">indicate the Licensed Material is licensed under this Public License,
+and include the text of, or the URI or hyperlink to, this Public
+License.</li>
+</ol>
+</li>
+<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
+<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li>
+</ol>
+</li>
+<li id="s3b"><strong>ShareAlike</strong>.
+<p>In addition to the conditions in Section <a href="#s3a">3(a)</a>, if You Share Adapted Material You produce, the following conditions also apply.</p>
+<ol>
+<li id="s3b1">The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-NC-SA Compatible License.</li>
+<li id="s3b2">You must include the text of, or the URI or hyperlink to, the Adapter''s License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.</li>
+<li id="s3b3">You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter''s License You apply.</li>
+</ol>
+</li>
+</ol>
+<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p>
+<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
+<ol type="a">
+<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only;</li>
+<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section <a href="#s3b">3(b)</a>; and</li>
+<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>
+</ol>
+For the avoidance of doubt, this Section
+<a href="#s4">4</a>
+ supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
+<ol style="font-weight: bold;" type="a">
+<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
+<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
+</ol>
+<ol start="3" type="a">
+<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
+</ol>
+<p id="s6"><strong>Section 6 – Term and Termination.</strong></p>
+<ol type="a">
+<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
+<li id="s6b">
+<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p>
+<ol>
+<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
+<li id="s6b2">upon express reinstatement by the Licensor.</li>
+</ol>
+For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>
+<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
+<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li>
+</ol>
+<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p>
+<ol type="a">
+<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
+<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
+</ol>
+<p id="s8"><strong>Section 8 – Interpretation.</strong></p>
+<ol type="a">
+<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
+<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
+<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
+<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
+</ol>
+');
\ No newline at end of file
diff --git a/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.7__cc_by_nd.sql b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.7__cc_by_nd.sql
new file mode 100644
index 0000000000000000000000000000000000000000..6d43e7d66d240c18abc8f568383d5505af984b1d
--- /dev/null
+++ b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.7__cc_by_nd.sql
@@ -0,0 +1,120 @@
+SET DATABASE SQL SYNTAX PGS TRUE;
+
+INSERT INTO license_table (name, content) values ('Creative Commons Attribution-NoDerivatives 4.0 International Public License', '
+<h3>Creative Commons Attribution-NoDerivatives 4.0 International Public License</h3>
+<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NoDerivatives 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
+<p id="s1"><strong>Section 1 – Definitions.</strong></p>
+<ol type="a">
+<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
+<li id="s1b"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>
+<li id="s1c"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not
+be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar
+international agreements.</li>
+<li id="s1d"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
+<li id="s1e"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
+<li id="s1f"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
+<li id="s1g"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
+<li id="s1h"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
+<li id="s1i"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
+<li id="s1j"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
+</ol>
+<p id="s2"><strong>Section 2 – Scope.</strong></p>
+<ol type="a">
+<li id="s2a"><strong>License grant</strong>.
+<ol>
+<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+<ol type="A">
+<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part; and</li>
+<li id="s2a1B">produce and reproduce, but not Share, Adapted Material.</li>
+</ol>
+</li><li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
+<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li>
+<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li>
+<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>.
+<div class="para">
+<ol type="A">
+<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
+<li id="s2a5B"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
+</ol>
+</div>
+</li><li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li>
+</ol>
+</li><li id="s2b"><p><strong>Other rights</strong>.</p>
+<ol>
+<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
+<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li>
+<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>
+</ol>
+</li>
+</ol>
+<p id="s3"><strong>Section 3 – License Conditions.</strong></p>
+<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
+<ol type="a">
+<li id="s3a"><p><strong>Attribution</strong>.</p>
+<ol>
+<li id="s3a1"><p>If You Share the Licensed Material, You must:</p>
+<ol type="A">
+<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material:
+<ol type="i">
+<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
+<li id="s3a1Aii">a copyright notice;</li>
+<li id="s3a1Aiii">a notice that refers to this Public License; </li>
+<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li>
+<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
+</ol>
+</li><li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
+<li id="s3a1C">indicate the Licensed Material is licensed under this Public License,
+and include the text of, or the URI or hyperlink to, this Public
+License.</li>
+</ol>
+For the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material.
+</li>
+<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
+<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li>
+</ol>
+</li>
+</ol>
+<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p>
+<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
+<ol type="a">
+<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database, provided You do not Share Adapted Material;</li>
+<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>
+<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>
+</ol>
+For the avoidance of doubt, this Section
+<a href="#s4">4</a>
+ supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
+<ol style="font-weight: bold;" type="a">
+<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
+<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
+</ol>
+<ol start="3" type="a">
+<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
+</ol>
+<p id="s6"><strong>Section 6 – Term and Termination.</strong></p>
+<ol type="a">
+<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
+<li id="s6b">
+<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p>
+<ol>
+<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
+<li id="s6b2">upon express reinstatement by the Licensor.</li>
+</ol>
+For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>
+<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
+<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li>
+</ol>
+<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p>
+<ol type="a">
+<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
+<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
+</ol>
+<p id="s8"><strong>Section 8 – Interpretation.</strong></p>
+<ol type="a">
+<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
+<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
+<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
+<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
+</ol>
+');
\ No newline at end of file
diff --git a/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.8__cc_by_nc_nd.sql b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.8__cc_by_nc_nd.sql
new file mode 100644
index 0000000000000000000000000000000000000000..35b7ab2a5f6a67c35c0dda1d5bcbb083b9fc2b3e
--- /dev/null
+++ b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907.8__cc_by_nc_nd.sql
@@ -0,0 +1,121 @@
+SET DATABASE SQL SYNTAX PGS TRUE;
+
+INSERT INTO license_table (name, content) values ('Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License', '
+<h3>Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License</h3>
+<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
+<p id="s1"><strong>Section 1 – Definitions.</strong></p>
+<ol type="a">
+<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
+<li id="s1b"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>
+<li id="s1c"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not
+be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar
+international agreements.</li>
+<li id="s1d"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
+<li id="s1e"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
+<li id="s1f"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
+<li id="s1g"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
+<li id="s1h"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li>
+<li id="s1i"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
+<li id="s1j"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
+<li id="s1k"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
+</ol>
+<p id="s2"><strong>Section 2 – Scope.</strong></p>
+<ol type="a">
+<li id="s2a"><strong>License grant</strong>.
+<ol>
+<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+<ol type="A">
+<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li>
+<li id="s2a1B">produce and reproduce, but not Share, Adapted Material for NonCommercial purposes only.</li>
+</ol>
+</li><li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
+<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li>
+<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li>
+<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>.
+<div class="para">
+<ol type="A">
+<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
+<li id="s2a5B"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
+</ol>
+</div>
+</li><li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li>
+</ol>
+</li><li id="s2b"><p><strong>Other rights</strong>.</p>
+<ol>
+<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
+<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li>
+<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li>
+</ol>
+</li>
+</ol>
+<p id="s3"><strong>Section 3 – License Conditions.</strong></p>
+<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
+<ol type="a">
+<li id="s3a"><p><strong>Attribution</strong>.</p>
+<ol>
+<li id="s3a1"><p>If You Share the Licensed Material, You must:</p>
+<ol type="A">
+<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material:
+<ol type="i">
+<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
+<li id="s3a1Aii">a copyright notice;</li>
+<li id="s3a1Aiii">a notice that refers to this Public License; </li>
+<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li>
+<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
+</ol>
+</li><li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
+<li id="s3a1C">indicate the Licensed Material is licensed under this Public License,
+and include the text of, or the URI or hyperlink to, this Public
+License.</li>
+</ol>
+For the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material.
+</li>
+<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
+<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li>
+</ol>
+</li>
+</ol>
+<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p>
+<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
+<ol type="a">
+<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only and provided You do not Share Adapted Material;</li>
+<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>
+<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>
+</ol>
+For the avoidance of doubt, this Section
+<a href="#s4">4</a>
+ supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
+<ol style="font-weight: bold;" type="a">
+<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
+<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
+</ol>
+<ol start="3" type="a">
+<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
+</ol>
+<p id="s6"><strong>Section 6 – Term and Termination.</strong></p>
+<ol type="a">
+<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
+<li id="s6b">
+<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p>
+<ol>
+<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
+<li id="s6b2">upon express reinstatement by the Licensor.</li>
+</ol>
+For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>
+<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
+<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li>
+</ol>
+<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p>
+<ol type="a">
+<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
+<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
+</ol>
+<p id="s8"><strong>Section 8 – Interpretation.</strong></p>
+<ol type="a">
+<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
+<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
+<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
+<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
+</ol>
+');
\ No newline at end of file
diff --git a/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907__create_license.sql b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907__create_license.sql
new file mode 100644
index 0000000000000000000000000000000000000000..7d16bcfd092a2a929184df83927f53768703bc59
--- /dev/null
+++ b/persist/src/main/resources/db/migration/hsql/16.3.0/V16.3.0.20230907__create_license.sql
@@ -0,0 +1,20 @@
+SET DATABASE SQL SYNTAX PGS TRUE;
+
+CREATE SEQUENCE public.license_sequence
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE;
+
+CREATE TABLE public.license_table (
+ id integer DEFAULT nextval('public.license_sequence') NOT NULL,
+ name character varying(255),
+ content text,
+ CONSTRAINT license_pk PRIMARY KEY (id),
+
+);
+
+ALTER TABLE project_table add column license_id integer;
+
+ALTER TABLE project_table
+ ADD CONSTRAINT project_table_license_fk FOREIGN KEY (license_id) REFERENCES license_table(id);
diff --git a/persist/src/main/resources/17.0.3/V17.0.3.20240613__remove_empt_ichi_miriam.sql b/persist/src/main/resources/db/migration/hsql/17.0.3/V17.0.3.20240613__remove_empt_ichi_miriam.sql
similarity index 100%
rename from persist/src/main/resources/17.0.3/V17.0.3.20240613__remove_empt_ichi_miriam.sql
rename to persist/src/main/resources/db/migration/hsql/17.0.3/V17.0.3.20240613__remove_empt_ichi_miriam.sql
diff --git a/persist/src/main/resources/db/migration/hsql/17.1.0~beta.1/V17.1.0.20240819.2__custom_license_url.sql b/persist/src/main/resources/db/migration/hsql/17.1.0~beta.1/V17.1.0.20240819.2__custom_license_url.sql
new file mode 100644
index 0000000000000000000000000000000000000000..e7a352af6ef18435e63fbbcfcab4776a85cbd731
--- /dev/null
+++ b/persist/src/main/resources/db/migration/hsql/17.1.0~beta.1/V17.1.0.20240819.2__custom_license_url.sql
@@ -0,0 +1,5 @@
+alter table project_table
+ add column custom_license_name character varying(256) default '';
+
+alter table project_table
+ add column custom_license_url character varying(1024) default '';
diff --git a/persist/src/main/resources/db/migration/hsql/17.1.0~beta.1/V17.1.0.20240819__license_url.sql b/persist/src/main/resources/db/migration/hsql/17.1.0~beta.1/V17.1.0.20240819__license_url.sql
new file mode 100644
index 0000000000000000000000000000000000000000..80117f214306321d6eef77f3fca39fd2aa286913
--- /dev/null
+++ b/persist/src/main/resources/db/migration/hsql/17.1.0~beta.1/V17.1.0.20240819__license_url.sql
@@ -0,0 +1,30 @@
+alter table license_table
+ add column url character varying(1024);
+
+update license_table
+set url ='https://creativecommons.org/publicdomain/zero/1.0/'
+where name = 'CC0 1.0 Universal';
+
+update license_table
+set url ='https://creativecommons.org/licenses/by/4.0/'
+where name = 'Creative Commons Attribution 4.0 International Public License';
+
+update license_table
+set url ='https://creativecommons.org/licenses/by-sa/4.0/'
+where name = 'Creative Commons Attribution-ShareAlike 4.0 International Public License';
+
+update license_table
+set url ='https://creativecommons.org/licenses/by-nc/4.0/'
+where name = 'Creative Commons Attribution-NonCommercial 4.0 International';
+
+update license_table
+set url ='https://creativecommons.org/licenses/by-nc-sa/4.0/'
+where name = 'Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License';
+
+update license_table
+set url ='https://creativecommons.org/licenses/by-nd/4.0/'
+where name = 'Creative Commons Attribution-NoDerivatives 4.0 International Public License';
+
+update license_table
+set url ='https://creativecommons.org/licenses/by-nc-nd/4.0/'
+where name = 'Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License';
diff --git a/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.2__cc_0.sql b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.2__cc_0.sql
new file mode 100644
index 0000000000000000000000000000000000000000..3c5d824bde24389946666578b2e1713586955b15
--- /dev/null
+++ b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.2__cc_0.sql
@@ -0,0 +1,127 @@
+INSERT INTO license_table (name, content) values ('CC0 1.0 Universal', '
+<h3><em>Statement of Purpose</em></h3>
+<p>The laws of most jurisdictions throughout the world
+automatically confer exclusive Copyright and Related Rights
+(defined below) upon the creator and subsequent owner(s) (each
+and all, an "owner") of an original work of authorship and/or
+a database (each, a "Work").</p>
+<p>Certain owners wish to permanently relinquish those rights
+to a Work for the purpose of contributing to a commons of
+creative, cultural and scientific works ("Commons") that the
+public can reliably and without fear of later claims of
+infringement build upon, modify, incorporate in other works,
+reuse and redistribute as freely as possible in any form
+whatsoever and for any purposes, including without limitation
+commercial purposes. These owners may contribute to the
+Commons to promote the ideal of a free culture and the further
+production of creative, cultural and scientific works, or to
+gain reputation or greater distribution for their Work in part
+through the use and efforts of others.</p>
+<p>For these and/or other purposes and motivations, and
+without any expectation of additional consideration or
+compensation, the person associating CC0 with a Work (the
+"Affirmer"), to the extent that he or she is an owner of
+Copyright and Related Rights in the Work, voluntarily elects
+to apply CC0 to the Work and publicly distribute the Work
+under its terms, with knowledge of his or her Copyright and
+Related Rights in the Work and the meaning and intended legal
+effect of CC0 on those rights.</p>
+<p><strong>1. Copyright and Related Rights.</strong>
+A Work made available under CC0 may be protected by
+copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but
+are not limited to, the following:
+</p>
+<ol type="i">
+<li>the right to reproduce, adapt, distribute, perform,
+display, communicate, and translate a Work;</li>
+<li> moral rights retained by the original author(s) and/or
+performer(s);</li>
+<li>publicity and privacy rights pertaining to a person''s
+image or likeness depicted in a Work;</li>
+<li>rights protecting against unfair competition in regards
+to a Work, subject to the limitations in paragraph 4(a),
+below;</li>
+<li>rights protecting the extraction, dissemination, use and
+reuse of data in a Work;</li>
+<li>database rights (such as those arising under Directive
+96/9/EC of the European Parliament and of the Council of 11
+March 1996 on the legal protection of databases, and under
+any national implementation thereof, including any amended
+or successor version of such directive); and</li>
+<li>other similar, equivalent or corresponding rights
+throughout the world based on applicable law or treaty, and
+any national implementations thereof.</li>
+</ol>
+<p><strong>2. Waiver.</strong> To the greatest extent
+permitted by, but not in contravention of, applicable law,
+Affirmer hereby overtly, fully, permanently, irrevocably and
+unconditionally waives, abandons, and surrenders all of
+Affirmer''s Copyright and Related Rights and associated claims
+and causes of action, whether now known or unknown (including
+existing as well as future claims and causes of action), in
+the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty
+(including future time extensions), (iii) in any current or
+future medium and for any number of copies, and (iv) for any
+purpose whatsoever, including without limitation commercial,
+advertising or promotional purposes (the "Waiver"). Affirmer
+makes the Waiver for the benefit of each member of the public
+at large and to the detriment of Affirmer''s heirs and
+successors, fully intending that such Waiver shall not be
+subject to revocation, rescission, cancellation, termination,
+or any other legal or equitable action to disrupt the quiet
+enjoyment of the Work by the public as contemplated by
+Affirmer''s express Statement of Purpose.
+</p>
+<p><strong>3. Public License Fallback.</strong> Should any
+part of the Waiver for any reason be judged legally invalid or
+ineffective under applicable law, then the Waiver shall be
+preserved to the maximum extent permitted taking into account
+Affirmer''s express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each
+affected person a royalty-free, non transferable, non
+sublicensable, non exclusive, irrevocable and unconditional
+license to exercise Affirmer''s Copyright and Related Rights
+in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty
+(including future time extensions), (iii) in any current or
+future medium and for any number of copies, and (iv) for any
+purpose whatsoever, including without limitation commercial,
+advertising or promotional purposes (the "License"). The
+License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the
+License for any reason be judged legally invalid or
+ineffective under applicable law, such partial invalidity or
+ineffectiveness shall not invalidate the remainder of the
+License, and in such case Affirmer hereby affirms that he or
+she will not (i) exercise any of his or her remaining
+Copyright and Related Rights in the Work or (ii) assert any
+associated claims and causes of action with respect to the
+Work, in either case contrary to Affirmer''s express Statement
+of Purpose.</p>
+<p><strong>4. Limitations and Disclaimers.</strong></p>
+<ol type="a">
+<li>No trademark or patent rights held by Affirmer are
+waived, abandoned, surrendered, licensed or otherwise
+affected by this document.</li>
+<li>Affirmer offers the Work as-is and makes no
+representations or warranties of any kind concerning the
+Work, express, implied, statutory or otherwise, including
+without limitation warranties of title, merchantability,
+fitness for a particular purpose, non infringement, or the
+absence of latent or other defects, accuracy, or the present
+or absence of errors, whether or not discoverable, all to
+the greatest extent permissible under applicable law.</li>
+<li>Affirmer disclaims responsibility for clearing rights of
+other persons that may apply to the Work or any use thereof,
+including without limitation any person''s Copyright and
+Related Rights in the Work. Further, Affirmer disclaims
+responsibility for obtaining any necessary consents,
+permissions or other rights required for any use of the
+Work.</li>
+<li>Affirmer understands and acknowledges that Creative
+Commons is not a party to this document and has no duty or
+obligation with respect to this CC0 or use of the Work.</li>
+</ol>
+');
\ No newline at end of file
diff --git a/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.3__cc_by.sql b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.3__cc_by.sql
new file mode 100644
index 0000000000000000000000000000000000000000..d4bc4dd19ba3fdccf167d1c39ca58a3b162a9762
--- /dev/null
+++ b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.3__cc_by.sql
@@ -0,0 +1,118 @@
+INSERT INTO license_table (name, content) values ('Creative Commons Attribution 4.0 International Public License', '
+<h3>Creative Commons Attribution 4.0 International Public License</h3>
+<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
+<p id="s1"><strong>Section 1 – Definitions.</strong></p>
+<ol type="a">
+<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
+<li id="s1b"><strong>Adapter''s License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>
+<li id="s1c"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>
+<li id="s1d"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not
+be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar
+international agreements.</li>
+<li id="s1e"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
+<li id="s1f"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
+<li id="s1g"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
+<li id="s1h"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
+<li id="s1i"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
+<li id="s1j"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
+<li id="s1k"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
+</ol>
+<p id="s2"><strong>Section 2 – Scope.</strong></p>
+<ol type="a">
+<li id="s2a"><strong>License grant</strong>.
+<ol>
+<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+<ol type="A">
+<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part; and</li>
+<li id="s2a1B">produce, reproduce, and Share Adapted Material.</li>
+</ol>
+</li><li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
+<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li>
+<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li>
+<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>.
+<div class="para">
+<ol type="A">
+<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
+<li id="s2a5B"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
+</ol>
+</div>
+</li><li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li>
+</ol>
+</li><li id="s2b"><p><strong>Other rights</strong>.</p>
+<ol>
+<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
+<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li>
+<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>
+</ol>
+</li>
+</ol>
+<p id="s3"><strong>Section 3 – License Conditions.</strong></p>
+<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
+<ol type="a">
+<li id="s3a"><p><strong>Attribution</strong>.</p>
+<ol>
+<li id="s3a1"><p>If You Share the Licensed Material (including in modified form), You must:</p>
+<ol type="A">
+<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material:
+<ol type="i">
+<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
+<li id="s3a1Aii">a copyright notice;</li>
+<li id="s3a1Aiii">a notice that refers to this Public License; </li>
+<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li>
+<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
+</ol>
+</li><li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
+<li id="s3a1C">indicate the Licensed Material is licensed under this Public License,
+and include the text of, or the URI or hyperlink to, this Public
+License.</li>
+</ol>
+</li>
+<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
+<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li>
+<li id="s3a4">If You Share Adapted Material You produce, the Adapter''s License You apply must not prevent recipients of the Adapted Material from complying with this Public License.</li>
+</ol>
+</li>
+</ol>
+<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p>
+<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
+<ol type="a">
+<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;</li>
+<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>
+<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>
+</ol>
+For the avoidance of doubt, this Section
+<a href="#s4">4</a>
+ supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
+<ol style="font-weight: bold;" type="a">
+<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
+<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
+</ol>
+<ol start="3" type="a">
+<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
+</ol>
+<p id="s6"><strong>Section 6 – Term and Termination.</strong></p>
+<ol type="a">
+<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
+<li id="s6b">
+<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p>
+<ol>
+<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
+<li id="s6b2">upon express reinstatement by the Licensor.</li>
+</ol>
+For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>
+<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
+<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li>
+</ol>
+<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p>
+<ol type="a">
+<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
+<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
+</ol>
+<p id="s8"><strong>Section 8 – Interpretation.</strong></p>
+<ol type="a">
+<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
+<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
+<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
+<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
+</ol>');
\ No newline at end of file
diff --git a/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.4__cc_by_sa.sql b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.4__cc_by_sa.sql
new file mode 100644
index 0000000000000000000000000000000000000000..f1296331a8ace10744e5ca4cd1d44bf311bd2a0c
--- /dev/null
+++ b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.4__cc_by_sa.sql
@@ -0,0 +1,128 @@
+INSERT INTO license_table (name, content) values ('Creative Commons Attribution-ShareAlike 4.0 International Public License', '
+<h3>Creative Commons Attribution-ShareAlike 4.0 International Public License</h3>
+<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
+<p id="s1"><strong>Section 1 – Definitions.</strong></p>
+<ol type="a">
+<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
+<li id="s1b"><strong>Adapter''s License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>
+<li id="s1c"><strong>BY-SA Compatible License</strong> means a license listed at <a href="//creativecommons.org/compatiblelicenses"> creativecommons.org/compatiblelicenses</a>, approved by Creative Commons as essentially the equivalent of this Public License.</li>
+<li id="s1d"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>
+<li id="s1e"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not
+be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar
+international agreements.</li>
+<li id="s1f"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
+<li id="s1g"><strong>License Elements</strong> means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.</li>
+<li id="s1h"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
+<li id="s1i"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
+<li id="s1j"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
+<li id="s1k"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
+<li id="s1l"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
+<li id="s1m"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
+</ol>
+<p id="s2"><strong>Section 2 – Scope.</strong></p>
+<ol type="a">
+<li id="s2a"><strong>License grant</strong>.
+<ol>
+<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+<ol type="A">
+<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part; and</li>
+<li id="s2a1B">produce, reproduce, and Share Adapted Material.</li>
+</ol>
+</li><li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
+<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li>
+<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li>
+<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>.
+<div class="para">
+<ol type="A">
+<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
+<li id="s2a5B"><span style="text-decoration: underline;">Additional offer from the Licensor – Adapted Material</span>. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.</li>
+<li id="s2a5C"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
+</ol>
+</div>
+</li><li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li>
+</ol>
+</li><li id="s2b"><p><strong>Other rights</strong>.</p>
+<ol>
+<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
+<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li>
+<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>
+</ol>
+</li>
+</ol>
+<p id="s3"><strong>Section 3 – License Conditions.</strong></p>
+<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
+<ol type="a">
+<li id="s3a"><p><strong>Attribution</strong>.</p>
+<ol>
+<li id="s3a1"><p>If You Share the Licensed Material (including in modified form), You must:</p>
+<ol type="A">
+<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material:
+<ol type="i">
+<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
+<li id="s3a1Aii">a copyright notice;</li>
+<li id="s3a1Aiii">a notice that refers to this Public License; </li>
+<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li>
+<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
+</ol>
+</li><li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
+<li id="s3a1C">indicate the Licensed Material is licensed under this Public License,
+and include the text of, or the URI or hyperlink to, this Public
+License.</li>
+</ol>
+</li>
+<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
+<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li>
+</ol>
+</li>
+<li id="s3b"><strong>ShareAlike</strong>.
+<p>In addition to the conditions in Section <a href="#s3a">3(a)</a>, if You Share Adapted Material You produce, the following conditions also apply.</p>
+<ol>
+<li id="s3b1">The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.</li>
+<li id="s3b2">You must include the text of, or the URI or hyperlink to, the Adapter''s License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.</li>
+<li id="s3b3">You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter''s License You apply.</li>
+</ol>
+</li>
+</ol>
+<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
+<ol type="a">
+<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;</li>
+<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section <a href="#s3b">3(b)</a>; and</li>
+<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>
+</ol>
+For the avoidance of doubt, this Section
+<a href="#s4">4</a>
+ supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
+<ol style="font-weight: bold;" type="a">
+<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
+<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
+</ol>
+<ol start="3" type="a">
+<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
+</ol>
+<p id="s6"><strong>Section 6 – Term and Termination.</strong></p>
+<ol type="a">
+<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
+<li id="s6b">
+<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p>
+<ol>
+<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
+<li id="s6b2">upon express reinstatement by the Licensor.</li>
+</ol>
+For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>
+<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
+<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li>
+</ol>
+<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p>
+<ol type="a">
+<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
+<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
+</ol>
+<p id="s8"><strong>Section 8 – Interpretation.</strong></p>
+<ol type="a">
+<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
+<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
+<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
+<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
+</ol>
+');
\ No newline at end of file
diff --git a/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.5__cc_by_nc.sql b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.5__cc_by_nc.sql
new file mode 100644
index 0000000000000000000000000000000000000000..2b0539f4b27144d89dd52f1cc6fa00fb73031ea3
--- /dev/null
+++ b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.5__cc_by_nc.sql
@@ -0,0 +1,120 @@
+INSERT INTO license_table (name, content) values ('Creative Commons Attribution-NonCommercial 4.0 International', '
+<h3>Creative Commons Attribution-NonCommercial 4.0 International Public License</h3>
+<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
+<p id="s1"><strong>Section 1 – Definitions.</strong></p>
+<ol type="a">
+<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
+<li id="s1b"><strong>Adapter''s License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>
+<li id="s1c"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>
+<li id="s1d"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not
+be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar
+international agreements.</li>
+<li id="s1e"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
+<li id="s1f"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
+<li id="s1g"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
+<li id="s1h"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
+<li id="s1i"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li>
+<li id="s1j"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
+<li id="s1k"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
+<li id="s1l"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
+</ol>
+<p id="s2"><strong>Section 2 – Scope.</strong></p>
+<ol type="a">
+<li id="s2a"><strong>License grant</strong>.
+<ol>
+<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+<ol type="A">
+<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li>
+<li id="s2a1B">produce, reproduce, and Share Adapted Material for NonCommercial purposes only.</li>
+</ol>
+</li><li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
+<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li>
+<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li>
+<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>.
+<div class="para">
+<ol type="A">
+<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
+<li id="s2a5B"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
+</ol>
+</div>
+</li><li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li>
+</ol>
+</li><li id="s2b"><p><strong>Other rights</strong>.</p>
+<ol>
+<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
+<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li>
+<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li>
+</ol>
+</li>
+</ol>
+<p id="s3"><strong>Section 3 – License Conditions.</strong></p>
+<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
+<ol type="a">
+<li id="s3a"><p><strong>Attribution</strong>.</p>
+<ol>
+<li id="s3a1"><p>If You Share the Licensed Material (including in modified form), You must:</p>
+<ol type="A">
+<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material:
+<ol type="i">
+<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
+<li id="s3a1Aii">a copyright notice;</li>
+<li id="s3a1Aiii">a notice that refers to this Public License; </li>
+<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li>
+<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
+</ol>
+</li><li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
+<li id="s3a1C">indicate the Licensed Material is licensed under this Public License,
+and include the text of, or the URI or hyperlink to, this Public
+License.</li>
+</ol>
+</li>
+<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
+<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li>
+<li id="s3a4">If You Share Adapted Material You produce, the Adapter''s License You apply must not prevent recipients of the Adapted Material from complying with this Public License.</li>
+</ol>
+</li>
+</ol>
+<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p>
+<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
+<ol type="a">
+<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only;</li>
+<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>
+<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>
+</ol>
+For the avoidance of doubt, this Section
+<a href="#s4">4</a>
+ supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
+<ol style="font-weight: bold;" type="a">
+<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
+<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
+</ol>
+<ol start="3" type="a">
+<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
+</ol>
+<p id="s6"><strong>Section 6 – Term and Termination.</strong></p>
+<ol type="a">
+<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
+<li id="s6b">
+<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p>
+<ol>
+<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
+<li id="s6b2">upon express reinstatement by the Licensor.</li>
+</ol>
+For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>
+<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
+<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li>
+</ol>
+<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p>
+<ol type="a">
+<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
+<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
+</ol>
+<p id="s8"><strong>Section 8 – Interpretation.</strong></p>
+<ol type="a">
+<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
+<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
+<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
+<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
+</ol>
+');
\ No newline at end of file
diff --git a/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.6__cc_by_nc_sa.sql b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.6__cc_by_nc_sa.sql
new file mode 100644
index 0000000000000000000000000000000000000000..0daf9fd89fd882c54ab4b76244d037758eb81eaa
--- /dev/null
+++ b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.6__cc_by_nc_sa.sql
@@ -0,0 +1,130 @@
+INSERT INTO license_table (name, content) values ('Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License', '
+<h3>Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License</h3>
+<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
+<p id="s1"><strong>Section 1 – Definitions.</strong></p>
+<ol type="a">
+<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
+<li id="s1b"><strong>Adapter''s License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>
+<li id="s1c"><strong>BY-NC-SA Compatible License</strong> means a license listed at <a href="//creativecommons.org/compatiblelicenses"> creativecommons.org/compatiblelicenses</a>, approved by Creative Commons as essentially the equivalent of this Public License.</li>
+<li id="s1d"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>
+<li id="s1e"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not
+be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar
+international agreements.</li>
+<li id="s1f"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
+<li id="s1g"><strong>License Elements</strong> means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution, NonCommercial, and ShareAlike.</li>
+<li id="s1h"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
+<li id="s1i"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
+<li id="s1j"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
+<li id="s1k"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li>
+<li id="s1l"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
+<li id="s1m"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
+<li id="s1n"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
+</ol>
+<p id="s2"><strong>Section 2 – Scope.</strong></p>
+<ol type="a">
+<li id="s2a"><strong>License grant</strong>.
+<ol>
+<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+<ol type="A">
+<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li>
+<li id="s2a1B">produce, reproduce, and Share Adapted Material for NonCommercial purposes only.</li>
+</ol>
+</li><li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
+<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li>
+<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li>
+<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>.
+<div class="para">
+<ol type="A">
+<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
+<li id="s2a5B"><span style="text-decoration: underline;">Additional offer from the Licensor – Adapted Material</span>. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.</li>
+<li id="s2a5C"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
+</ol>
+</div>
+</li><li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li>
+</ol>
+</li><li id="s2b"><p><strong>Other rights</strong>.</p>
+<ol>
+<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
+<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li>
+<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li>
+</ol>
+</li>
+</ol>
+<p id="s3"><strong>Section 3 – License Conditions.</strong></p>
+<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
+<ol type="a">
+<li id="s3a"><p><strong>Attribution</strong>.</p>
+<ol>
+<li id="s3a1"><p>If You Share the Licensed Material (including in modified form), You must:</p>
+<ol type="A">
+<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material:
+<ol type="i">
+<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
+<li id="s3a1Aii">a copyright notice;</li>
+<li id="s3a1Aiii">a notice that refers to this Public License; </li>
+<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li>
+<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
+</ol>
+</li><li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
+<li id="s3a1C">indicate the Licensed Material is licensed under this Public License,
+and include the text of, or the URI or hyperlink to, this Public
+License.</li>
+</ol>
+</li>
+<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
+<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li>
+</ol>
+</li>
+<li id="s3b"><strong>ShareAlike</strong>.
+<p>In addition to the conditions in Section <a href="#s3a">3(a)</a>, if You Share Adapted Material You produce, the following conditions also apply.</p>
+<ol>
+<li id="s3b1">The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-NC-SA Compatible License.</li>
+<li id="s3b2">You must include the text of, or the URI or hyperlink to, the Adapter''s License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.</li>
+<li id="s3b3">You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter''s License You apply.</li>
+</ol>
+</li>
+</ol>
+<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p>
+<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
+<ol type="a">
+<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only;</li>
+<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section <a href="#s3b">3(b)</a>; and</li>
+<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>
+</ol>
+For the avoidance of doubt, this Section
+<a href="#s4">4</a>
+ supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
+<ol style="font-weight: bold;" type="a">
+<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
+<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
+</ol>
+<ol start="3" type="a">
+<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
+</ol>
+<p id="s6"><strong>Section 6 – Term and Termination.</strong></p>
+<ol type="a">
+<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
+<li id="s6b">
+<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p>
+<ol>
+<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
+<li id="s6b2">upon express reinstatement by the Licensor.</li>
+</ol>
+For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>
+<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
+<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li>
+</ol>
+<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p>
+<ol type="a">
+<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
+<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
+</ol>
+<p id="s8"><strong>Section 8 – Interpretation.</strong></p>
+<ol type="a">
+<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
+<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
+<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
+<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
+</ol>
+');
\ No newline at end of file
diff --git a/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.7__cc_by_nd.sql b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.7__cc_by_nd.sql
new file mode 100644
index 0000000000000000000000000000000000000000..7a2aeeb96e1c76694b7da7e8342c59b7e91ccda0
--- /dev/null
+++ b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.7__cc_by_nd.sql
@@ -0,0 +1,118 @@
+INSERT INTO license_table (name, content) values ('Creative Commons Attribution-NoDerivatives 4.0 International Public License', '
+<h3>Creative Commons Attribution-NoDerivatives 4.0 International Public License</h3>
+<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NoDerivatives 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
+<p id="s1"><strong>Section 1 – Definitions.</strong></p>
+<ol type="a">
+<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
+<li id="s1b"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>
+<li id="s1c"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not
+be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar
+international agreements.</li>
+<li id="s1d"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
+<li id="s1e"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
+<li id="s1f"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
+<li id="s1g"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
+<li id="s1h"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
+<li id="s1i"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
+<li id="s1j"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
+</ol>
+<p id="s2"><strong>Section 2 – Scope.</strong></p>
+<ol type="a">
+<li id="s2a"><strong>License grant</strong>.
+<ol>
+<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+<ol type="A">
+<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part; and</li>
+<li id="s2a1B">produce and reproduce, but not Share, Adapted Material.</li>
+</ol>
+</li><li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
+<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li>
+<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li>
+<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>.
+<div class="para">
+<ol type="A">
+<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
+<li id="s2a5B"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
+</ol>
+</div>
+</li><li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li>
+</ol>
+</li><li id="s2b"><p><strong>Other rights</strong>.</p>
+<ol>
+<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
+<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li>
+<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>
+</ol>
+</li>
+</ol>
+<p id="s3"><strong>Section 3 – License Conditions.</strong></p>
+<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
+<ol type="a">
+<li id="s3a"><p><strong>Attribution</strong>.</p>
+<ol>
+<li id="s3a1"><p>If You Share the Licensed Material, You must:</p>
+<ol type="A">
+<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material:
+<ol type="i">
+<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
+<li id="s3a1Aii">a copyright notice;</li>
+<li id="s3a1Aiii">a notice that refers to this Public License; </li>
+<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li>
+<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
+</ol>
+</li><li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
+<li id="s3a1C">indicate the Licensed Material is licensed under this Public License,
+and include the text of, or the URI or hyperlink to, this Public
+License.</li>
+</ol>
+For the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material.
+</li>
+<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
+<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li>
+</ol>
+</li>
+</ol>
+<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p>
+<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
+<ol type="a">
+<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database, provided You do not Share Adapted Material;</li>
+<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>
+<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>
+</ol>
+For the avoidance of doubt, this Section
+<a href="#s4">4</a>
+ supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
+<ol style="font-weight: bold;" type="a">
+<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
+<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
+</ol>
+<ol start="3" type="a">
+<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
+</ol>
+<p id="s6"><strong>Section 6 – Term and Termination.</strong></p>
+<ol type="a">
+<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
+<li id="s6b">
+<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p>
+<ol>
+<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
+<li id="s6b2">upon express reinstatement by the Licensor.</li>
+</ol>
+For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>
+<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
+<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li>
+</ol>
+<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p>
+<ol type="a">
+<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
+<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
+</ol>
+<p id="s8"><strong>Section 8 – Interpretation.</strong></p>
+<ol type="a">
+<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
+<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
+<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
+<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
+</ol>
+');
\ No newline at end of file
diff --git a/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.8__cc_by_nc_nd.sql b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.8__cc_by_nc_nd.sql
new file mode 100644
index 0000000000000000000000000000000000000000..78b5df036a3f59c6d492717671ccf041219f71d0
--- /dev/null
+++ b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907.8__cc_by_nc_nd.sql
@@ -0,0 +1,119 @@
+INSERT INTO license_table (name, content) values ('Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License', '
+<h3>Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License</h3>
+<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
+<p id="s1"><strong>Section 1 – Definitions.</strong></p>
+<ol type="a">
+<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
+<li id="s1b"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li>
+<li id="s1c"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not
+be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar
+international agreements.</li>
+<li id="s1d"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
+<li id="s1e"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
+<li id="s1f"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
+<li id="s1g"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
+<li id="s1h"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li>
+<li id="s1i"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
+<li id="s1j"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
+<li id="s1k"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
+</ol>
+<p id="s2"><strong>Section 2 – Scope.</strong></p>
+<ol type="a">
+<li id="s2a"><strong>License grant</strong>.
+<ol>
+<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+<ol type="A">
+<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li>
+<li id="s2a1B">produce and reproduce, but not Share, Adapted Material for NonCommercial purposes only.</li>
+</ol>
+</li><li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
+<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li>
+<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li>
+<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>.
+<div class="para">
+<ol type="A">
+<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
+<li id="s2a5B"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
+</ol>
+</div>
+</li><li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li>
+</ol>
+</li><li id="s2b"><p><strong>Other rights</strong>.</p>
+<ol>
+<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
+<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li>
+<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li>
+</ol>
+</li>
+</ol>
+<p id="s3"><strong>Section 3 – License Conditions.</strong></p>
+<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
+<ol type="a">
+<li id="s3a"><p><strong>Attribution</strong>.</p>
+<ol>
+<li id="s3a1"><p>If You Share the Licensed Material, You must:</p>
+<ol type="A">
+<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material:
+<ol type="i">
+<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
+<li id="s3a1Aii">a copyright notice;</li>
+<li id="s3a1Aiii">a notice that refers to this Public License; </li>
+<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li>
+<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
+</ol>
+</li><li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
+<li id="s3a1C">indicate the Licensed Material is licensed under this Public License,
+and include the text of, or the URI or hyperlink to, this Public
+License.</li>
+</ol>
+For the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material.
+</li>
+<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
+<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li>
+</ol>
+</li>
+</ol>
+<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p>
+<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
+<ol type="a">
+<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only and provided You do not Share Adapted Material;</li>
+<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li>
+<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li>
+</ol>
+For the avoidance of doubt, this Section
+<a href="#s4">4</a>
+ supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
+<ol style="font-weight: bold;" type="a">
+<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
+<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
+</ol>
+<ol start="3" type="a">
+<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
+</ol>
+<p id="s6"><strong>Section 6 – Term and Termination.</strong></p>
+<ol type="a">
+<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
+<li id="s6b">
+<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p>
+<ol>
+<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
+<li id="s6b2">upon express reinstatement by the Licensor.</li>
+</ol>
+For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li>
+<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
+<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li>
+</ol>
+<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p>
+<ol type="a">
+<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
+<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
+</ol>
+<p id="s8"><strong>Section 8 – Interpretation.</strong></p>
+<ol type="a">
+<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
+<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
+<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
+<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
+</ol>
+');
\ No newline at end of file
diff --git a/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907__create_license.sql b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907__create_license.sql
new file mode 100644
index 0000000000000000000000000000000000000000..22fc7d67aa40898cf7d75e8d7a6db335e4359d2c
--- /dev/null
+++ b/persist/src/main/resources/db/migration/postgres/16.3.0/V16.3.0.20230907__create_license.sql
@@ -0,0 +1,17 @@
+CREATE SEQUENCE public.license_sequence
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE;
+
+CREATE TABLE public.license_table (
+ id integer DEFAULT nextval('public.license_sequence') NOT NULL,
+ name character varying(255),
+ content text,
+ CONSTRAINT license_pk PRIMARY KEY (id)
+);
+
+ALTER TABLE project_table add column license_id integer;
+
+ALTER TABLE project_table
+ ADD CONSTRAINT project_table_license_fk FOREIGN KEY (license_id) REFERENCES license_table(id);
diff --git a/persist/src/main/resources/db/migration/postgres/17.1.0~beta.1/V17.1.0.20240819.2__custom_license_url.sql b/persist/src/main/resources/db/migration/postgres/17.1.0~beta.1/V17.1.0.20240819.2__custom_license_url.sql
new file mode 100644
index 0000000000000000000000000000000000000000..e7a352af6ef18435e63fbbcfcab4776a85cbd731
--- /dev/null
+++ b/persist/src/main/resources/db/migration/postgres/17.1.0~beta.1/V17.1.0.20240819.2__custom_license_url.sql
@@ -0,0 +1,5 @@
+alter table project_table
+ add column custom_license_name character varying(256) default '';
+
+alter table project_table
+ add column custom_license_url character varying(1024) default '';
diff --git a/persist/src/main/resources/db/migration/postgres/17.1.0~beta.1/V17.1.0.20240819__license_url.sql b/persist/src/main/resources/db/migration/postgres/17.1.0~beta.1/V17.1.0.20240819__license_url.sql
new file mode 100644
index 0000000000000000000000000000000000000000..80117f214306321d6eef77f3fca39fd2aa286913
--- /dev/null
+++ b/persist/src/main/resources/db/migration/postgres/17.1.0~beta.1/V17.1.0.20240819__license_url.sql
@@ -0,0 +1,30 @@
+alter table license_table
+ add column url character varying(1024);
+
+update license_table
+set url ='https://creativecommons.org/publicdomain/zero/1.0/'
+where name = 'CC0 1.0 Universal';
+
+update license_table
+set url ='https://creativecommons.org/licenses/by/4.0/'
+where name = 'Creative Commons Attribution 4.0 International Public License';
+
+update license_table
+set url ='https://creativecommons.org/licenses/by-sa/4.0/'
+where name = 'Creative Commons Attribution-ShareAlike 4.0 International Public License';
+
+update license_table
+set url ='https://creativecommons.org/licenses/by-nc/4.0/'
+where name = 'Creative Commons Attribution-NonCommercial 4.0 International';
+
+update license_table
+set url ='https://creativecommons.org/licenses/by-nc-sa/4.0/'
+where name = 'Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License';
+
+update license_table
+set url ='https://creativecommons.org/licenses/by-nd/4.0/'
+where name = 'Creative Commons Attribution-NoDerivatives 4.0 International Public License';
+
+update license_table
+set url ='https://creativecommons.org/licenses/by-nc-nd/4.0/'
+where name = 'Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License';
diff --git a/persist/src/test/java/lcsb/mapviewer/persist/dao/AllDaoTests.java b/persist/src/test/java/lcsb/mapviewer/persist/dao/AllDaoTests.java
index c534718f2b347ac761abd8c2ae1c6d3e44cd0371..f8092214b56002be55d894e608acdde4103110d9 100644
--- a/persist/src/test/java/lcsb/mapviewer/persist/dao/AllDaoTests.java
+++ b/persist/src/test/java/lcsb/mapviewer/persist/dao/AllDaoTests.java
@@ -17,6 +17,7 @@ import lcsb.mapviewer.persist.dao.user.AllUserTests;
AllUserTests.class,
ArticleDaoTest.class,
ConfigurationDaoTest.class,
+ LicenseDaoTest.class,
MinervaJobDaoTest.class,
ProjectDaoTest.class,
StacktraceDaoTest.class,
diff --git a/persist/src/test/java/lcsb/mapviewer/persist/dao/LicenseDaoTest.java b/persist/src/test/java/lcsb/mapviewer/persist/dao/LicenseDaoTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..b2998598092d3e33364721254d1de748fe6c8e00
--- /dev/null
+++ b/persist/src/test/java/lcsb/mapviewer/persist/dao/LicenseDaoTest.java
@@ -0,0 +1,23 @@
+package lcsb.mapviewer.persist.dao;
+
+import lcsb.mapviewer.model.License;
+import lcsb.mapviewer.persist.PersistTestFunctions;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.junit.Assert.assertEquals;
+
+public class LicenseDaoTest extends PersistTestFunctions {
+
+ @Autowired
+ private LicenseDao licenseDao;
+
+ @Test
+ public void testAdd() {
+ final License license = new License("12345", "cont", "google.com");
+ licenseDao.add(license);
+
+ assertEquals(license, licenseDao.getById(license.getId()));
+ }
+
+}
diff --git a/persist/src/test/java/lcsb/mapviewer/persist/dao/ProjectDaoTest.java b/persist/src/test/java/lcsb/mapviewer/persist/dao/ProjectDaoTest.java
index 02455b0e8651ee39af629fbfc6ade7a4a9ef62d3..4ffcdc7501adb26ff6bdb889479b0fd13c93ada5 100644
--- a/persist/src/test/java/lcsb/mapviewer/persist/dao/ProjectDaoTest.java
+++ b/persist/src/test/java/lcsb/mapviewer/persist/dao/ProjectDaoTest.java
@@ -1,21 +1,5 @@
package lcsb.mapviewer.persist.dao;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.awt.geom.Point2D;
-import java.util.Arrays;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
import lcsb.mapviewer.model.Project;
import lcsb.mapviewer.model.ProjectLogEntry;
import lcsb.mapviewer.model.ProjectLogEntryType;
@@ -51,15 +35,28 @@ import lcsb.mapviewer.persist.dao.map.CommentDao;
import lcsb.mapviewer.persist.dao.map.DataOverlayDao;
import lcsb.mapviewer.persist.dao.map.GlyphDao;
import lcsb.mapviewer.persist.dao.map.ModelDao;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
-public class ProjectDaoTest extends PersistTestFunctions {
+import java.awt.Color;
+import java.awt.geom.Point2D;
+import java.util.Collections;
- @Autowired
- private ProjectDao projectDao;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class ProjectDaoTest extends PersistTestFunctions {
@Autowired
protected ModelDao modelDao;
-
+ @Autowired
+ private ProjectDao projectDao;
@Autowired
private DataOverlayDao dataOverlayDao;
@@ -87,7 +84,7 @@ public class ProjectDaoTest extends PersistTestFunctions {
Project project2 = projectDao.getProjectByProjectId(TEST_PROJECT_ID);
assertNotNull(project2);
- assertFalse(project2.equals(project));
+ assertNotEquals(project2, project);
assertEquals(project.getId(), project2.getId());
projectDao.delete(project2);
@@ -112,7 +109,7 @@ public class ProjectDaoTest extends PersistTestFunctions {
Project project2 = projectDao.getProjectForModelId(model.getId());
assertNotNull(project2);
- assertFalse(project2.equals(project));
+ assertNotEquals(project2, project);
assertEquals(project.getId(), project2.getId());
projectDao.delete(project2);
@@ -341,6 +338,16 @@ public class ProjectDaoTest extends PersistTestFunctions {
assertEquals(0, new ObjectValidator().getValidationIssues(project).size());
}
+ @Test
+ public void validateLongInchi() throws Exception {
+ MiriamData md = new MiriamData(MiriamType.INCHI,
+ "InChI=1S/C27H35N9O15P2/c1-10-3-12-13(4-11(10)2)35(24-18(32-12)25(42)34-27(43)33-24)5-14(37)19(39)15(38)6-48-52"
+ + "(44,45)51-53(46,47)49-7-16-20(40)21(41)26(50-16)36-9-31-17-22(28)29-8-30-23(17)36/h3-4,8-9,14-16,18-21,26,32,37-41"
+ + "H,5-7H2,1-2H3,(H,44,45)(H,46,47)(H2,28,29,30)(H,34,42,43)/t14-,15+,16+,18-,19-,20+,21+,26+/m0/s1");
+ assertEquals(0, new ObjectValidator().getValidationIssues(md).size());
+ }
+
+
@Test
public void testGetAnnotationCount() throws Exception {
Model model = new ModelFullIndexed(null);
@@ -364,7 +371,7 @@ public class ProjectDaoTest extends PersistTestFunctions {
modelDao.add(model);
- int count = modelDao.getAnnotationCount(Arrays.asList(model.getModelData()), MiriamType.PUBMED);
+ int count = modelDao.getAnnotationCount(Collections.singletonList(model.getModelData()), MiriamType.PUBMED);
assertEquals(3, count);
}
diff --git a/persist/src/test/java/lcsb/mapviewer/persist/dao/map/layout/alias/ElementDaoTest.java b/persist/src/test/java/lcsb/mapviewer/persist/dao/map/layout/alias/ElementDaoTest.java
index 82c73a31f2f1c872255096a5ae6b6125ec5a4528..225fb22e62bf96196228672146b4ce8f4503af35 100644
--- a/persist/src/test/java/lcsb/mapviewer/persist/dao/map/layout/alias/ElementDaoTest.java
+++ b/persist/src/test/java/lcsb/mapviewer/persist/dao/map/layout/alias/ElementDaoTest.java
@@ -1,26 +1,5 @@
package lcsb.mapviewer.persist.dao.map.layout.alias;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-
import lcsb.mapviewer.model.Project;
import lcsb.mapviewer.model.map.MiriamData;
import lcsb.mapviewer.model.map.MiriamRelationType;
@@ -49,6 +28,26 @@ import lcsb.mapviewer.persist.dao.ProjectDao;
import lcsb.mapviewer.persist.dao.map.ModelDao;
import lcsb.mapviewer.persist.dao.map.species.ElementDao;
import lcsb.mapviewer.persist.dao.map.species.ElementProperty;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+
+import java.awt.geom.Point2D;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
public class ElementDaoTest extends PersistTestFunctions {
@@ -906,5 +905,4 @@ public class ElementDaoTest extends PersistTestFunctions {
assertEquals((Integer) 1, result.get(MiriamType.HGNC));
}
-
}
diff --git a/pom.xml b/pom.xml
index 0eeab9ae6af563dd13fc45a1d9918ab8c84b063a..3b26d9816004063629dda49cc28d8a9e39fc55cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,238 +1,241 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
<packaging>pom</packaging>
- <name>parent MapViewer</name>
+ <name>parent MapViewer</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <log4j2.version>2.22.1</log4j2.version>
+ <log4j2.version>2.22.1</log4j2.version>
- <mail-version>1.6.7</mail-version>
+ <mail-version>1.6.7</mail-version>
- <xercesImp.version>2.12.2</xercesImp.version>
- <xalan.version>2.7.3</xalan.version>
+ <xercesImp.version>2.12.2</xercesImp.version>
+ <xalan.version>2.7.3</xalan.version>
- <annotation-api.version>1.3.2</annotation-api.version>
- <jaxb-api.version>2.3.1</jaxb-api.version>
- <jaxb-core.version>2.3.0.1</jaxb-core.version>
- <jaxb-impl.version>2.3.9</jaxb-impl.version>
+ <annotation-api.version>1.3.2</annotation-api.version>
+ <jaxb-api.version>2.3.1</jaxb-api.version>
+ <jaxb-core.version>2.3.0.1</jaxb-core.version>
+ <jaxb-impl.version>2.3.9</jaxb-impl.version>
- <apache.httpcomponents.version>4.5.14</apache.httpcomponents.version>
- <apache.httpcomponents-core.version>4.4.16</apache.httpcomponents-core.version>
+ <apache.httpcomponents.version>4.5.14</apache.httpcomponents.version>
+ <apache.httpcomponents-core.version>4.4.16</apache.httpcomponents-core.version>
- <!-- version 4.x has conflict on dependencies with jsbml 1.4 -->
- <apache.poi.version>5.2.5</apache.poi.version>
- <commons-codec.version>1.16.0</commons-codec.version>
- <json-path.version>2.8.0</json-path.version>
+ <!-- version 4.x has conflict on dependencies with jsbml 1.4 -->
+ <apache.poi.version>5.2.5</apache.poi.version>
+ <commons-codec.version>1.16.0</commons-codec.version>
+ <json-path.version>2.8.0</json-path.version>
- <springframework.version>5.3.31</springframework.version>
- <springframework.security.version>5.8.9</springframework.security.version>
- <springframework.boot.version>2.7.18</springframework.boot.version>
- <spring.data.version>2.7.18</spring.data.version>
- <spring.restdocs.version>2.0.8.RELEASE</spring.restdocs.version>
- <thymeleaf.version>3.0.15.RELEASE</thymeleaf.version>
+ <springframework.version>5.3.31</springframework.version>
+ <springframework.security.version>5.8.9</springframework.security.version>
+ <springframework.boot.version>2.7.18</springframework.boot.version>
+ <spring.data.version>2.7.18</spring.data.version>
+ <spring.restdocs.version>2.0.8.RELEASE</spring.restdocs.version>
+ <thymeleaf.version>3.0.15.RELEASE</thymeleaf.version>
- <libsbml.version>1.0</libsbml.version>
+ <libsbml.version>1.0</libsbml.version>
- <commons-io.version>2.15.0</commons-io.version>
+ <commons-io.version>2.15.0</commons-io.version>
- <apache.commons-lang3.version>3.14.0</apache.commons-lang3.version>
+ <apache.commons-lang3.version>3.14.0</apache.commons-lang3.version>
- <apache.commons-text.version>1.11.0</apache.commons-text.version>
+ <apache.commons-text.version>1.11.0</apache.commons-text.version>
- <batik.version>1.17</batik.version>
- <fop.version>2.9</fop.version>
- <xml-apis.version>1.4.01</xml-apis.version>
+ <batik.version>1.17</batik.version>
+ <fop.version>2.9</fop.version>
+ <xml-apis.version>1.4.01</xml-apis.version>
- <libsbgn.version>0.2</libsbgn.version>
+ <libsbgn.version>0.2</libsbgn.version>
- <hibernate.version>5.3.6.Final</hibernate.version>
- <jboss-logging.version>3.4.0.Final</jboss-logging.version>
- <byte-buddy.version>1.12.19</byte-buddy.version>
+ <hibernate.version>5.3.6.Final</hibernate.version>
+ <jboss-logging.version>3.4.0.Final</jboss-logging.version>
+ <byte-buddy.version>1.12.19</byte-buddy.version>
- <pathvisio.version>3.2.0</pathvisio.version>
+ <pathvisio.version>3.2.0</pathvisio.version>
- <flyway.version>5.2.4</flyway.version>
+ <flyway.version>5.2.4</flyway.version>
- <postgresql-jdbc.version>42.2.27</postgresql-jdbc.version>
+ <postgresql-jdbc.version>42.2.27</postgresql-jdbc.version>
- <hikari.version>3.3.1</hikari.version>
- <slf4jVersion>1.7.36</slf4jVersion>
+ <hikari.version>3.3.1</hikari.version>
+ <slf4jVersion>1.7.36</slf4jVersion>
- <cglib.version>3.3.0</cglib.version>
+ <cglib.version>3.3.0</cglib.version>
- <rs-jax.version>1.1.1</rs-jax.version>
+ <rs-jax.version>1.1.1</rs-jax.version>
- <jersey.version>1.19.4</jersey.version>
+ <jersey.version>1.19.4</jersey.version>
- <jackson.version>2.13.5</jackson.version>
+ <jackson.version>2.13.5</jackson.version>
- <servlet-api.version>4.0.1</servlet-api.version>
+ <servlet-api.version>4.0.1</servlet-api.version>
- <el.version>2.2.4</el.version>
-
- <jsf.version>2.2.19</jsf.version>
-
- <unboundid-ldapsdk.version>4.0.10</unboundid-ldapsdk.version>
-
- <jstl.version>1.2</jstl.version>
-
- <commons-validator.version>1.8.0</commons-validator.version>
-
- <jsbml.version>1.6.1</jsbml.version>
-
- <celldesigner.version>4.4</celldesigner.version>
-
- <reflections.version>0.10.2</reflections.version>
-
- <!-- versions of plugions -->
- <maven-artifact.version>3.9.6</maven-artifact.version>
- <maven-jar-plugin.version>2.3</maven-jar-plugin.version>
- <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
- <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
- <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
- <maven-war-plugin.version>3.2.2</maven-war-plugin.version>
- <asciidoctor-maven-plugin.version>1.5.8</asciidoctor-maven-plugin.version>
- <surefire-api.version>3.2.3</surefire-api.version>
- <osgi.version>1.0.0</osgi.version>
- <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
-
- <!-- version of testing dependencies -->
- <junit.version>4.13.2</junit.version>
- <greenmail.version>1.6.15</greenmail.version>
- <mockito.version>4.11.0</mockito.version>
- <hamcrest.version>2.2</hamcrest.version>
- <hsqldb.version>2.5.0</hsqldb.version>
- <checkstyle.version>3.1.2</checkstyle.version>
-
-
- <surefire.rerunFailingTestsCount>4</surefire.rerunFailingTestsCount>
- <surefireArgLine></surefireArgLine>
- </properties>
-
- <repositories>
- <repository>
- <id>central</id>
- <url>https://repo.maven.apache.org/maven2/</url>
- </repository>
- <!-- Repository used for chebi -->
- <repository>
- <id>ebi-repo</id>
- <name>The EBI internal repository</name>
- <url>https://www.ebi.ac.uk/Tools/maven/repos/repository/ebi-repo/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-api</artifactId>
- <version>${surefire-api.version}</version>
- </dependency>
- </dependencies>
- <modules>
- <module>model</module>
- <module>commons</module>
- <module>persist</module>
- <module>converter-CellDesigner</module>
- <module>converter-SBGNML</module>
- <module>converter-graphics</module>
- <module>annotation</module>
- <module>service</module>
- <module>web</module>
- <module>model-command</module>
- <module>pathvisio</module>
- <module>converter</module>
- <module>CellDesigner-plugin</module>
- <module>rest-api</module>
- <module>frontend-js</module>
- <module>converter-sbml</module>
- </modules>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.version}</version>
- <executions>
- <execution>
- <id>checkstyle</id>
- <phase>validate</phase>
- <configuration>
- <configLocation>checkstyle.xml</configLocation>
- <encoding>UTF-8</encoding>
- <failsOnError>true</failsOnError>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-api.version}</version>
- <configuration>
- <useSystemClassLoader>false</useSystemClassLoader>
- <surefire.rerunFailingTestsCount>4</surefire.rerunFailingTestsCount>
- <argLine>@{argLine} ${surefireArgLine} --add-opens=java.desktop/sun.java2d=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED -XX:+IgnoreUnrecognizedVMOptions</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.8</version>
- <executions>
- <execution>
- <id>default-prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-code-coverage-report</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <el.version>2.2.4</el.version>
+
+ <jsf.version>2.2.19</jsf.version>
+
+ <unboundid-ldapsdk.version>4.0.10</unboundid-ldapsdk.version>
+
+ <jstl.version>1.2</jstl.version>
+
+ <commons-validator.version>1.8.0</commons-validator.version>
+
+ <jsbml.version>1.6.1</jsbml.version>
+
+ <celldesigner.version>4.4</celldesigner.version>
+
+ <reflections.version>0.10.2</reflections.version>
+
+ <!-- versions of plugions -->
+ <maven-artifact.version>3.9.6</maven-artifact.version>
+ <maven-jar-plugin.version>2.3</maven-jar-plugin.version>
+ <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
+ <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
+ <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
+ <maven-war-plugin.version>3.2.2</maven-war-plugin.version>
+ <asciidoctor-maven-plugin.version>1.5.8</asciidoctor-maven-plugin.version>
+ <surefire-api.version>3.2.3</surefire-api.version>
+ <osgi.version>1.0.0</osgi.version>
+ <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
+
+ <!-- version of testing dependencies -->
+ <junit.version>4.13.2</junit.version>
+ <greenmail.version>1.6.15</greenmail.version>
+ <mockito.version>4.11.0</mockito.version>
+ <hamcrest.version>2.2</hamcrest.version>
+ <hsqldb.version>2.5.0</hsqldb.version>
+ <checkstyle.version>3.1.2</checkstyle.version>
+
+
+ <surefire.rerunFailingTestsCount>4</surefire.rerunFailingTestsCount>
+ <surefireArgLine></surefireArgLine>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>central</id>
+ <url>https://repo.maven.apache.org/maven2/</url>
+ </repository>
+ <!-- Repository used for chebi -->
+ <repository>
+ <id>ebi-repo</id>
+ <name>The EBI internal repository</name>
+ <url>https://www.ebi.ac.uk/Tools/maven/repos/repository/ebi-repo/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-api</artifactId>
+ <version>${surefire-api.version}</version>
+ </dependency>
+ </dependencies>
+ <modules>
+ <module>model</module>
+ <module>commons</module>
+ <module>persist</module>
+ <module>converter-CellDesigner</module>
+ <module>converter-SBGNML</module>
+ <module>converter-graphics</module>
+ <module>annotation</module>
+ <module>service</module>
+ <module>web</module>
+ <module>model-command</module>
+ <module>pathvisio</module>
+ <module>converter</module>
+ <module>CellDesigner-plugin</module>
+ <module>rest-api</module>
+ <module>frontend-js</module>
+ <module>converter-sbml</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.version}</version>
+ <executions>
+ <execution>
+ <id>checkstyle</id>
+ <phase>validate</phase>
+ <configuration>
+ <configLocation>checkstyle.xml</configLocation>
+ <encoding>UTF-8</encoding>
+ <failsOnError>true</failsOnError>
+ <consoleOutput>true</consoleOutput>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire-api.version}</version>
+ <configuration>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <surefire.rerunFailingTestsCount>4</surefire.rerunFailingTestsCount>
+ <argLine>@{argLine} ${surefireArgLine} --add-opens=java.desktop/sun.java2d=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED
+ --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
+ -XX:+IgnoreUnrecognizedVMOptions
+ </argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.8</version>
+ <executions>
+ <execution>
+ <id>default-prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>generate-code-coverage-report</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/rest-api/pom.xml b/rest-api/pom.xml
index 3d916d15d792424424fb7be763190fbde9df02bf..426d2b9dbd316e57391d6ed5b763e64ea6a04d69 100644
--- a/rest-api/pom.xml
+++ b/rest-api/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>rest-api</artifactId>
<name>rest-api</name>
@@ -19,19 +19,19 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>service</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>pathvisio</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/CustomPage.java b/rest-api/src/main/java/lcsb/mapviewer/api/CustomPage.java
index 1c48cd23d9c1aee49cce0977f79da59e6bea6b85..450a6a3e20a82ff5528b3dccb81b6b20e722b1f8 100644
--- a/rest-api/src/main/java/lcsb/mapviewer/api/CustomPage.java
+++ b/rest-api/src/main/java/lcsb/mapviewer/api/CustomPage.java
@@ -2,6 +2,7 @@ package lcsb.mapviewer.api;
import java.util.List;
+import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
@@ -30,6 +31,10 @@ public class CustomPage<T> extends PageImpl<T> {
this.filtered = filtered;
}
+ public CustomPage(final Page<T> page) {
+ super(page.getContent(), page.getPageable(), page.getTotalElements());
+ }
+
/**
*
*/
diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/license/LicenseController.java b/rest-api/src/main/java/lcsb/mapviewer/api/license/LicenseController.java
new file mode 100644
index 0000000000000000000000000000000000000000..ec18e5aec91fddca9a56455e0f014d7e8ce9e841
--- /dev/null
+++ b/rest-api/src/main/java/lcsb/mapviewer/api/license/LicenseController.java
@@ -0,0 +1,38 @@
+package lcsb.mapviewer.api.license;
+
+import lcsb.mapviewer.api.BaseController;
+import lcsb.mapviewer.api.CustomPage;
+import lcsb.mapviewer.model.License;
+import lcsb.mapviewer.services.interfaces.ILicenseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Validated
+@RequestMapping(
+ value = {
+ "/minerva/api/licenses"
+ },
+ produces = MediaType.APPLICATION_JSON_VALUE)
+public class LicenseController extends BaseController {
+
+ private final ILicenseService licenseService;
+
+ @Autowired
+ public LicenseController(final ILicenseService licenseService) {
+ this.licenseService = licenseService;
+ }
+
+ @GetMapping(value = "/")
+ public Page<License> getFile(final Pageable pageable) {
+ return new CustomPage(licenseService.getByFilter(pageable));
+
+ }
+
+}
\ No newline at end of file
diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectController.java b/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectController.java
index 20c1aa0ceee88c521cc51205d5045b047dc1dcb0..c091c90da6dd67a3e9ad1447ee6924f6c00930ff 100644
--- a/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectController.java
+++ b/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectController.java
@@ -15,6 +15,7 @@ import lcsb.mapviewer.common.comparator.StringComparator;
import lcsb.mapviewer.common.exception.InvalidArgumentException;
import lcsb.mapviewer.converter.Converter;
import lcsb.mapviewer.converter.zip.ZipEntryFile;
+import lcsb.mapviewer.model.License;
import lcsb.mapviewer.model.Project;
import lcsb.mapviewer.model.ProjectLogEntry;
import lcsb.mapviewer.model.ProjectStatus;
@@ -26,6 +27,7 @@ import lcsb.mapviewer.model.map.layout.ProjectBackground;
import lcsb.mapviewer.model.map.layout.ProjectBackgroundImageLayer;
import lcsb.mapviewer.model.map.model.ModelData;
import lcsb.mapviewer.model.map.species.Element;
+import lcsb.mapviewer.model.security.Privilege;
import lcsb.mapviewer.model.security.PrivilegeType;
import lcsb.mapviewer.model.user.ConfigurationElementType;
import lcsb.mapviewer.model.user.User;
@@ -39,6 +41,7 @@ import lcsb.mapviewer.services.ObjectNotFoundException;
import lcsb.mapviewer.services.interfaces.IConfigurationService;
import lcsb.mapviewer.services.interfaces.IElementService;
import lcsb.mapviewer.services.interfaces.IFileService;
+import lcsb.mapviewer.services.interfaces.ILicenseService;
import lcsb.mapviewer.services.interfaces.IMeshService;
import lcsb.mapviewer.services.interfaces.IModelService;
import lcsb.mapviewer.services.interfaces.IProjectBackgroundService;
@@ -115,6 +118,7 @@ public class ProjectController extends BaseController {
private final ObjectMapper objectMapper = new ObjectMapper();
private final IProjectBackgroundService projectBackgroundService;
private final MinervaConfigurationHolder minervaConfigurationHolder;
+ private ILicenseService licenseService;
private final List<Converter> modelConverters;
@@ -128,6 +132,7 @@ public class ProjectController extends BaseController {
final IReactionService reactionService, final IModelService modelService,
final IConfigurationService configurationService,
final IProjectBackgroundService projectBackgroundService, final MinervaNetController minervaNetController,
+ final ILicenseService licenseService,
final IDirectoryNameGenerator directoryNameGenerator) {
this.minervaConfigurationHolder = minervaConfigurationHolder;
this.userService = userService;
@@ -142,6 +147,7 @@ public class ProjectController extends BaseController {
this.projectBackgroundService = projectBackgroundService;
this.minervaNetController = minervaNetController;
this.directoryNameGenerator = directoryNameGenerator;
+ this.licenseService = licenseService;
}
@PreAuthorize("hasAnyAuthority('IS_ADMIN', 'READ_PROJECT:' + #projectId)")
@@ -180,12 +186,17 @@ public class ProjectController extends BaseController {
static class ProjectData {
private String version;
+ private String owner;
private String projectId;
private String name;
private String notifyEmail;
private Optional<MiriamData> organism;
private Optional<MiriamData> disease;
private MapCanvasType mapCanvasType;
+ private Optional<License> license;
+
+ private String customLicenseName;
+ private String customLicenseUrl;
public String getVersion() {
return version;
@@ -242,12 +253,45 @@ public class ProjectController extends BaseController {
public void setMapCanvasType(final MapCanvasType mapCanvasType) {
this.mapCanvasType = mapCanvasType;
}
+
+ public String getOwner() {
+ return owner;
+ }
+
+ public void setOwner(final String owner) {
+ this.owner = owner;
+ }
+
+ public Optional<License> getLicense() {
+ return license;
+ }
+
+ public void setLicense(final Optional<License> license) {
+ this.license = license;
+ }
+
+ public String getCustomLicenseName() {
+ return customLicenseName;
+ }
+
+ public void setCustomLicenseName(final String customLicenseName) {
+ this.customLicenseName = customLicenseName;
+ }
+
+ public String getCustomLicenseUrl() {
+ return customLicenseUrl;
+ }
+
+ public void setCustomLicenseUrl(final String customLicenseUrl) {
+ this.customLicenseUrl = customLicenseUrl;
+ }
}
@PreAuthorize("hasAnyAuthority('IS_ADMIN', 'WRITE_PROJECT:' + #projectId)")
@PatchMapping(value = "/{projectId:.+}", consumes = MediaType.APPLICATION_JSON_VALUE)
public ProjectDTO updateProject(
final @RequestBody UpdateProjectData body,
+ final Authentication authentication,
final @PathVariable(value = "projectId") String projectId) throws IOException, QueryException, ObjectNotFoundException {
final ProjectData data = body.getProject();
final Project project = projectService.getProjectByProjectId(projectId, true);
@@ -275,6 +319,20 @@ public class ProjectController extends BaseController {
if (data.getNotifyEmail() != null) {
project.setNotifyEmail(data.getNotifyEmail());
}
+ if (data.getOwner() != null && !data.getOwner().trim().isEmpty()) {
+ if (!Objects.equals(project.getOwner().getLogin(), data.getOwner())) {
+ User user = userService.getUserByLogin(authentication.getName(), true);
+ if (user.getPrivileges().contains(new Privilege(PrivilegeType.IS_ADMIN))) {
+ User newOwner = userService.getUserByLogin(data.getOwner());
+ if (newOwner == null) {
+ throw new ObjectNotFoundException("User " + data.getOwner() + " does not exist");
+ }
+ project.setOwner(newOwner);
+ } else {
+ throw new AccessDeniedException("Access denied");
+ }
+ }
+ }
if (data.getOrganism().isPresent()) {
final MiriamData organism = updateMiriamData(project.getOrganism(), data.getOrganism().get());
project.setOrganism(organism);
@@ -298,10 +356,40 @@ public class ProjectController extends BaseController {
project.setMapCanvasType(data.getMapCanvasType());
}
+ if (data.getCustomLicenseName() != null) {
+ project.setCustomLicenseName(data.getCustomLicenseName());
+ }
+
+ if (data.getCustomLicenseUrl() != null) {
+ project.setCustomLicenseUrl(data.getCustomLicenseUrl());
+ }
+
+ if (data.getLicense() != null && data.getLicense().isPresent()) {
+ if (data.getLicense().get() != null) {
+ Integer id = data.getLicense().get().getId();
+ License license = getLicenseById(id);
+ project.setLicense(license);
+ } else {
+ project.setLicense(null);
+ }
+ }
+
projectService.updateProject(project);
return getProject(projectId);
}
+ private License getLicenseById(final Integer id) throws QueryException {
+ if (id != null && id != 0) {
+ License license = licenseService.getById(id);
+ if (license == null) {
+ throw new QueryException("invalid license id: " + id);
+ }
+ return license;
+ } else {
+ return null;
+ }
+ }
+
private MiriamData updateMiriamData(final MiriamData original, final MiriamData newData) {
if (newData == null) {
return null;
@@ -379,6 +467,15 @@ public class ProjectController extends BaseController {
@JsonProperty("file-id")
private Integer fileId;
+ @JsonProperty("license-id")
+ private Integer licenseId;
+
+ @JsonProperty("custom-license-name")
+ private String customLicenseName;
+
+ @JsonProperty("custom-license-url")
+ private String customLicenseUrl;
+
@NotEmpty
private String parser;
@@ -531,6 +628,26 @@ public class ProjectController extends BaseController {
public void setZipEntries(final Map<String, ZipEntryFile> zipEntries) {
this.zipEntries = zipEntries;
}
+
+ public Integer getLicenseId() {
+ return licenseId;
+ }
+
+ public String getCustomLicenseName() {
+ return customLicenseName;
+ }
+
+ public void setCustomLicenseName(final String customLicenseName) {
+ this.customLicenseName = customLicenseName;
+ }
+
+ public String getCustomLicenseUrl() {
+ return customLicenseUrl;
+ }
+
+ public void setCustomLicenseUrl(final String customLicenseUrl) {
+ this.customLicenseUrl = customLicenseUrl;
+ }
}
@PreAuthorize("hasAnyAuthority('IS_ADMIN', 'IS_CURATOR')")
@@ -594,6 +711,9 @@ public class ProjectController extends BaseController {
params.annotations(data.getAnnotate());
params.setUser(user);
params.mapCanvasType(data.getMapCanvasType());
+ params.license(getLicenseById(data.getLicenseId()));
+ params.customLicenseName(data.getCustomLicenseName());
+ params.customLicenseUrl(data.getCustomLicenseUrl());
params.analyzeAnnotations(data.getVerifyAnnotations());
diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectDTO.java b/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectDTO.java
index 4a38256ad25268787672aac81225e8d3a8e74142..36cf3a1ee4d0299b31bdd764b61be19a5648b263 100644
--- a/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectDTO.java
+++ b/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectDTO.java
@@ -2,7 +2,6 @@ package lcsb.mapviewer.api.projects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
import lcsb.mapviewer.common.exception.NotImplementedException;
import lcsb.mapviewer.model.Project;
import lcsb.mapviewer.model.map.model.Model;
@@ -48,6 +47,9 @@ public class ProjectDTO extends Project {
this.setSbgnFormat(project.isSbgnFormat());
this.setOverviewImages(project.getOverviewImages());
this.setGlyphs(project.getGlyphs());
+ this.setLicense(project.getLicense());
+ this.setCustomLicenseName(project.getCustomLicenseName());
+ this.setCustomLicenseUrl(project.getCustomLicenseUrl());
}
public boolean isSharedInMinervaNet() {
diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectSerializer.java b/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectSerializer.java
index 300fd77452c372de445a78d78a07948ea8f08f87..97597f70021fcb5cb285eb8702d3fa6b4442f48d 100644
--- a/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectSerializer.java
+++ b/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectSerializer.java
@@ -1,19 +1,17 @@
package lcsb.mapviewer.api.projects;
-import java.io.IOException;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
-
import lcsb.mapviewer.model.map.OverviewImage;
import lcsb.mapviewer.model.map.OverviewImageLink;
import lcsb.mapviewer.model.map.OverviewLink;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.util.LinkedHashSet;
+import java.util.Set;
public class ProjectSerializer extends JsonSerializer<ProjectDTO> {
@@ -21,7 +19,7 @@ public class ProjectSerializer extends JsonSerializer<ProjectDTO> {
@Override
public void serialize(final ProjectDTO entry, final JsonGenerator gen,
- final SerializerProvider serializers)
+ final SerializerProvider serializers)
throws IOException {
gen.writeStartObject();
@@ -67,6 +65,10 @@ public class ProjectSerializer extends JsonSerializer<ProjectDTO> {
gen.writeObjectField("topOverviewImage", null);
}
+ gen.writeObjectField("license", entry.getLicense());
+ gen.writeStringField("customLicenseName", entry.getCustomLicenseName());
+ gen.writeStringField("customLicenseUrl", entry.getCustomLicenseUrl());
+
gen.writeEndObject();
}
}
\ No newline at end of file
diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/ModelController.java b/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/ModelController.java
index 02db62fbed76e2d9e3c8f4c44a9fe115e316ebe8..0146e4aa0a66460b40e5b64336adbe92179ca4ad 100644
--- a/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/ModelController.java
+++ b/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/ModelController.java
@@ -377,6 +377,7 @@ public class ModelController extends BaseController {
final @RequestParam(value = "overlayIds", defaultValue = "") String overlayIds,
final @RequestParam(value = "backgroundOverlayId", required = false) Integer backgroundOverlayId,
final @RequestParam(value = "polygonString", defaultValue = "") String polygonString,
+ final @RequestParam(value = "strictCutoff", defaultValue = "true") boolean strictCutoff,
final @RequestParam(value = "elementIds", defaultValue = "") String elementIds,
final @RequestParam(value = "reactionIds", defaultValue = "") String reactionIds,
final @RequestHeader(value = "Accept", required = false) String accept)
@@ -385,7 +386,7 @@ public class ModelController extends BaseController {
User user = userService.getUserByLogin(authentication.getName());
FileEntry file = getModelAsModelFile(
projectId, modelId, handlerClass, overlayIds, polygonString, elementIds, reactionIds, user,
- backgroundOverlayId);
+ backgroundOverlayId, strictCutoff);
if (isMimeTypeIncluded(accept, MimeType.ZIP.getTextRepresentation())) {
return sendAsZip(file);
}
@@ -400,7 +401,7 @@ public class ModelController extends BaseController {
private FileEntry getModelAsModelFile(final String projectId, final Integer mapId, final String handlerClass,
final String overlayIds, final String polygonString, final String elementIds,
- final String reactionIds, final User user, final Integer backgroundOverlayId)
+ final String reactionIds, final User user, final Integer backgroundOverlayId, final boolean strictCutoff)
throws QueryException, IOException, InvalidDataOverlayException, CommandExecutionException,
ConverterException, InconsistentModelException, ObjectNotFoundException {
@@ -413,7 +414,7 @@ public class ModelController extends BaseController {
Set<Integer> reactionIdsList = stringListToIntegerSet(reactionIds);
// create model bounded by the polygon
- SubModelCommand subModelCommand = new SubModelCommand(originalModel, polygon, elementIdsList, reactionIdsList);
+ SubModelCommand subModelCommand = new SubModelCommand(originalModel, polygon, elementIdsList, reactionIdsList, strictCutoff);
Model part = subModelCommand.execute();
// Get list of overlay ids
@@ -466,6 +467,7 @@ public class ModelController extends BaseController {
final @PathVariable(value = "modelId") Integer modelId,
final @RequestParam(value = "handlerClass") String handlerClass,
final @RequestParam(value = "overlayIds", defaultValue = "") String overlayIds,
+ final @RequestParam(value = "strictCutoff", defaultValue = "true") boolean strictCutoff,
final @RequestParam(value = "backgroundOverlayId", required = false) Integer backgroundOverlayId,
final @RequestParam(value = "polygonString", defaultValue = "") String polygonString,
final @RequestParam(value = "elementIds", defaultValue = "") String elementIds,
@@ -478,7 +480,7 @@ public class ModelController extends BaseController {
Map<String, Object> result = new HashedMap<>();
getModelAsModelFile(projectId, modelId, handlerClass, overlayIds, polygonString, elementIds,
reactionIds, user,
- backgroundOverlayId);
+ backgroundOverlayId, strictCutoff);
List<ProjectLogEntry> warnings = new ArrayList<>();
for (final LogEvent event : appender.getWarnings()) {
ProjectLogEntry entry = createLogEntry("WARNING", event);
diff --git a/service/pom.xml b/service/pom.xml
index 0c232b71ac3b80691bb11602d216e7904d1dbd2d..d2b62f9cf1ef27f7340ea4747ddb5e36721e72ed 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -1,12 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>service</artifactId>
@@ -19,7 +20,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- dependency from the MapViewer dao -->
@@ -27,47 +28,47 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>persist</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model-command</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>annotation</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- dependency from the MapViewer cell designer parser -->
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- dependency from the MapViewer SBGN-ML parser -->
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-SBGNML</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- dependency from the MapViewer graphics converter -->
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-graphics</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- dependency from the SBML parser -->
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-sbml</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<!-- Log4J2 -->
@@ -152,7 +153,6 @@
</exclusions>
</dependency>
-
<!-- mockito used for testing -->
<dependency>
<groupId>org.mockito</groupId>
diff --git a/service/src/main/java/lcsb/mapviewer/services/impl/LicenseService.java b/service/src/main/java/lcsb/mapviewer/services/impl/LicenseService.java
new file mode 100644
index 0000000000000000000000000000000000000000..85a8f302af2794ed40f3c47aeda0d0435623a9c3
--- /dev/null
+++ b/service/src/main/java/lcsb/mapviewer/services/impl/LicenseService.java
@@ -0,0 +1,33 @@
+package lcsb.mapviewer.services.impl;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import lcsb.mapviewer.model.License;
+import lcsb.mapviewer.persist.dao.LicenseDao;
+import lcsb.mapviewer.services.interfaces.ILicenseService;
+
+@Transactional
+@Service
+public class LicenseService implements ILicenseService {
+
+ protected static Logger logger = LogManager.getLogger();
+
+ @Autowired
+ private LicenseDao licenseDao;
+
+ @Override
+ public Page<License> getByFilter(final Pageable pageable) {
+ return licenseDao.getByFilter(pageable);
+ }
+
+ @Override
+ public License getById(final int id) {
+ return licenseDao.getById(id);
+ }
+}
diff --git a/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java b/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java
index 58c88e01dee0841ef21491d77f697be52bf2b836..986a755f28c646a1236f5dd599c0ee308a8ce89f 100644
--- a/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java
+++ b/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java
@@ -1,34 +1,5 @@
package lcsb.mapviewer.services.impl;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Queue;
-import java.util.Set;
-
-import javax.annotation.PostConstruct;
-import javax.mail.MessagingException;
-import javax.persistence.PersistenceException;
-
-import org.apache.commons.collections4.ListUtils;
-import org.apache.commons.io.FileUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.LogEvent;
-import org.hibernate.Hibernate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
import lcsb.mapviewer.annotation.services.MeSHParser;
import lcsb.mapviewer.annotation.services.ModelAnnotator;
import lcsb.mapviewer.annotation.services.ProblematicAnnotation;
@@ -107,6 +78,9 @@ import lcsb.mapviewer.services.jobs.CreateProjectFailureMinervaJob;
import lcsb.mapviewer.services.jobs.CreateProjectMinervaJob;
import lcsb.mapviewer.services.jobs.DeleteBackgroundMinervaJob;
import lcsb.mapviewer.services.jobs.DeleteProjectMinervaJob;
+import lcsb.mapviewer.services.jobs.RefreshChemicalInfoMinervaJob;
+import lcsb.mapviewer.services.jobs.RefreshDrugInfoMinervaJob;
+import lcsb.mapviewer.services.jobs.RefreshMiRnaInfoMinervaJob;
import lcsb.mapviewer.services.jobs.RefreshMiriamInfoMinervaJob;
import lcsb.mapviewer.services.jobs.ReviveBackgroundsMinervaJob;
import lcsb.mapviewer.services.search.chemical.IChemicalService;
@@ -116,13 +90,39 @@ import lcsb.mapviewer.services.utils.CreateProjectParams;
import lcsb.mapviewer.services.utils.EmailException;
import lcsb.mapviewer.services.utils.EmailSender;
import lcsb.mapviewer.services.utils.data.BuildInBackgrounds;
+import org.apache.commons.collections4.ListUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.LogEvent;
+import org.hibernate.Hibernate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import javax.mail.MessagingException;
+import javax.persistence.PersistenceException;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.Set;
/**
* Implementation of the project service. It allows to manage and access project
* data.
*
* @author Piotr Gawron
- *
*/
@Service
public class ProjectService implements IProjectService {
@@ -231,22 +231,22 @@ public class ProjectService implements IProjectService {
@Autowired
public ProjectService(final MinervaConfigurationHolder minervaConfigurationHolder,
- final ProjectDao projectDao,
- final ProjectLogEntryDao projectLogEntryDao,
- final UserDao userDao,
- final IModelService modelService,
- final ICommentService commentService,
- final IConfigurationService configurationService,
- final IUserService userService,
- final IChemicalService chemicalService,
- final IDrugService drugService,
- final IMiRNAService mirnaService,
- final ModelAnnotator modelAnnotator,
- final DbUtils dbUtils,
- final MeSHParser meshParser,
- final TaxonomyBackend taxonomyBackend,
- final IProjectBackgroundService projectBackgroundService,
- final IMinervaJobService minervaJobService) {
+ final ProjectDao projectDao,
+ final ProjectLogEntryDao projectLogEntryDao,
+ final UserDao userDao,
+ final IModelService modelService,
+ final ICommentService commentService,
+ final IConfigurationService configurationService,
+ final IUserService userService,
+ final IChemicalService chemicalService,
+ final IDrugService drugService,
+ final IMiRNAService mirnaService,
+ final ModelAnnotator modelAnnotator,
+ final DbUtils dbUtils,
+ final MeSHParser meshParser,
+ final TaxonomyBackend taxonomyBackend,
+ final IProjectBackgroundService projectBackgroundService,
+ final IMinervaJobService minervaJobService) {
this.minervaConfigurationHolder = minervaConfigurationHolder;
this.projectDao = projectDao;
this.projectLogEntryDao = projectLogEntryDao;
@@ -431,6 +431,10 @@ public class ProjectService implements IProjectService {
if (params.isCacheModel()) {
self.cacheData(params.getProjectId());
+ } else {
+ self.createRefreshDrugInfoJobs(params.getProjectId());
+ self.createRefreshChemicalInfoJobs(params.getProjectId());
+ self.createRefreshMiRnaInfoJobs(params.getProjectId());
}
self.createRefreshMiriamInfoJobs(params.getProjectId());
@@ -508,6 +512,76 @@ public class ProjectService implements IProjectService {
}
}
+ @Override
+ public void createRefreshDrugInfoJobs(final String projectId) {
+ Project project = self.getProjectByProjectId(projectId, true);
+ Set<MiriamData> set = new HashSet<>();
+ for (ModelData model : project.getModels()) {
+ for (Element bioEntity : model.getElements()) {
+ set.addAll(bioEntity.getMiriamData());
+ }
+ for (Reaction bioEntity : model.getReactions()) {
+ set.addAll(bioEntity.getMiriamData());
+ }
+ }
+ for (MiriamData miriamData : set) {
+ minervaJobService.addJob(createRefreshDrugInfoJob(miriamData));
+ }
+ }
+
+ @Override
+ public void createRefreshChemicalInfoJobs(final String projectId) {
+ Project project = self.getProjectByProjectId(projectId, true);
+ MiriamData disease = project.getDisease();
+ if (disease != null) {
+
+ Set<MiriamData> set = new HashSet<>();
+ for (ModelData model : project.getModels()) {
+ for (Element bioEntity : model.getElements()) {
+ set.addAll(bioEntity.getMiriamData());
+ }
+ for (Reaction bioEntity : model.getReactions()) {
+ set.addAll(bioEntity.getMiriamData());
+ }
+ }
+ for (MiriamData miriamData : set) {
+ minervaJobService.addJob(createRefreshChemicalInfoJob(miriamData, disease));
+ }
+ }
+ }
+
+ @Override
+ public void createRefreshMiRnaInfoJobs(final String projectId) {
+ Project project = self.getProjectByProjectId(projectId, true);
+ Set<MiriamData> set = new HashSet<>();
+ for (ModelData model : project.getModels()) {
+ for (Element bioEntity : model.getElements()) {
+ set.addAll(bioEntity.getMiriamData());
+ }
+ for (Reaction bioEntity : model.getReactions()) {
+ set.addAll(bioEntity.getMiriamData());
+ }
+ }
+ for (MiriamData miriamData : set) {
+ minervaJobService.addJob(createRefreshMiRnaInfoJob(miriamData));
+ }
+ }
+
+ private MinervaJob createRefreshDrugInfoJob(final MiriamData md) {
+ RefreshDrugInfoMinervaJob params = new RefreshDrugInfoMinervaJob(md.getDataType(), md.getResource());
+ return new MinervaJob(MinervaJobType.REFRESH_DRUG_INFO, MinervaJobPriority.MEDIUM, params);
+ }
+
+ private MinervaJob createRefreshMiRnaInfoJob(final MiriamData md) {
+ RefreshMiRnaInfoMinervaJob params = new RefreshMiRnaInfoMinervaJob(md.getDataType(), md.getResource());
+ return new MinervaJob(MinervaJobType.REFRESH_MI_RNA_INFO, MinervaJobPriority.MEDIUM, params);
+ }
+
+ private MinervaJob createRefreshChemicalInfoJob(final MiriamData md, final MiriamData disease) {
+ RefreshChemicalInfoMinervaJob params = new RefreshChemicalInfoMinervaJob(md, disease);
+ return new MinervaJob(MinervaJobType.REFRESH_CHEMICAL_INFO, MinervaJobPriority.MEDIUM, params);
+ }
+
private MinervaJob createRefreshMiriamInfoJob(final MiriamData md) {
RefreshMiriamInfoMinervaJob params = new RefreshMiriamInfoMinervaJob(md.getId());
return new MinervaJob(MinervaJobType.REFRESH_MIRIAM_INFO, MinervaJobPriority.MEDIUM, params);
@@ -516,6 +590,10 @@ public class ProjectService implements IProjectService {
@Override
public void updateProject(final Project project) {
projectDao.update(project);
+ for (ProjectBackground background : getBackgrounds(project.getProjectId(), false)) {
+ background.setCreator(project.getOwner());
+ updateBackground(background);
+ }
if (project.getOrganism() != null) {
minervaJobService.addJob(createRefreshMiriamInfoJob(project.getOrganism()));
}
@@ -578,14 +656,10 @@ public class ProjectService implements IProjectService {
/**
* This method creates set of images for the model backgrounds.
*
- * @param params
- * configuration parameters including set of backgrounds to generate
- * @throws IOException
- * thrown when there are problems with generating files
- * @throws DrawingException
- * thrown when there was a problem with drawing a map
- * @throws CommandExecutionException
- * thrown when one of the files describing backgrounds is invalid
+ * @param params configuration parameters including set of backgrounds to generate
+ * @throws IOException thrown when there are problems with generating files
+ * @throws DrawingException thrown when there was a problem with drawing a map
+ * @throws CommandExecutionException thrown when one of the files describing backgrounds is invalid
*/
@Override
public void createImages(final CreateProjectParams params)
@@ -626,7 +700,7 @@ public class ProjectService implements IProjectService {
}
private void generateImagesForBuiltInBackground(final ProjectBackground background,
- final IProgressUpdater updater) throws CommandExecutionException, IOException, DrawingException {
+ final IProgressUpdater updater) throws CommandExecutionException, IOException, DrawingException {
for (final ProjectBackgroundImageLayer imageLayer : background.getProjectBackgroundImageLayer()) {
String directory = imageLayer.getDirectory();
Model model = imageLayer.getModel().getModel();
@@ -810,12 +884,9 @@ public class ProjectService implements IProjectService {
/**
* Updates status of the generating project.
*
- * @param projectId
- * project that is generated
- * @param status
- * what is the current status
- * @param progress
- * what is the progress
+ * @param projectId project that is generated
+ * @param status what is the current status
+ * @param progress what is the progress
*/
@Override
public void updateProjectStatus(final String projectId, final ProjectStatus status, final double progress) {
@@ -884,8 +955,7 @@ public class ProjectService implements IProjectService {
}
/**
- * @param projectDao
- * the projectDao to set
+ * @param projectDao the projectDao to set
* @see #projectDao
*/
public void setProjectDao(final ProjectDao projectDao) {
@@ -936,12 +1006,9 @@ public class ProjectService implements IProjectService {
/**
* Sends notification email that map was removed.
*
- * @param projectId
- * identifier of the project
- * @param email
- * notification email
- * @throws MessagingException
- * thrown when there is a problem with sending email
+ * @param projectId identifier of the project
+ * @param email notification email
+ * @throws MessagingException thrown when there is a problem with sending email
*/
protected void sendSuccesfullRemoveEmail(final String projectId, final String email) throws MessagingException {
EmailSender emailSender = new EmailSender(configurationService);
@@ -951,12 +1018,9 @@ public class ProjectService implements IProjectService {
/**
* Sends email about unsuccessful project creation.
*
- * @param projectName
- * name of the project
- * @param email
- * email where we want to send information
- * @param e
- * exception that caused problem
+ * @param projectName name of the project
+ * @param email email where we want to send information
+ * @param e exception that caused problem
*/
@Override
public void sendUnsuccesfullEmail(final String projectName, final String email, final Throwable e) {
@@ -974,10 +1038,8 @@ public class ProjectService implements IProjectService {
/**
* Sends email about successful project creation.
*
- * @param params
- * model that was created
- * @throws MessagingException
- * exception thrown when there is a problem with sending email
+ * @param params model that was created
+ * @throws MessagingException exception thrown when there is a problem with sending email
*/
protected void sendSuccesfullEmail(final CreateProjectParams params) throws MessagingException {
EmailSender emailSender = new EmailSender(configurationService);
@@ -1024,6 +1086,9 @@ public class ProjectService implements IProjectService {
project.setMapCanvasType(params.getMapCanvasType());
project.setVersion(params.getVersion());
+ project.setLicense(params.getLicense());
+ project.setCustomLicenseName(params.getCustomLicenseName());
+ project.setCustomLicenseUrl(params.getCustomLicenseUrl());
return project;
}
@@ -1098,6 +1163,7 @@ public class ProjectService implements IProjectService {
} catch (IOException e) {
logger.error("Problem with removing directory for background: " + background.getId() + "; " + background.getName(), e);
}
+ background.getProject().getProjectBackgrounds().remove(background);
projectBackgroundService.delete(background);
}
diff --git a/service/src/main/java/lcsb/mapviewer/services/interfaces/ILicenseService.java b/service/src/main/java/lcsb/mapviewer/services/interfaces/ILicenseService.java
new file mode 100644
index 0000000000000000000000000000000000000000..2f0f071c5fd8c9eea4451316290c1777c11e52df
--- /dev/null
+++ b/service/src/main/java/lcsb/mapviewer/services/interfaces/ILicenseService.java
@@ -0,0 +1,13 @@
+package lcsb.mapviewer.services.interfaces;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import lcsb.mapviewer.model.License;
+
+public interface ILicenseService {
+
+ Page<License> getByFilter(final Pageable pageable);
+
+ License getById(int id);
+}
diff --git a/service/src/main/java/lcsb/mapviewer/services/interfaces/IProjectService.java b/service/src/main/java/lcsb/mapviewer/services/interfaces/IProjectService.java
index edd1a37c347cc5ae290afcee1422065445a2c933..d6bb975def0c468a690790efba2682fe9acaac83 100644
--- a/service/src/main/java/lcsb/mapviewer/services/interfaces/IProjectService.java
+++ b/service/src/main/java/lcsb/mapviewer/services/interfaces/IProjectService.java
@@ -206,4 +206,13 @@ public interface IProjectService extends MinervaJobExecutor {
@Transactional
void reviveBackgrounds(String projectId);
+ @Transactional
+ void createRefreshDrugInfoJobs(String projectId);
+
+ @Transactional
+ void createRefreshChemicalInfoJobs(String projectId);
+
+ @Transactional
+ void createRefreshMiRnaInfoJobs(String projectId);
+
}
diff --git a/service/src/main/java/lcsb/mapviewer/services/jobs/RefreshChemicalInfoMinervaJob.java b/service/src/main/java/lcsb/mapviewer/services/jobs/RefreshChemicalInfoMinervaJob.java
new file mode 100644
index 0000000000000000000000000000000000000000..405c0473b5b1ca9158836b1fc77dd0d89b6890d1
--- /dev/null
+++ b/service/src/main/java/lcsb/mapviewer/services/jobs/RefreshChemicalInfoMinervaJob.java
@@ -0,0 +1,50 @@
+package lcsb.mapviewer.services.jobs;
+
+import java.util.Map;
+
+import lcsb.mapviewer.model.job.InvalidMinervaJobParameters;
+import lcsb.mapviewer.model.map.MiriamData;
+import lcsb.mapviewer.model.map.MiriamType;
+
+public class RefreshChemicalInfoMinervaJob extends RefreshInfoFromMiriamMinervaJob {
+
+ private MiriamType diseaseType;
+ private String diseaseId;
+
+ public RefreshChemicalInfoMinervaJob(final MiriamData identifier, final MiriamData disease) {
+ super(identifier.getDataType(), identifier.getResource());
+ this.diseaseType = disease.getDataType();
+ this.diseaseId = disease.getResource();
+ }
+
+ public RefreshChemicalInfoMinervaJob(final Map<String, Object> jobParameters) throws InvalidMinervaJobParameters {
+ super(jobParameters);
+ }
+
+ @Override
+ protected void assignData(final Map<String, Object> jobParameters) {
+ super.assignData(jobParameters);
+ this.diseaseId = (String) jobParameters.get("diseaseId");
+ String stringType = (String) jobParameters.get("diseaseType");
+ if (stringType != null) {
+ this.diseaseType = MiriamType.valueOf(stringType);
+ }
+ }
+
+ @Override
+ protected Map<String, Object> getJobParameters() {
+ Map<String, Object> jobParameters = super.getJobParameters();
+ jobParameters.put("diseaseId", diseaseId);
+ jobParameters.put("diseaseType", diseaseType);
+ return jobParameters;
+ }
+
+ public MiriamType getDiseaseType() {
+ return diseaseType;
+ }
+
+ public String getDiseaseId() {
+ return diseaseId;
+ }
+
+}
diff --git a/service/src/main/java/lcsb/mapviewer/services/jobs/RefreshDrugInfoMinervaJob.java b/service/src/main/java/lcsb/mapviewer/services/jobs/RefreshDrugInfoMinervaJob.java
new file mode 100644
index 0000000000000000000000000000000000000000..270532fc7af481427bf46a338c700ff7f1636267
--- /dev/null
+++ b/service/src/main/java/lcsb/mapviewer/services/jobs/RefreshDrugInfoMinervaJob.java
@@ -0,0 +1,17 @@
+package lcsb.mapviewer.services.jobs;
+
+import java.util.Map;
+
+import lcsb.mapviewer.model.job.InvalidMinervaJobParameters;
+import lcsb.mapviewer.model.map.MiriamType;
+
+public class RefreshDrugInfoMinervaJob extends RefreshInfoFromMiriamMinervaJob {
+
+ public RefreshDrugInfoMinervaJob(final MiriamType type, final String id) {
+ super(type, id);
+ }
+
+ public RefreshDrugInfoMinervaJob(final Map<String, Object> jobParameters) throws InvalidMinervaJobParameters {
+ super(jobParameters);
+ }
+}
diff --git a/service/src/main/java/lcsb/mapviewer/services/jobs/RefreshInfoFromMiriamMinervaJob.java b/service/src/main/java/lcsb/mapviewer/services/jobs/RefreshInfoFromMiriamMinervaJob.java
new file mode 100644
index 0000000000000000000000000000000000000000..59aa0e702dd898ecd42ad152fedfdcd17c3debb0
--- /dev/null
+++ b/service/src/main/java/lcsb/mapviewer/services/jobs/RefreshInfoFromMiriamMinervaJob.java
@@ -0,0 +1,54 @@
+package lcsb.mapviewer.services.jobs;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import lcsb.mapviewer.model.job.InvalidMinervaJobParameters;
+import lcsb.mapviewer.model.job.MinervaJobParameters;
+import lcsb.mapviewer.model.map.MiriamType;
+
+public class RefreshInfoFromMiriamMinervaJob extends MinervaJobParameters {
+
+ private static Logger logger = LogManager.getLogger();
+
+ private String id;
+ private MiriamType type;
+
+ public RefreshInfoFromMiriamMinervaJob(final MiriamType type, final String id) {
+ this.id = id;
+ this.type = type;
+ }
+
+ public RefreshInfoFromMiriamMinervaJob(final Map<String, Object> jobParameters) throws InvalidMinervaJobParameters {
+ super(jobParameters);
+ }
+
+ @Override
+ protected void assignData(final Map<String, Object> jobParameters) {
+ this.id = (String) jobParameters.get("id");
+ String stringType = (String) jobParameters.get("type");
+ if (stringType != null) {
+ this.type = MiriamType.valueOf(stringType);
+ }
+ }
+
+ @Override
+ protected Map<String, Object> getJobParameters() {
+ Map<String, Object> jobParameters = new HashMap<>();
+ jobParameters.put("id", id);
+ jobParameters.put("type", type);
+ return jobParameters;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public MiriamType getType() {
+ return type;
+ }
+
+}
diff --git a/service/src/main/java/lcsb/mapviewer/services/jobs/RefreshMiRnaInfoMinervaJob.java b/service/src/main/java/lcsb/mapviewer/services/jobs/RefreshMiRnaInfoMinervaJob.java
new file mode 100644
index 0000000000000000000000000000000000000000..0b0b9ddd745f98d897626c525a9a194c7d42ca80
--- /dev/null
+++ b/service/src/main/java/lcsb/mapviewer/services/jobs/RefreshMiRnaInfoMinervaJob.java
@@ -0,0 +1,10 @@
+package lcsb.mapviewer.services.jobs;
+
+import lcsb.mapviewer.model.map.MiriamType;
+
+public class RefreshMiRnaInfoMinervaJob extends RefreshInfoFromMiriamMinervaJob {
+
+ public RefreshMiRnaInfoMinervaJob(final MiriamType type, final String id) {
+ super(type, id);
+ }
+}
diff --git a/service/src/main/java/lcsb/mapviewer/services/search/chemical/ChemicalService.java b/service/src/main/java/lcsb/mapviewer/services/search/chemical/ChemicalService.java
index 32b2877eb2a0895e85dfb14da72b163b7e978e4c..c1f045065397268e1d2f0331ce4e465a26cdfb2b 100644
--- a/service/src/main/java/lcsb/mapviewer/services/search/chemical/ChemicalService.java
+++ b/service/src/main/java/lcsb/mapviewer/services/search/chemical/ChemicalService.java
@@ -5,8 +5,11 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
+import javax.annotation.PostConstruct;
+
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +23,10 @@ import lcsb.mapviewer.annotation.services.dapi.ChemicalParser;
import lcsb.mapviewer.annotation.services.dapi.ChemicalSearchException;
import lcsb.mapviewer.common.IProgressUpdater;
import lcsb.mapviewer.common.exception.InvalidArgumentException;
+import lcsb.mapviewer.common.exception.NotImplementedException;
import lcsb.mapviewer.model.Project;
+import lcsb.mapviewer.model.job.MinervaJob;
+import lcsb.mapviewer.model.job.MinervaJobType;
import lcsb.mapviewer.model.map.MiriamData;
import lcsb.mapviewer.model.map.MiriamType;
import lcsb.mapviewer.model.map.model.ModelData;
@@ -28,6 +34,8 @@ import lcsb.mapviewer.model.map.species.Element;
import lcsb.mapviewer.model.map.species.Gene;
import lcsb.mapviewer.model.map.species.Protein;
import lcsb.mapviewer.model.map.species.Rna;
+import lcsb.mapviewer.services.interfaces.IMinervaJobService;
+import lcsb.mapviewer.services.jobs.RefreshChemicalInfoMinervaJob;
import lcsb.mapviewer.services.search.DbSearchCriteria;
import lcsb.mapviewer.services.search.DbSearchService;
@@ -56,11 +64,19 @@ public class ChemicalService extends DbSearchService implements IChemicalService
*/
private HgncAnnotator hgncAnnotator;
+ private IMinervaJobService minervaJobService;
+
@Autowired
- public ChemicalService(final ChemicalParser chemicalParser, final HgncAnnotator hgncAnnotator) {
+ private IChemicalService self;
+
+ @Autowired
+ public ChemicalService(final ChemicalParser chemicalParser,
+ final HgncAnnotator hgncAnnotator,
+ final IMinervaJobService minervaJobService) {
super();
this.chemicalParser = chemicalParser;
this.hgncAnnotator = hgncAnnotator;
+ this.minervaJobService = minervaJobService;
}
@Override
@@ -130,6 +146,11 @@ public class ChemicalService extends DbSearchService implements IChemicalService
return chemicalList;
}
+ @PostConstruct
+ public void init() {
+ minervaJobService.registerExecutor(MinervaJobType.REFRESH_CHEMICAL_INFO, self);
+ }
+
@Override
public void cacheDataForModel(final ModelData originalModel, final IProgressUpdater progressUpdater) {
double progress = 0.0;
@@ -141,14 +162,7 @@ public class ChemicalService extends DbSearchService implements IChemicalService
double counter = 0.0;
for (final MiriamData md : targetMiriams) {
- try {
- List<Chemical> chemicalList = chemicalParser.getChemicalListByTarget(md, disease);
- for (final Chemical chemical : chemicalList) {
- cacheMiriamData(chemical);
- }
- } catch (final ChemicalSearchException | AnnotatorException e) {
- logger.error("Problem with accessing info about chemical for target: " + md, e);
- }
+ refreshChemical(disease, md);
counter += 1;
progress = counter / targetMiriams.size();
progressUpdater.setProgress(progress * IProgressUpdater.MAX_PROGRESS);
@@ -164,8 +178,34 @@ public class ChemicalService extends DbSearchService implements IChemicalService
}
}
+ private void refreshChemical(final MiriamData disease, final MiriamData md) {
+ try {
+ List<Chemical> chemicalList = chemicalParser.getChemicalListByTarget(md, disease);
+ for (final Chemical chemical : chemicalList) {
+ cacheMiriamData(chemical);
+ }
+ } catch (final ChemicalSearchException | AnnotatorException e) {
+ logger.error("Problem with accessing info about chemical for target: " + md, e);
+ }
+ }
+
@Override
public List<String> getSuggestedQueryList(final Project project, final MiriamData disease) throws ChemicalSearchException {
return chemicalParser.getSuggestedQueryList(project, disease);
}
+
+ @Override
+ public void execute(final MinervaJob job) throws Exception {
+ if (job.getJobType() == MinervaJobType.REFRESH_CHEMICAL_INFO) {
+ RefreshChemicalInfoMinervaJob parametres = new RefreshChemicalInfoMinervaJob(job.getJobParameters());
+ MiriamData md = new MiriamData(parametres.getType(), parametres.getId());
+ MiriamData disease = new MiriamData(parametres.getDiseaseType(), parametres.getDiseaseId());
+ if (Objects.equals(MiriamType.HGNC_SYMBOL, md.getDataType())) {
+ refreshChemical(disease, md);
+ }
+ } else {
+ throw new NotImplementedException(job.getJobType() + " not implemented");
+ }
+ }
+
}
diff --git a/service/src/main/java/lcsb/mapviewer/services/search/chemical/IChemicalService.java b/service/src/main/java/lcsb/mapviewer/services/search/chemical/IChemicalService.java
index 75e838fd04b34ed07da3ec513ba0ad3c5e43572a..65f7d15aac9f2e9325ee2fb997c2bf420eeba5d0 100644
--- a/service/src/main/java/lcsb/mapviewer/services/search/chemical/IChemicalService.java
+++ b/service/src/main/java/lcsb/mapviewer/services/search/chemical/IChemicalService.java
@@ -5,6 +5,7 @@ import java.util.List;
import lcsb.mapviewer.annotation.data.Chemical;
import lcsb.mapviewer.annotation.services.dapi.ChemicalSearchException;
import lcsb.mapviewer.model.Project;
+import lcsb.mapviewer.model.job.MinervaJobExecutor;
import lcsb.mapviewer.model.map.MiriamData;
import lcsb.mapviewer.services.search.IDbSearchService;
@@ -14,7 +15,7 @@ import lcsb.mapviewer.services.search.IDbSearchService;
* @author Ayan Rota
*
*/
-public interface IChemicalService extends IDbSearchService<Chemical> {
+public interface IChemicalService extends IDbSearchService<Chemical>, MinervaJobExecutor {
List<String> getSuggestedQueryList(final Project project, final MiriamData disease) throws ChemicalSearchException;
diff --git a/service/src/main/java/lcsb/mapviewer/services/search/drug/DrugService.java b/service/src/main/java/lcsb/mapviewer/services/search/drug/DrugService.java
index 035ecf4cfa42866fb01e8f007a169638515d60cb..b1d8f5c203bce3339cd9f906a873d6738e1f6231 100644
--- a/service/src/main/java/lcsb/mapviewer/services/search/drug/DrugService.java
+++ b/service/src/main/java/lcsb/mapviewer/services/search/drug/DrugService.java
@@ -5,8 +5,11 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
+import javax.annotation.PostConstruct;
+
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,11 +24,17 @@ import lcsb.mapviewer.annotation.services.DrugSearchException;
import lcsb.mapviewer.annotation.services.annotators.AnnotatorException;
import lcsb.mapviewer.annotation.services.dapi.DrugBankParser;
import lcsb.mapviewer.common.IProgressUpdater;
+import lcsb.mapviewer.common.exception.NotImplementedException;
import lcsb.mapviewer.model.Project;
+import lcsb.mapviewer.model.job.MinervaJob;
+import lcsb.mapviewer.model.job.MinervaJobType;
import lcsb.mapviewer.model.map.MiriamData;
+import lcsb.mapviewer.model.map.MiriamType;
import lcsb.mapviewer.model.map.model.Model;
import lcsb.mapviewer.model.map.model.ModelData;
import lcsb.mapviewer.model.map.species.Element;
+import lcsb.mapviewer.services.interfaces.IMinervaJobService;
+import lcsb.mapviewer.services.jobs.RefreshDrugInfoMinervaJob;
import lcsb.mapviewer.services.search.DbSearchCriteria;
import lcsb.mapviewer.services.search.DbSearchService;
@@ -54,11 +63,23 @@ public class DrugService extends DbSearchService implements IDrugService {
*/
private ChEMBLParser chEMBLParser;
+ private IMinervaJobService minervaJobService;
+
+ @Autowired
+ private IDrugService self;
+
@Autowired
public DrugService(final DrugBankParser drugBankParser,
- final ChEMBLParser chEMBLParser) {
+ final ChEMBLParser chEMBLParser,
+ final IMinervaJobService minervaJobService) {
this.drugBankParser = drugBankParser;
this.chEMBLParser = chEMBLParser;
+ this.minervaJobService = minervaJobService;
+ }
+
+ @PostConstruct
+ public void init() {
+ minervaJobService.registerExecutor(MinervaJobType.REFRESH_DRUG_INFO, self);
}
/**
@@ -249,22 +270,7 @@ public class DrugService extends DbSearchService implements IDrugService {
double counter = 0.0;
List<MiriamData> organisms = new ArrayList<>();
for (final MiriamData md : targetMiriams) {
- try {
- List<Drug> drugList = drugBankParser.getDrugListByTarget(md, organisms);
- for (final Drug drug : drugList) {
- cacheMiriamData(drug);
- }
- } catch (final DrugSearchException | AnnotatorException e) {
- logger.error("Problem with accessing info about drugbank for target: " + md, e);
- }
- try {
- List<Drug> drugList = chEMBLParser.getDrugListByTarget(md, organisms);
- for (final Drug drug : drugList) {
- cacheMiriamData(drug);
- }
- } catch (final DrugSearchException | AnnotatorException e) {
- logger.error("Problem with accessing info about chembl for target: " + md, e);
- }
+ refreshDrugsForMiriamData(organisms, md);
counter += 1;
progress = counter / targetMiriams.size();
progressUpdater.setProgress(progress * IProgressUpdater.MAX_PROGRESS);
@@ -277,6 +283,25 @@ public class DrugService extends DbSearchService implements IDrugService {
}
}
+ private void refreshDrugsForMiriamData(final List<MiriamData> organisms, final MiriamData md) {
+ try {
+ List<Drug> drugList = drugBankParser.getDrugListByTarget(md, organisms);
+ for (final Drug drug : drugList) {
+ cacheMiriamData(drug);
+ }
+ } catch (final DrugSearchException | AnnotatorException e) {
+ logger.error("Problem with accessing info about drugbank for target: " + md, e);
+ }
+ try {
+ List<Drug> drugList = chEMBLParser.getDrugListByTarget(md, organisms);
+ for (final Drug drug : drugList) {
+ cacheMiriamData(drug);
+ }
+ } catch (final DrugSearchException | AnnotatorException e) {
+ logger.error("Problem with accessing info about chembl for target: " + md, e);
+ }
+ }
+
/**
* @return the chEMBLParser
*/
@@ -307,4 +332,17 @@ public class DrugService extends DbSearchService implements IDrugService {
Collections.sort(result);
return result;
}
+
+ @Override
+ public void execute(final MinervaJob job) throws Exception {
+ if (job.getJobType() == MinervaJobType.REFRESH_DRUG_INFO) {
+ RefreshDrugInfoMinervaJob parametres = new RefreshDrugInfoMinervaJob(job.getJobParameters());
+ MiriamData md = new MiriamData(parametres.getType(), parametres.getId());
+ if (Objects.equals(MiriamType.HGNC_SYMBOL, md.getDataType()) || Objects.equals(MiriamType.UNIPROT, md.getDataType())) {
+ refreshDrugsForMiriamData(Collections.emptyList(), md);
+ }
+ } else {
+ throw new NotImplementedException(job.getJobType() + " not implemented");
+ }
+ }
}
diff --git a/service/src/main/java/lcsb/mapviewer/services/search/drug/IDrugService.java b/service/src/main/java/lcsb/mapviewer/services/search/drug/IDrugService.java
index d22124e14d396560c5133b12941c100cb47e3776..99e3407ece37b96115dab339b6b36aea0ec439b0 100644
--- a/service/src/main/java/lcsb/mapviewer/services/search/drug/IDrugService.java
+++ b/service/src/main/java/lcsb/mapviewer/services/search/drug/IDrugService.java
@@ -5,6 +5,7 @@ import java.util.List;
import lcsb.mapviewer.annotation.data.Drug;
import lcsb.mapviewer.annotation.services.DrugSearchException;
import lcsb.mapviewer.model.Project;
+import lcsb.mapviewer.model.job.MinervaJobExecutor;
import lcsb.mapviewer.model.map.MiriamData;
import lcsb.mapviewer.services.search.IDbSearchService;
@@ -14,7 +15,7 @@ import lcsb.mapviewer.services.search.IDbSearchService;
* @author Piotr Gawron
*
*/
-public interface IDrugService extends IDbSearchService<Drug> {
+public interface IDrugService extends IDbSearchService<Drug>, MinervaJobExecutor {
List<String> getSuggestedQueryList(final Project project, final MiriamData disease) throws DrugSearchException;
diff --git a/service/src/main/java/lcsb/mapviewer/services/search/mirna/IMiRNAService.java b/service/src/main/java/lcsb/mapviewer/services/search/mirna/IMiRNAService.java
index a3a0c9768deb00368ebde246809c7314fff9db69..13fcabecff1b6256bca76a857e3f77ea8a2245bb 100644
--- a/service/src/main/java/lcsb/mapviewer/services/search/mirna/IMiRNAService.java
+++ b/service/src/main/java/lcsb/mapviewer/services/search/mirna/IMiRNAService.java
@@ -5,6 +5,7 @@ import java.util.List;
import lcsb.mapviewer.annotation.data.MiRNA;
import lcsb.mapviewer.annotation.services.MiRNASearchException;
import lcsb.mapviewer.model.Project;
+import lcsb.mapviewer.model.job.MinervaJobExecutor;
import lcsb.mapviewer.services.search.IDbSearchService;
/**
@@ -13,7 +14,7 @@ import lcsb.mapviewer.services.search.IDbSearchService;
* @author Ayan Rota
*
*/
-public interface IMiRNAService extends IDbSearchService<MiRNA> {
+public interface IMiRNAService extends IDbSearchService<MiRNA>, MinervaJobExecutor {
public List<String> getSuggestedQueryList(final Project project) throws MiRNASearchException;
}
diff --git a/service/src/main/java/lcsb/mapviewer/services/search/mirna/MiRNAService.java b/service/src/main/java/lcsb/mapviewer/services/search/mirna/MiRNAService.java
index 153337f417caa8da611308583eb5999feee21138..b50561a903323612cb03bea2d3086d8375954741 100644
--- a/service/src/main/java/lcsb/mapviewer/services/search/mirna/MiRNAService.java
+++ b/service/src/main/java/lcsb/mapviewer/services/search/mirna/MiRNAService.java
@@ -1,14 +1,19 @@
package lcsb.mapviewer.services.search.mirna;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
+import javax.annotation.PostConstruct;
+
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -19,7 +24,10 @@ import lcsb.mapviewer.annotation.services.MiRNASearchException;
import lcsb.mapviewer.annotation.services.annotators.AnnotatorException;
import lcsb.mapviewer.annotation.services.annotators.HgncAnnotator;
import lcsb.mapviewer.common.IProgressUpdater;
+import lcsb.mapviewer.common.exception.NotImplementedException;
import lcsb.mapviewer.model.Project;
+import lcsb.mapviewer.model.job.MinervaJob;
+import lcsb.mapviewer.model.job.MinervaJobType;
import lcsb.mapviewer.model.map.BioEntity;
import lcsb.mapviewer.model.map.MiriamData;
import lcsb.mapviewer.model.map.MiriamType;
@@ -28,6 +36,8 @@ import lcsb.mapviewer.model.map.species.Element;
import lcsb.mapviewer.model.map.species.Gene;
import lcsb.mapviewer.model.map.species.Protein;
import lcsb.mapviewer.model.map.species.Rna;
+import lcsb.mapviewer.services.interfaces.IMinervaJobService;
+import lcsb.mapviewer.services.jobs.RefreshDrugInfoMinervaJob;
import lcsb.mapviewer.services.search.DbSearchCriteria;
import lcsb.mapviewer.services.search.DbSearchService;
@@ -57,10 +67,23 @@ public class MiRNAService extends DbSearchService implements IMiRNAService {
*/
private HgncAnnotator hgncAnnotator;
- public MiRNAService(final MiRNAParser miRNAParser, final HgncAnnotator hgncAnnotator) {
+ private IMinervaJobService minervaJobService;
+
+ @Autowired
+ private IMiRNAService self;
+
+ public MiRNAService(final MiRNAParser miRNAParser,
+ final HgncAnnotator hgncAnnotator,
+ final IMinervaJobService minervaJobService) {
super();
this.miRNAParser = miRNAParser;
this.hgncAnnotator = hgncAnnotator;
+ this.minervaJobService = minervaJobService;
+ }
+
+ @PostConstruct
+ public void init() {
+ minervaJobService.registerExecutor(MinervaJobType.REFRESH_MI_RNA_INFO, self);
}
@Override
@@ -217,4 +240,18 @@ public class MiRNAService extends DbSearchService implements IMiRNAService {
return miRNAParser.getSuggestedQueryList(project);
}
+ @Override
+ public void execute(final MinervaJob job) throws Exception {
+ if (job.getJobType() == MinervaJobType.REFRESH_MI_RNA_INFO) {
+ RefreshDrugInfoMinervaJob parametres = new RefreshDrugInfoMinervaJob(job.getJobParameters());
+ MiriamData md = new MiriamData(parametres.getType(), parametres.getId());
+
+ if (Objects.equals(MiriamType.HGNC_SYMBOL, md.getDataType()) || Objects.equals(MiriamType.ENTREZ, md.getDataType())) {
+ miRNAParser.getMiRnaListByTargets(Arrays.asList(md));
+ }
+ } else {
+ throw new NotImplementedException(job.getJobType() + " not implemented");
+ }
+ }
+
}
diff --git a/service/src/main/java/lcsb/mapviewer/services/utils/CreateProjectParams.java b/service/src/main/java/lcsb/mapviewer/services/utils/CreateProjectParams.java
index d20ff12ed9ae4e976061fc2d756ceb8363e87ecd..6176efa49adc928d724e6b6335e952fa83a65c88 100644
--- a/service/src/main/java/lcsb/mapviewer/services/utils/CreateProjectParams.java
+++ b/service/src/main/java/lcsb/mapviewer/services/utils/CreateProjectParams.java
@@ -1,18 +1,19 @@
package lcsb.mapviewer.services.utils;
-import java.util.ArrayList;
-import java.util.List;
-
import lcsb.mapviewer.converter.Converter;
import lcsb.mapviewer.converter.zip.ZipEntryFile;
+import lcsb.mapviewer.model.License;
import lcsb.mapviewer.model.graphics.MapCanvasType;
import lcsb.mapviewer.model.user.User;
+import java.util.ArrayList;
+import java.util.List;
+
+
/**
* Set of parameters used during creation of new project.
- *
+ *
* @author Piotr Gawron
- *
*/
public class CreateProjectParams {
@@ -36,6 +37,10 @@ public class CreateProjectParams {
*/
private String organism;
+ private String customLicenseName;
+
+ private String customLicenseUrl;
+
private int projectFileId;
private Class<? extends Converter> parser;
@@ -48,7 +53,7 @@ public class CreateProjectParams {
/**
* List of zip entries in the complex model definition.
*/
- private List<ZipEntryFile> zipEntries = new ArrayList<>();
+ private final List<ZipEntryFile> zipEntries = new ArrayList<>();
/**
* Should the elements be annotated by the external resources.
@@ -61,8 +66,7 @@ public class CreateProjectParams {
private boolean images = false;
/**
- * Should the map be autoresized after processing (to trim unnecessary
- * margins).
+ * Should the map be autoresized after processing (to trim unnecessary margins).
*/
private boolean autoResize = true;
@@ -84,9 +88,9 @@ public class CreateProjectParams {
private boolean networkBackgroundAsDefault = false;
/**
- * Do we want to analyze annotations after processing of the map. If yes then
- * in the email with summary of the generation process information about
- * improper annotations will be sent.
+ * Do we want to analyze annotations after processing of the map. If yes then in
+ * the email with summary of the generation process information about improper
+ * annotations will be sent.
*/
private boolean analyzeAnnotations = false;
@@ -116,9 +120,10 @@ public class CreateProjectParams {
private MapCanvasType mapCanvasType = MapCanvasType.OPEN_LAYERS;
+ private License license;
+
/**
- * @param projectId
- * the projectId to set
+ * @param projectId the projectId to set
* @return object with all parameters
* @see #projectId
*/
@@ -138,8 +143,7 @@ public class CreateProjectParams {
}
/**
- * @param notifyEmail
- * the notifyEmail to set
+ * @param notifyEmail the notifyEmail to set
* @return object with all parameters
* @see #notifyEmail
*/
@@ -149,8 +153,7 @@ public class CreateProjectParams {
}
/**
- * @param autoResize
- * the autoResize to set
+ * @param autoResize the autoResize to set
* @return object with all parameters
* @see #autoResize
*/
@@ -164,8 +167,7 @@ public class CreateProjectParams {
}
/**
- * @param analyzeAnnotations
- * the analyzeAnnotations to set
+ * @param analyzeAnnotations the analyzeAnnotations to set
* @return object with all parameters
* @see #analyzeAnnotations
*/
@@ -179,8 +181,7 @@ public class CreateProjectParams {
}
/**
- * @param updateAnnotations
- * the updateAnnotations to set
+ * @param updateAnnotations the updateAnnotations to set
* @return object with all parameters
* @see #updateAnnotations
*/
@@ -194,8 +195,7 @@ public class CreateProjectParams {
}
/**
- * @param images
- * the images to set
+ * @param images the images to set
* @return object with all parameters
* @see #images
*/
@@ -205,8 +205,7 @@ public class CreateProjectParams {
}
/**
- * @param description
- * the description to set
+ * @param description the description to set
* @return object with all parameters
* @see #description
*/
@@ -216,8 +215,7 @@ public class CreateProjectParams {
}
/**
- * @param version
- * the version to set
+ * @param version the version to set
* @return object with all parameters
* @see #version
*/
@@ -307,10 +305,9 @@ public class CreateProjectParams {
}
/**
- * @param cacheModel
- * the cacheModel to set
- * @see #cacheModel
+ * @param cacheModel the cacheModel to set
* @return object with all parameters
+ * @see #cacheModel
*/
public CreateProjectParams cacheModel(final boolean cacheModel) {
this.cacheModel = cacheModel;
@@ -330,10 +327,9 @@ public class CreateProjectParams {
}
/**
- * @param entry
- * the submodel to add
- * @see #zipEntries
+ * @param entry the submodel to add
* @return object with all parameters
+ * @see #zipEntries
*/
public CreateProjectParams addZipEntry(final ZipEntryFile entry) {
if (entry != null) {
@@ -359,8 +355,7 @@ public class CreateProjectParams {
}
/**
- * @param sbgnFormat
- * the sbgnFormat to set
+ * @param sbgnFormat the sbgnFormat to set
* @see #sbgnFormat
*/
public CreateProjectParams sbgnFormat(final boolean sbgnFormat) {
@@ -373,10 +368,9 @@ public class CreateProjectParams {
}
/**
- * @param complex
- * the complex to set
- * @see #complex
+ * @param complex the complex to set
* @return object with all parameters
+ * @see #complex
*/
public CreateProjectParams complex(final boolean complex) {
this.complex = complex;
@@ -459,9 +453,8 @@ public class CreateProjectParams {
/**
* Sets {@link #projectDir}.
- *
- * @param directory
- * new {@link #projectDir} value
+ *
+ * @param directory new {@link #projectDir} value
* @return instance of this class with new value set
*/
public CreateProjectParams projectDir(final String directory) {
@@ -478,9 +471,7 @@ public class CreateProjectParams {
}
/**
- *
- * @param projectName
- * new {@link #projectName}
+ * @param projectName new {@link #projectName}
* @return instance of this class with new value set
*/
public CreateProjectParams projectName(final String projectName) {
@@ -514,8 +505,7 @@ public class CreateProjectParams {
}
/**
- * @param disease
- * the code of the disease.
+ * @param disease the code of the disease.
* @return updated params object.
*/
public CreateProjectParams projectDisease(final String disease) {
@@ -531,9 +521,16 @@ public class CreateProjectParams {
return organism;
}
+ public String getCustomLicenseName() {
+ return customLicenseName;
+ }
+
+ public String getCustomLicenseUrl() {
+ return customLicenseUrl;
+ }
+
/**
- * @param organism
- * the organism to set
+ * @param organism the organism to set
* @return updated params object.
*/
public CreateProjectParams projectOrganism(final String organism) {
@@ -541,6 +538,16 @@ public class CreateProjectParams {
return this;
}
+ public CreateProjectParams customLicenseName(final String customLicenseName) {
+ this.customLicenseName = customLicenseName;
+ return this;
+ }
+
+ public CreateProjectParams customLicenseUrl(final String customLicenseUrl) {
+ this.customLicenseUrl = customLicenseUrl;
+ return this;
+ }
+
public String getUserLogin() {
return userLogin;
}
@@ -573,4 +580,13 @@ public class CreateProjectParams {
return this;
}
+ public CreateProjectParams license(final License license) {
+ this.license = license;
+ return this;
+ }
+
+ public License getLicense() {
+ return license;
+ }
+
}
diff --git a/service/src/test/java/lcsb/mapviewer/services/impl/LicenseServiceTest.java b/service/src/test/java/lcsb/mapviewer/services/impl/LicenseServiceTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..ab6c3b3da9aa0f9e70af6c28c9a0a2a8791d4bd1
--- /dev/null
+++ b/service/src/test/java/lcsb/mapviewer/services/impl/LicenseServiceTest.java
@@ -0,0 +1,47 @@
+package lcsb.mapviewer.services.impl;
+
+import lcsb.mapviewer.model.License;
+import lcsb.mapviewer.persist.dao.LicenseDao;
+import lcsb.mapviewer.services.ServiceTestFunctions;
+import lcsb.mapviewer.services.interfaces.ILicenseService;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.test.annotation.Rollback;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+@Rollback(true)
+public class LicenseServiceTest extends ServiceTestFunctions {
+
+ @Autowired
+ private ILicenseService licenseServce;
+
+ @Autowired
+ private LicenseDao licenseDao;
+
+ @Test
+ public void testGetAll() throws Exception {
+ final Page<License> page = licenseServce.getByFilter(Pageable.unpaged());
+
+ assertTrue(page.getContent().size() > 1);
+ assertTrue(page.getTotalElements() >= page.getContent().size());
+
+ }
+
+ @Test
+ public void testGetById() throws Exception {
+ final License license = licenseDao.add(new License("x", "y", "google.com"));
+ assertNotNull(licenseServce.getById(license.getId()));
+ }
+
+ @Test
+ public void testGetByInvalidId() throws Exception {
+ assertNull(licenseServce.getById(-1));
+
+ }
+
+}
diff --git a/service/src/test/java/lcsb/mapviewer/services/impl/MinervaJobServiceTest.java b/service/src/test/java/lcsb/mapviewer/services/impl/MinervaJobServiceTest.java
index 3abfa8d6960de7b58b73cee6af41cbceac588b19..f453c59f9899a91e6ce75fdc6b685344e7171877 100644
--- a/service/src/test/java/lcsb/mapviewer/services/impl/MinervaJobServiceTest.java
+++ b/service/src/test/java/lcsb/mapviewer/services/impl/MinervaJobServiceTest.java
@@ -1,5 +1,6 @@
package lcsb.mapviewer.services.impl;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -33,7 +34,11 @@ import lcsb.mapviewer.model.map.MiriamType;
import lcsb.mapviewer.services.SpringServiceTestConfig;
import lcsb.mapviewer.services.interfaces.IMinervaJobService;
import lcsb.mapviewer.services.interfaces.IMiriamService;
+import lcsb.mapviewer.services.jobs.RefreshChemicalInfoMinervaJob;
+import lcsb.mapviewer.services.jobs.RefreshDrugInfoMinervaJob;
+import lcsb.mapviewer.services.jobs.RefreshMiRnaInfoMinervaJob;
import lcsb.mapviewer.services.jobs.RefreshMiriamInfoMinervaJob;
+import lcsb.mapviewer.services.search.drug.IDrugService;
@ContextConfiguration(classes = SpringServiceTestConfig.class)
@RunWith(SpringJUnit4ClassRunner.class)
@@ -45,6 +50,9 @@ public class MinervaJobServiceTest extends TestUtils {
@Autowired
private IMiriamService miriamService;
+ @Autowired
+ private IDrugService drugService;
+
@Autowired
private GeneralCacheInterface cache;
@@ -136,11 +144,6 @@ public class MinervaJobServiceTest extends TestUtils {
@Test
public void testRefreshMiriamInfoTask() throws Exception {
- CacheQuery entry = cache.getByQuery(query, type);
- if (entry != null) {
- cache.delete(entry);
- }
-
MiriamData md = new MiriamData(MiriamType.PUBMED, "12345");
miriamService.add(md);
@@ -154,4 +157,42 @@ public class MinervaJobServiceTest extends TestUtils {
assertNotNull(md.getArticle());
assertNotNull(md.getLink());
}
+
+ @Test
+ public void testRefreshDrugInfoTask() throws Exception {
+
+ RefreshDrugInfoMinervaJob params = new RefreshDrugInfoMinervaJob(MiriamType.HGNC_SYMBOL, "SNCA");
+ MinervaJob job = new MinervaJob(MinervaJobType.REFRESH_DRUG_INFO, MinervaJobPriority.MEDIUM, params);
+
+ minervaJobService.addJob(job);
+ minervaJobService.waitForTasksToFinish();
+
+ assertEquals(0, getErrors().size());
+ }
+
+ @Test
+ public void testRefreshChemicalInfoTask() throws Exception {
+ MiriamData parkinsonDisease = new MiriamData(MiriamType.MESH_2012, "D010300");
+ MiriamData md = new MiriamData(MiriamType.HGNC_SYMBOL, "SNCA");
+
+ RefreshChemicalInfoMinervaJob params = new RefreshChemicalInfoMinervaJob(md, parkinsonDisease);
+ MinervaJob job = new MinervaJob(MinervaJobType.REFRESH_CHEMICAL_INFO, MinervaJobPriority.MEDIUM, params);
+
+ minervaJobService.addJob(job);
+ minervaJobService.waitForTasksToFinish();
+
+ assertEquals(0, getErrors().size());
+ }
+
+ @Test
+ public void testRefreshMirnaInfoTask() throws Exception {
+ RefreshMiRnaInfoMinervaJob params = new RefreshMiRnaInfoMinervaJob(MiriamType.HGNC_SYMBOL, "SNCA");
+ MinervaJob job = new MinervaJob(MinervaJobType.REFRESH_MI_RNA_INFO, MinervaJobPriority.MEDIUM, params);
+
+ minervaJobService.addJob(job);
+ minervaJobService.waitForTasksToFinish();
+
+ assertEquals(0, getErrors().size());
+ }
+
}
diff --git a/service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceNoTransactionTest.java b/service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceNoTransactionTest.java
index 9d562e56eb4afe551a5e12377842c7748d854b2e..00fd8b3faf2cde691e465631fea3fbf0aef013e7 100644
--- a/service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceNoTransactionTest.java
+++ b/service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceNoTransactionTest.java
@@ -527,7 +527,7 @@ public class ProjectServiceNoTransactionTest extends TestUtils {
ProjectService projectService = new ProjectService(null, mockProjectDao,
Mockito.mock(ProjectLogEntryDao.class),
- null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+ null, null, null, null, null, null, null, null, null, null, null, null, Mockito.mock(ProjectBackgroundService.class), null);
ReflectionTestUtils.setField(projectService, "self", projectService);
projectService.createImages(params);
diff --git a/web/pom.xml b/web/pom.xml
index 23dee6d29a1275c08e92d9ef04ff516acabb7685..bb9c1becabe3029bcb157cc01fbc18a34b177535 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</parent>
<artifactId>web</artifactId>
<packaging>jar</packaging>
@@ -36,19 +36,19 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>service</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>rest-api</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>frontend-js</artifactId>
- <version>17.0.6</version>
+ <version>17.1.0</version>
</dependency>
<dependency>
@@ -411,32 +411,6 @@
</dependencies>
</plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>
- ${project.build.outputDirectory}/docs
- </outputDirectory>
- <resources>
- <resource>
- <directory>
- ${project.build.directory}/generated-docs
- </directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
diff --git a/web/src/main/asciidoc/index.adoc b/web/src/main/asciidoc/index.adoc
index b5eb4d5e4ed806a989e53d46b6d9c6a72781d830..d238420c938968fd2fa4dc8318212b048334e556 100644
--- a/web/src/main/asciidoc/index.adoc
+++ b/web/src/main/asciidoc/index.adoc
@@ -44,6 +44,9 @@ Methods that allow to upload files into the system
=== <<genomics.adoc#,Genomics>>
Methods allowing to access genome data
+=== <<license.adoc#,License>>
+Methods allowing to access information about available licenses
+
=== <<mesh.adoc#,Mesh>>
Methods allowing to access info about mesh data
diff --git a/web/src/main/asciidoc/license.adoc b/web/src/main/asciidoc/license.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..f982996d489ab67d0c0c51336066815c1c815240
--- /dev/null
+++ b/web/src/main/asciidoc/license.adoc
@@ -0,0 +1,16 @@
+= Rest API Documentation - Licenses
+minerva
+v{project-version} {build-time}
+:toc: left
+:sectnums:
+
+== List all licenses
+=== CURL sample
+include::{snippets}/licenses/list/curl-request.adoc[]
+
+=== Response Fields
+include::{snippets}/licenses/list/response-fields.adoc[]
+
+=== Sample Response
+include::{snippets}/licenses/list/response-body.adoc[]
+
diff --git a/web/src/test/java/lcsb/mapviewer/web/AllIntegrationTests.java b/web/src/test/java/lcsb/mapviewer/web/AllIntegrationTests.java
index b1f7095eddf13633e96c71d77e23f03a62169e54..e1e6844eea54e3e74385e41e65bbd866a89e5c03 100644
--- a/web/src/test/java/lcsb/mapviewer/web/AllIntegrationTests.java
+++ b/web/src/test/java/lcsb/mapviewer/web/AllIntegrationTests.java
@@ -17,6 +17,7 @@ import lcsb.mapviewer.web.bean.utils.StartupBeanTest;
FileControllerIntegrationTest.class,
FunctionControllerIntegrationTest.class,
GenomicsControllerIntegrationTest.class,
+ LicenseControllerIntegrationTest.class,
MapControllerIntegrationTest.class,
MapControllerIntegrationTestWithGlyph.class,
MeshControllerIntegrationTest.class,
diff --git a/web/src/test/java/lcsb/mapviewer/web/ControllerIntegrationTest.java b/web/src/test/java/lcsb/mapviewer/web/ControllerIntegrationTest.java
index 70fda9fddb6cea533c541a909755a45dafcd109a..9ef85ba82dfcc5a35750165ad3ee407039e78a66 100644
--- a/web/src/test/java/lcsb/mapviewer/web/ControllerIntegrationTest.java
+++ b/web/src/test/java/lcsb/mapviewer/web/ControllerIntegrationTest.java
@@ -56,6 +56,7 @@ import lcsb.mapviewer.persist.dao.ProjectDao;
import lcsb.mapviewer.services.interfaces.ICommentService;
import lcsb.mapviewer.services.interfaces.IDataOverlayService;
import lcsb.mapviewer.services.interfaces.IFileService;
+import lcsb.mapviewer.services.interfaces.ILicenseService;
import lcsb.mapviewer.services.interfaces.IMinervaJobService;
import lcsb.mapviewer.services.interfaces.IProjectService;
import lcsb.mapviewer.services.interfaces.IUserService;
@@ -132,6 +133,9 @@ public abstract class ControllerIntegrationTest extends TestUtils {
@Autowired
private IUserService userService;
+ @Autowired
+ private ILicenseService licenseService;
+
@Autowired
private IProjectService projectService;
@@ -438,6 +442,8 @@ public abstract class ControllerIntegrationTest extends TestUtils {
background.setCreator(userService.getUserByLogin(BUILT_IN_TEST_ADMIN_LOGIN));
project.addProjectBackground(background);
+ project.setLicense(licenseService.getById(2));
+
projectService.add(project);
return project;
}
diff --git a/web/src/test/java/lcsb/mapviewer/web/LicenseControllerIntegrationTest.java b/web/src/test/java/lcsb/mapviewer/web/LicenseControllerIntegrationTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d2ec2f366aefe41e3429e0076bdc9836a9a54ab0
--- /dev/null
+++ b/web/src/test/java/lcsb/mapviewer/web/LicenseControllerIntegrationTest.java
@@ -0,0 +1,71 @@
+package lcsb.mapviewer.web;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.restdocs.payload.JsonFieldType;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.web.servlet.RequestBuilder;
+
+import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
+import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
+import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
+import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
+import static org.springframework.restdocs.payload.PayloadDocumentation.subsectionWithPath;
+import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
+import static org.springframework.restdocs.request.RequestDocumentation.requestParameters;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+public class LicenseControllerIntegrationTest extends ControllerIntegrationTest {
+
+ @Before
+ public void setup() {
+ }
+
+ @Test
+ public void testListLicenses() throws Exception {
+
+ final RequestBuilder request = get("/minerva/api/licenses/");
+
+ mockMvc.perform(request)
+ .andDo(document("licenses/list",
+ requestParameters(
+ parameterWithName("start").description("number of first entry in this response").optional(),
+ parameterWithName("sortColumn")
+ .description("entry column that should be used for sorting (default: pubmedId)").optional(),
+ parameterWithName("sortOrder").description("entry sort order (asc, desc)").optional(),
+ parameterWithName("length").description("number of entries we want to obtain").optional(),
+ parameterWithName("search").description("search query used for filtering").optional()),
+ responseFields(
+ fieldWithPath("data")
+ .description("list of licenses")
+ .type(JsonFieldType.ARRAY),
+ subsectionWithPath("data[].id")
+ .description("license name")
+ .ignored()
+ .type(JsonFieldType.NUMBER),
+ subsectionWithPath("data[].name")
+ .description("license name")
+ .type(JsonFieldType.STRING),
+ subsectionWithPath("data[].content")
+ .description("license text")
+ .type(JsonFieldType.STRING),
+ subsectionWithPath("data[].url")
+ .description("official license url")
+ .type(JsonFieldType.STRING),
+ fieldWithPath("filteredSize")
+ .description("number of entries that match filter criteria")
+ .type(JsonFieldType.NUMBER),
+ fieldWithPath("length")
+ .description("number of entries in this response")
+ .type(JsonFieldType.NUMBER),
+ fieldWithPath("page")
+ .description("page number of result list")
+ .type(JsonFieldType.NUMBER),
+ fieldWithPath("totalSize")
+ .description("number of all entries")
+ .type(JsonFieldType.NUMBER))))
+ .andExpect(status().is2xxSuccessful());
+ }
+}
diff --git a/web/src/test/java/lcsb/mapviewer/web/MapControllerIntegrationTestWithGlyph.java b/web/src/test/java/lcsb/mapviewer/web/MapControllerIntegrationTestWithGlyph.java
index a9920c48ba5d805a8a4b05ea8ec2a32f5b15ad4c..23ae3675e8b81b06396fefe19fb66770e1b3a44f 100644
--- a/web/src/test/java/lcsb/mapviewer/web/MapControllerIntegrationTestWithGlyph.java
+++ b/web/src/test/java/lcsb/mapviewer/web/MapControllerIntegrationTestWithGlyph.java
@@ -189,6 +189,8 @@ public class MapControllerIntegrationTestWithGlyph extends ControllerIntegration
+ projectSnippets.getParsers()),
parameterWithName("polygonString").description("polygon defining part of the model to be downloaded")
.optional(),
+ parameterWithName("strictCutoff").description("must the reactions be inside polygon (default: true)")
+ .optional(),
parameterWithName("elementIds").description("list of element ids that should be included in the output")
.optional(),
parameterWithName("reactionIds").description("list of reaction ids that should be included in the output")
@@ -201,14 +203,13 @@ public class MapControllerIntegrationTestWithGlyph extends ControllerIntegration
RequestBuilder request = get("/minerva/api/projects/{projectId}/models/{mapId}:downloadModel?"
+ "handlerClass=" + CellDesignerXmlParser.class.getCanonicalName()
- + "&polygonString=0,0;100,0;0,100", TEST_PROJECT, map.getId())
+ + "&polygonString=0,0;100,0;0,100&strictCutoff=false", TEST_PROJECT, map.getId())
.session(session);
mockMvc.perform(request)
.andDo(document("projects/project_maps/download_from_polygon",
downloadModelRequestParameters(),
- pathParameters(parameterWithName("projectId").description("project identifier"),
- parameterWithName("mapId").description("map identifier"))))
+ getMapPathParameters()))
.andExpect(status().is2xxSuccessful());
}
}
diff --git a/web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationForDocsTest.java b/web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationForDocsTest.java
index 8fcf48e9b6d111415f465ee99d88ecc56a8718af..54f225b98b662c2c24ce3b8a7d543cd3327d8ddb 100644
--- a/web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationForDocsTest.java
+++ b/web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationForDocsTest.java
@@ -1,18 +1,16 @@
package lcsb.mapviewer.web;
-import static org.junit.Assert.assertEquals;
-import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
-import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
-import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
-import static org.springframework.restdocs.request.RequestDocumentation.requestParameters;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
+import lcsb.mapviewer.converter.zip.ZipEntryFileDeserializer;
+import lcsb.mapviewer.model.Project;
+import lcsb.mapviewer.model.ProjectStatus;
+import lcsb.mapviewer.model.cache.UploadedFileEntry;
+import lcsb.mapviewer.model.graphics.MapCanvasType;
+import lcsb.mapviewer.model.map.model.SubmodelType;
+import lcsb.mapviewer.model.user.ConfigurationElementType;
+import lcsb.mapviewer.model.user.User;
+import lcsb.mapviewer.services.interfaces.IConfigurationService;
+import lcsb.mapviewer.services.interfaces.IProjectService;
+import lcsb.mapviewer.services.interfaces.IUserService;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
@@ -28,17 +26,19 @@ import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.web.servlet.RequestBuilder;
-import lcsb.mapviewer.converter.zip.ZipEntryFileDeserializer;
-import lcsb.mapviewer.model.Project;
-import lcsb.mapviewer.model.ProjectStatus;
-import lcsb.mapviewer.model.cache.UploadedFileEntry;
-import lcsb.mapviewer.model.graphics.MapCanvasType;
-import lcsb.mapviewer.model.map.model.SubmodelType;
-import lcsb.mapviewer.model.user.ConfigurationElementType;
-import lcsb.mapviewer.model.user.User;
-import lcsb.mapviewer.services.interfaces.IConfigurationService;
-import lcsb.mapviewer.services.interfaces.IProjectService;
-import lcsb.mapviewer.services.interfaces.IUserService;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
+import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
+import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
+import static org.springframework.restdocs.request.RequestDocumentation.requestParameters;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@RunWith(SpringJUnit4ClassRunner.class)
@ActiveProfiles("NumericDirectoryNameGeneratorProfile")
@@ -88,6 +88,8 @@ public class ProjectControllerIntegrationForDocsTest extends ControllerIntegrati
new BasicNameValuePair("version", "0.0.1"),
new BasicNameValuePair("notify-email", "minerva@uni.lu"),
new BasicNameValuePair("mapCanvasType", "OPEN_LAYERS"),
+ new BasicNameValuePair("custom-license-name", "my awesome license"),
+ new BasicNameValuePair("custom-license-url", "https://my.awesome.lincese.org/"),
new BasicNameValuePair("parser",
"lcsb.mapviewer.converter.model.celldesigner.CellDesignerXmlParser"),
@@ -154,6 +156,7 @@ public class ProjectControllerIntegrationForDocsTest extends ControllerIntegrati
new BasicNameValuePair("projectId", TEST_PROJECT),
new BasicNameValuePair("name", "New Disease Map"),
new BasicNameValuePair("file-id", String.valueOf(fileEntry.getId())),
+ new BasicNameValuePair("license-id", "1"),
new BasicNameValuePair("mapCanvasType", "OPEN_LAYERS"),
new BasicNameValuePair("cache", "false"),
new BasicNameValuePair("description", "this is my awesome project"),
@@ -164,6 +167,8 @@ public class ProjectControllerIntegrationForDocsTest extends ControllerIntegrati
new BasicNameValuePair("version", "0.0.1"),
new BasicNameValuePair("annotate", "false"),
new BasicNameValuePair("verify-annotations", "false"),
+ new BasicNameValuePair("custom-license-name", "my awesome license"),
+ new BasicNameValuePair("custom-license-url", "https://my.awesome.lincese.org/"),
new BasicNameValuePair("parser", "lcsb.mapviewer.converter.model.celldesigner.CellDesignerXmlParser"))));
RequestBuilder request = post("/minerva/api/projects/{projectId}/", TEST_PROJECT)
@@ -177,6 +182,7 @@ public class ProjectControllerIntegrationForDocsTest extends ControllerIntegrati
createProjectRequestSnippet(),
snippets.getProjectSnippet()));
+ assertNotNull(projectService.getProjectByProjectId(TEST_PROJECT).getLicense());
} finally {
waitForProjectToFinishLoading(TEST_PROJECT);
}
@@ -188,6 +194,15 @@ public class ProjectControllerIntegrationForDocsTest extends ControllerIntegrati
.description("project identifier"),
parameterWithName("file-id")
.description("identifier of the file that should be used to create project"),
+ parameterWithName("license-id")
+ .description("identifier of the license for project")
+ .optional(),
+ parameterWithName("custom-license-name")
+ .description("if custom licensing is used, it's a name of the license")
+ .optional(),
+ parameterWithName("custom-license-url")
+ .description("if custom licensing is used, it's an url of the license")
+ .optional(),
parameterWithName("parser")
.description("class of the parser that should be used for parsing the file. Available options: "
+ snippets.getParsers()),
diff --git a/web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationTest.java b/web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationTest.java
index b86c093aa985c4c8f39b75bdb07159c7b7ff6c22..c2d0ebab734331f14180555a8add7d353d147bd3 100644
--- a/web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationTest.java
+++ b/web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationTest.java
@@ -2,6 +2,7 @@ package lcsb.mapviewer.web;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
+import lcsb.mapviewer.common.Configuration;
import lcsb.mapviewer.common.MinervaConfigurationHolder;
import lcsb.mapviewer.model.Project;
import lcsb.mapviewer.model.ProjectStatus;
@@ -372,6 +373,7 @@ public class ProjectControllerIntegrationTest extends ControllerIntegrationTest
+ "\"notifyEmail\": \"notify@uni.lu\", "
+ "\"organism\": {\"type\": \"TAXONOMY\", \"resource\": \"9605\"}, "
+ "\"disease\": {\"type\": \"MESH_2012\", \"resource\": \"D010300\"}, "
+ + "\"license\": {\"id\": 1}, "
+ "\"mapCanvasType\": \"OPEN_LAYERS\" "
+ "}}";
@@ -392,6 +394,10 @@ public class ProjectControllerIntegrationTest extends ControllerIntegrationTest
.description("name of the project")
.type(JsonFieldType.STRING)
.optional(),
+ fieldWithPath("project.license.id")
+ .description("license id")
+ .type(JsonFieldType.NUMBER)
+ .optional(),
fieldWithPath("project.notifyEmail")
.description("email address that should be when something change in the project")
.type(JsonFieldType.STRING)
@@ -420,6 +426,32 @@ public class ProjectControllerIntegrationTest extends ControllerIntegrationTest
minervaJobService.waitForTasksToFinish();
assertNotNull(projectService.getProjectByProjectId(TEST_PROJECT).getOrganism().getLink());
assertNotNull(projectService.getProjectByProjectId(TEST_PROJECT).getDisease().getLink());
+ assertEquals(1, projectService.getProjectByProjectId(TEST_PROJECT).getLicense().getId());
+ }
+
+ @Test
+ public void testUpdateEmptyLicenseProject() throws Exception {
+ final MockHttpSession session = createSession(BUILT_IN_TEST_ADMIN_LOGIN, BUILT_IN_TEST_ADMIN_PASSWORD);
+ createAndPersistProject(TEST_PROJECT);
+
+ final String content = "{\"project\":{"
+ + "\"version\":\"xxx\", "
+ + "\"name\": \"new name\", "
+ + "\"notifyEmail\": \"notify@uni.lu\", "
+ + "\"organism\": {\"type\": \"TAXONOMY\", \"resource\": \"9605\"}, "
+ + "\"disease\": {\"type\": \"MESH_2012\", \"resource\": \"D010300\"}, "
+ + "\"license\": {} "
+ + "}}";
+
+ final RequestBuilder request = patch("/minerva/api/projects/{projectId}/", TEST_PROJECT)
+ .contentType(MediaType.APPLICATION_JSON)
+ .content(content)
+ .session(session);
+
+ mockMvc.perform(request)
+ .andExpect(status().is2xxSuccessful());
+
+ assertNull(projectService.getProjectByProjectId(TEST_PROJECT).getLicense());
}
@Test
@@ -732,6 +764,8 @@ public class ProjectControllerIntegrationTest extends ControllerIntegrationTest
new BasicNameValuePair("name", "Project name"),
new BasicNameValuePair("version", "0.0.1"),
new BasicNameValuePair("notify-email", "minerva@uni.lu"),
+ new BasicNameValuePair("custom-license-name", "my awesome license"),
+ new BasicNameValuePair("custom-license-url", "https://my.awesome.lincese.org/"),
new BasicNameValuePair("parser",
"lcsb.mapviewer.converter.model.celldesigner.CellDesignerXmlParser"))));
@@ -1414,6 +1448,30 @@ public class ProjectControllerIntegrationTest extends ControllerIntegrationTest
assertEquals(6, Files.list(Paths.get(projectHomeDir)).count());
}
+ @Test
+ public void testUpdateProjectOwner() throws Exception {
+ final MockHttpSession session = createSession(BUILT_IN_TEST_ADMIN_LOGIN, BUILT_IN_TEST_ADMIN_PASSWORD);
+
+ final String content = "{\"project\":{"
+ + "\"organism\": {\"type\": \"TAXONOMY\", \"resource\": \"9605\"}, "
+ + "\"disease\": {\"type\": \"MESH_2012\", \"resource\": \"D010300\"}, "
+ + "\"owner\":\"" + Configuration.ANONYMOUS_LOGIN + "\""
+ + "}}";
+
+ final RequestBuilder request = patch("/minerva/api/projects/{projectId}/", BUILT_IN_PROJECT)
+ .contentType(MediaType.APPLICATION_JSON)
+ .content(content)
+ .session(session);
+
+ mockMvc.perform(request)
+ .andExpect(status().is2xxSuccessful());
+
+ assertEquals(Configuration.ANONYMOUS_LOGIN, projectService.getProjectByProjectId(BUILT_IN_PROJECT).getOwner().getLogin());
+ for (final ProjectBackground background : projectService.getBackgrounds(BUILT_IN_PROJECT, true)) {
+ assertEquals(Configuration.ANONYMOUS_LOGIN, background.getCreator().getLogin());
+ }
+ }
+
@Test
public void testGetBackgroundsNoAccess() throws Exception {
createAndPersistProject(TEST_PROJECT);
diff --git a/web/src/test/java/lcsb/mapviewer/web/ProjectSnippets.java b/web/src/test/java/lcsb/mapviewer/web/ProjectSnippets.java
index 855edb3fc23be557a86747e2ce0fa93363d7dd4e..2c2bbf3956f84c4604e8d9d7490cdab521a8d144 100644
--- a/web/src/test/java/lcsb/mapviewer/web/ProjectSnippets.java
+++ b/web/src/test/java/lcsb/mapviewer/web/ProjectSnippets.java
@@ -1,23 +1,5 @@
package lcsb.mapviewer.web;
-import static org.mockito.Mockito.CALLS_REAL_METHODS;
-import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
-import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
-import static org.springframework.restdocs.payload.PayloadDocumentation.subsectionWithPath;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.lang3.StringUtils;
-import org.mockito.Mockito;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.restdocs.payload.JsonFieldType;
-import org.springframework.restdocs.payload.ResponseFieldsSnippet;
-import org.springframework.stereotype.Component;
-
import lcsb.mapviewer.common.Pair;
import lcsb.mapviewer.converter.Converter;
import lcsb.mapviewer.converter.graphics.AbstractImageGenerator;
@@ -26,6 +8,23 @@ import lcsb.mapviewer.model.ProjectStatus;
import lcsb.mapviewer.model.graphics.MapCanvasType;
import lcsb.mapviewer.model.map.species.Element;
import lcsb.mapviewer.modelutils.map.ElementUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.restdocs.payload.JsonFieldType;
+import org.springframework.restdocs.payload.ResponseFieldsSnippet;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.mockito.Mockito.CALLS_REAL_METHODS;
+import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
+import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
+import static org.springframework.restdocs.payload.PayloadDocumentation.subsectionWithPath;
@Component
public class ProjectSnippets {
@@ -99,6 +98,18 @@ public class ProjectSnippets {
fieldWithPath("logEntries")
.description("flag indicating that there are log entries attached to the project")
.type(JsonFieldType.BOOLEAN),
+ subsectionWithPath("license")
+ .description("license of this project")
+ .type("License")
+ .optional(),
+ fieldWithPath("customLicenseName")
+ .description(
+ "if license is not provided this is the custom license name provided by user")
+ .type(JsonFieldType.STRING),
+ fieldWithPath("customLicenseUrl")
+ .description(
+ "if license is not provided this is the custom license url provided by user")
+ .type(JsonFieldType.STRING),
subsectionWithPath("overviewImageViews")
.description("list of overview images")
.type("array<OverviewImage>")