From 8a9782cb1efd1b8e6c59c5ff86f9deeec83e1663 Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Mon, 14 Dec 2020 17:49:53 +0100
Subject: [PATCH 01/10] re-organising workflows and templates for
 staging/public instances of graphdb and elasticsearch

---
 .../workflows/repo-hi/NEW_publish_wf.xml.st   |  79 -------
 .../repo-hi/full_aggregation_wf.xml.st        | 198 ++++++++++++++++++
 .../{ => old}/enrich_graphdb_wf.xml.st        |   0
 .../repo-hi/{ => old}/index_on_es_wf.xml.st   |   0
 .../{ => old}/x3m_aggregation_wf.xml.st       |   0
 .../{ => old}/repo_hi_enrich_graphdb.xml      |   0
 .../{ => old}/repo_hi_index_on_es.xml         |   0
 .../publish/virtuoso_publish_template.xml     |  41 ----
 .../repo_hi_import_periodo_into_graphdb.xml   |   0
 .../repo_hi_main.xml}                         |   6 +-
 .../profiles/workflows/repo_bye_template.xml  |   1 +
 .../{ => templates}/collection_template.xml   |   0
 .../enrich_graphdb_template.xml               |   0
 .../{ => templates}/graphdb_template.xml      |   2 +-
 .../import_periodo_into_graphdb_template.xml  |   0
 .../{ => templates}/index_on_es_template.xml  |   2 +-
 .../{ => templates}/index_template.xml        |   0
 .../templates/public_publishing_template.xml  |  75 +++++++
 .../transform_x3m_template.xml                |   0
 19 files changed, 279 insertions(+), 125 deletions(-)
 delete mode 100644 dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/NEW_publish_wf.xml.st
 create mode 100644 dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/full_aggregation_wf.xml.st
 rename dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/{ => old}/enrich_graphdb_wf.xml.st (100%)
 rename dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/{ => old}/index_on_es_wf.xml.st (100%)
 rename dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/{ => old}/x3m_aggregation_wf.xml.st (100%)
 rename dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/{ => old}/repo_hi_enrich_graphdb.xml (100%)
 rename dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/{ => old}/repo_hi_index_on_es.xml (100%)
 delete mode 100644 dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/publish/virtuoso_publish_template.xml
 rename dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/{ => repo-hi}/repo_hi_import_periodo_into_graphdb.xml (100%)
 rename dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/{NEW_repo_hi_x3m.xml => repo-hi/repo_hi_main.xml} (94%)
 rename dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/{ => templates}/collection_template.xml (100%)
 rename dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/{ => templates}/enrich_graphdb_template.xml (100%)
 rename dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/{ => templates}/graphdb_template.xml (91%)
 rename dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/{ => templates}/import_periodo_into_graphdb_template.xml (100%)
 rename dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/{ => templates}/index_on_es_template.xml (92%)
 rename dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/{ => templates}/index_template.xml (100%)
 create mode 100644 dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml
 rename dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/{ => templates}/transform_x3m_template.xml (100%)

diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/NEW_publish_wf.xml.st b/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/NEW_publish_wf.xml.st
deleted file mode 100644
index 2747394..0000000
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/NEW_publish_wf.xml.st
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER value=""/>
-        <RESOURCE_TYPE value="WorkflowDSResourceType"/>
-        <RESOURCE_KIND value="WorkflowDSResources"/>
-        <RESOURCE_URI value=""/>
-        <DATE_OF_CREATION value=""/>
-    </HEADER>
-    <BODY>
-        <WORKFLOW_NAME>$name$</WORKFLOW_NAME>
-        <WORKFLOW_DESCRIPTION>$desc$</WORKFLOW_DESCRIPTION>
-        <WORKFLOW_INFO />
-        <WORKFLOW_FAMILY>publishing</WORKFLOW_FAMILY>
-        <WORKFLOW_PRIORITY>$priority$</WORKFLOW_PRIORITY>
-        <DATASOURCE id="$dsId$" interface="$interface$" />
-
-        <CONFIGURATION status="WAIT_SYS_SETTINGS" start="MANUAL">
-            <PARAMETERS>
-                <PARAM name="cleanMdstoreId"        description="Store for cleaned records"         required="true"     managedBy="system"  category="MDSTORE_ID"     />
-				<PARAM name="indexId"               description="Identifier of the Index"           required="true" managedBy="system"  category="INDEX_ID"/>
-            	<PARAM name="indexInterpretation"   description="Index Interpretation"              required="true" managedBy="system"  type="string">public</PARAM>
-            	<PARAM name="feedingType"           description="Index feeding type"                required="true" managedBy="user"    type="string"   function="validValues(['REFRESH','INCREMENTAL'])">REFRESH</PARAM>
-                <PARAM name="publisherEndpoint"     description="AriadnePlus Publisher Endpoint"      required="true" managedBy="user"    type="string">http://localhost:8080/ariadneplus/publish</PARAM>
-            </PARAMETERS>
-            <WORKFLOW>
-                <NODE name="virtuoso" type="LaunchWorkflowTemplate" isStart="true">
-                    <DESCRIPTION>Store RDF files in Virtuoso</DESCRIPTION>
-                    <PARAMETERS>
-                        <PARAM name="wfTemplateId" value="b7a6c826-6d5e-46c7-a553-4c0fc1d9ab72_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ==" />
-                        <PARAM name="wfTemplateParams">
-                            <MAP>
-                                <ENTRY key="publisherEndpoint"  ref="publisherEndpoint" />
-                                <ENTRY key="interface"          value="$interface$" />
-                                <ENTRY key="cleanMdstoreId"     ref="cleanMdstoreId" />
-                            </MAP>
-                        </PARAM>
-                    </PARAMETERS>
-                    <ARCS>
-                        <ARC to="success"/>
-                    </ARCS>
-                </NODE>
-                <!-- We do not want anymore the public index reading from Virtuoso -->
-                <!--
-                <NODE name="index" type="LaunchWorkflowTemplate">
-                    <DESCRIPTION>Index records</DESCRIPTION>
-                    <PARAMETERS>
-                        <PARAM name="wfTemplateId" value="9f1b9aab-d1d5-4ece-a04e-e1157eeb4a11_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ==" />
-                        <PARAM name="wfTemplateParams">
-                            <MAP>
-                                <ENTRY key="dsName"             value="$dsName$" />
-                                <ENTRY key="interface"          value="$interface$" />
-                                <ENTRY key="virtuosoReaderAPIUrl"     ref="virtuosoReaderAPIUrl" />
-                                <ENTRY key="indexId"            ref="indexId" />
-                                <ENTRY key="feedingType"        ref="feedingType" />
-                                <ENTRY key="interpretation"     ref="indexInterpretation" />
-                            </MAP>
-                        </PARAM>
-                    </PARAMETERS>
-                    <ARCS>
-                        <ARC to="success"/>
-                    </ARCS>
-                </NODE>
-                -->
-            </WORKFLOW>
-            <DESTROY_WORKFLOW_TEMPLATE id="23ef4bb3-2383-45b4-9661-ab03472fcd52_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ==">
-                <PARAMETERS/>
-            </DESTROY_WORKFLOW_TEMPLATE>
-        </CONFIGURATION>
-
-        <NOTIFICATIONS/>
-        
-        <SCHEDULING enabled="false">
-            <CRON>9 9 9 ? * *</CRON>
-            <MININTERVAL>10080</MININTERVAL>
-        </SCHEDULING>
-        <STATUS/>
-    </BODY>
-</RESOURCE_PROFILE>
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/full_aggregation_wf.xml.st b/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/full_aggregation_wf.xml.st
new file mode 100644
index 0000000..dcb4d41
--- /dev/null
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/full_aggregation_wf.xml.st
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RESOURCE_PROFILE>
+    <HEADER>
+        <RESOURCE_IDENTIFIER value=""/>
+        <RESOURCE_TYPE value="WorkflowDSResourceType"/>
+        <RESOURCE_KIND value="WorkflowDSResources"/>
+        <RESOURCE_URI value=""/>
+        <DATE_OF_CREATION value=""/>
+    </HEADER>
+    <BODY>
+        <WORKFLOW_NAME>$name$</WORKFLOW_NAME>
+        <WORKFLOW_DESCRIPTION>$desc$</WORKFLOW_DESCRIPTION>
+        <WORKFLOW_INFO />
+        <WORKFLOW_FAMILY>aggregator</WORKFLOW_FAMILY>
+        <WORKFLOW_PRIORITY>$priority$</WORKFLOW_PRIORITY>
+        <DATASOURCE id="$dsId$" interface="$interface$" />
+
+        <CONFIGURATION status="WAIT_SYS_SETTINGS" start="MANUAL">
+            <PARAMETERS>
+                <PARAM name="harvestingMode"        description="Incremental or refresh mode"       required="true" managedBy="user"    type="string"   function="validValues(['REFRESH','INCREMENTAL'])">INCREMENTAL</PARAM>
+                <PARAM name="collMdstoreId"         description="Store for collected records"       required="true" managedBy="system"  category="MDSTORE_ID"/>
+
+				<PARAM name="passFullRecord"        description="True to pass the full record to x3m" managedBy="user"    type="boolean">false</PARAM>
+                <PARAM name="transformationMode"    description="Incremental or refresh mode"       managedBy="user"    type="string"   function="validValues(['REFRESH','INCREMENTAL'])">REFRESH</PARAM>
+                <PARAM name="verboseTransformationLogging"  description="Enable verbose logging of X3M"     required="false"    managedBy="user"    type="boolean"/>
+				<PARAM name="mappingPolicyProfile"  description="Mapping policy to apply by X3M"    required="false"    managedBy="user"    category="TRANSFORMATION_RULE_ID"   type="string"   function="listProfiles('TransformationRuleDSResourceType', '//TITLE')"/>
+
+                <PARAM name="mappingUrl"            description="mapping url"                required="true" managedBy="user"    type="string"   ></PARAM>
+				<PARAM name="cleaningRuleId"                description="Cleaning rule"                     required="true"     managedBy="user"    category="CLEANER_RULE_ID"          type="string"   function="listProfiles('CleanerDSResourceType', '//CLEANER_NAME')"/>
+				<PARAM name="cleanMdstoreId"                description="Store for cleaned records"         required="true"     managedBy="system"  category="MDSTORE_ID"     />
+
+				<PARAM name="indexId"               description="Identifier of the Index for Content Checker"           required="true" managedBy="system"  category="INDEX_ID"/>
+            	<PARAM name="indexInterpretation"   description="Index Interpretation for Content Checker"              required="true" managedBy="system"  type="string">transformed</PARAM>
+            	<PARAM name="feedingType"           description="Index feeding type for Content Checker"                required="true" managedBy="user"    type="string"   function="validValues(['REFRESH','INCREMENTAL'])">REFRESH</PARAM>
+
+				<PARAM name="stagingPublisherEndpoint"      description="Staging Publisher Endpoint"      required="true" managedBy="user"    type="string">https://aggregator.ariadne.d4science.org/ariadneplus-graphdb</PARAM>
+                <PARAM name="publicPublisherEndpoint"       description="Public  Publisher Endpoint"      required="true" managedBy="user"    type="string">https://aggregator.ariadne.d4science.org/ariadneplus-graphdb-public</PARAM>
+                <PARAM name="sparqlUpdateQuery"     description="Sparql update query to enrich GraphDB content"      required="true" managedBy="user"    type="string"></PARAM>
+            </PARAMETERS>
+            <WORKFLOW>
+                <NODE isStart="true" name="collection" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Collect metadata</DESCRIPTION>
+                    <PARAMETERS>
+                    	<PARAM name="wfTemplateId" value="8536236a-7074-4155-9279-8cb2fcc8887a_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ==" />
+                    	<PARAM name="wfTemplateParams">
+                    		<MAP>
+                    		    <ENTRY key="format"         value="$format$" />
+                    			<ENTRY key="dsId"           value="$dsId$" />
+                    			<ENTRY key="dsName"         value="$dsName$" />
+ 								<ENTRY key="interface"      value="$interface$" />
+	 							<ENTRY key="collMdstoreId"  ref="collMdstoreId" />
+	 							<ENTRY key="harvestingMode" ref="harvestingMode" />
+                    		</MAP>
+                    	</PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="transform"/>
+                    </ARCS>
+                </NODE>
+                <NODE name="transform" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Transform records</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="bb36d5af-442c-488b-ad42-d9b068f6f1c0_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ==" />
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId"                           value="$dsId$" />
+                                <ENTRY key="interface"                      value="$interface$" />
+                                <ENTRY key="collMdstoreId"                  ref="collMdstoreId" />
+                                <ENTRY key="cleanMdstoreId"                 ref="cleanMdstoreId" />
+                                <ENTRY key="enableSchemaValidation"         ref="enableSchemaValidation"/>
+                                <ENTRY key="useDeclaredSchema"              ref="useDeclaredSchema"/>
+                                <ENTRY key="schemaURL"                      ref="schemaURL"/>
+                                <ENTRY key="mappingPolicyProfile"           ref="mappingPolicyProfile"/>
+                                <ENTRY key="verboseTransformationLogging"   ref="verboseTransformationLogging"/>
+                                <ENTRY key="cleaningRuleId"                 ref="cleaningRuleId"/>
+                                <ENTRY key="transformationMode"             ref="transformationMode" />
+                                <ENTRY key="passFullRecord"                 ref="passFullRecord" />
+                                <ENTRY key="mappingUrl"                 ref="mappingUrl" />
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="index"/>
+                    </ARCS>
+                </NODE>
+                <NODE name="index" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Index record</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="23e81407-da05-46a6-a11e-928f92432922_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ==" />
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId"               value="$dsId$" />
+                                <ENTRY key="interface"          value="$interface$" />
+                                <ENTRY key="cleanMdstoreId"     ref="cleanMdstoreId" />
+                                <ENTRY key="indexId"            ref="indexId" />
+                                <ENTRY key="feedingType"        ref="feedingType" />
+                                <ENTRY key="interpretation"     ref="indexInterpretation" />
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="publishToStagingGraphDB"/>
+                    </ARCS>
+                </NODE>
+                <NODE name="publishToStagingGraphDB" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Publish records to the Staging GraphDB</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="7426eaaf-93c9-4914-b69a-c9d5c478405a_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId"               value="$dsId$" />
+                                <ENTRY key="dsName"             value="$dsName$" />
+                                <ENTRY key="interface"          value="$interface$" />
+                                <ENTRY key="cleanMdstoreId"     ref="cleanMdstoreId"/>
+                                <ENTRY key="publisherEndpoint"  ref="stagingPublisherEndpoint" />
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="workflowDONE"/>
+                    </ARCS>
+                </NODE>
+                <NODE name="enrichStagingGraphDB" type="LaunchWorkflowTemplate" isStart="true">
+                     <DESCRIPTION>Enrich GraphDB with sparql update query</DESCRIPTION>
+                     <PARAMETERS>
+                         <PARAM name="wfTemplateId" value="f780a64d-bb00-4c9b-8393-f738846945f3_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                         <PARAM name="wfTemplateParams">
+                             <MAP>
+                                 <ENTRY key="dsId"               value="$dsId$" />
+                                 <ENTRY key="dsName"             value="$dsName$" />
+                                 <ENTRY key="interface"          value="$interface$" />
+                                 <ENTRY key="publisherEndpoint"  ref="stagingPublisherEndpoint" />
+                                 <ENTRY key="sparqlUpdateQuery"  ref="sparqlUpdateQuery" />
+                             </MAP>
+                         </PARAM>
+                     </PARAMETERS>
+                     <ARCS>
+                         <ARC to="indexOnStagingES"/>
+                     </ARCS>
+                </NODE>
+                <NODE name="indexOnStagingES" type="LaunchWorkflowTemplate" isStart="true">
+                    <DESCRIPTION>Index on Staging Elasticsearch all records of an API from GraphDB</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="3819eb3d-fdea-4fc3-925f-9ce0f61be9ee_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId"               value="$dsId$" />
+                                <ENTRY key="dsName"             value="$dsName$" />
+                                <ENTRY key="interface"          value="$interface$" />
+                                <ENTRY key="publisherEndpoint"  ref="stagingPublisherEndpoint" />
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="success"/>
+                    </ARCS>
+                </NODE>
+                <NODE name="publishToPublic" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Publish records to the public GraphDB and Elasticsearch</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="1fc9e0f9-1af0-43a3-a4a3-165b8f0086f0_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId"               value="$dsId$" />
+                                <ENTRY key="dsName"             value="$dsName$" />
+                                <ENTRY key="interface"          value="$interface$" />
+                                <ENTRY key="cleanMdstoreId"     ref="cleanMdstoreId"/>
+                                <ENTRY key="publisherEndpoint"  ref="publicPublisherEndpoint" />
+                                <ENTRY key="sparqlUpdateQuery"  ref="sparqlUpdateQuery" />
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="success"/>
+                    </ARCS>
+                </NODE>
+            </WORKFLOW>
+            <DESTROY_WORKFLOW_TEMPLATE id="b54ff264-ed25-46a5-86df-dfbefb0b22be_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ==">
+            	<PARAMETERS>
+	            	<PARAM name="dsId"                  value="$dsId$" />
+	            	<PARAM name="dsName"                value="$dsName$" />
+					<PARAM name="interface"             value="$interface$" />
+					<PARAM name="collMdstoreId"         ref="collMdstoreId" />
+					<PARAM name="cleanMdstoreId"        ref="cleanMdstoreId" />
+					<PARAM name="indexId"               ref="indexId" />
+				</PARAMETERS>
+            </DESTROY_WORKFLOW_TEMPLATE>
+        </CONFIGURATION>
+
+        <NOTIFICATIONS/>
+        
+        <SCHEDULING enabled="false">
+            <CRON>9 9 9 ? * *</CRON>
+            <MININTERVAL>10080</MININTERVAL>
+        </SCHEDULING>
+        <STATUS/>
+    </BODY>
+</RESOURCE_PROFILE>
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/enrich_graphdb_wf.xml.st b/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/old/enrich_graphdb_wf.xml.st
similarity index 100%
rename from dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/enrich_graphdb_wf.xml.st
rename to dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/old/enrich_graphdb_wf.xml.st
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/index_on_es_wf.xml.st b/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/old/index_on_es_wf.xml.st
similarity index 100%
rename from dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/index_on_es_wf.xml.st
rename to dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/old/index_on_es_wf.xml.st
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/x3m_aggregation_wf.xml.st b/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/old/x3m_aggregation_wf.xml.st
similarity index 100%
rename from dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/x3m_aggregation_wf.xml.st
rename to dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/old/x3m_aggregation_wf.xml.st
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo_hi_enrich_graphdb.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/old/repo_hi_enrich_graphdb.xml
similarity index 100%
rename from dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo_hi_enrich_graphdb.xml
rename to dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/old/repo_hi_enrich_graphdb.xml
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo_hi_index_on_es.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/old/repo_hi_index_on_es.xml
similarity index 100%
rename from dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo_hi_index_on_es.xml
rename to dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/old/repo_hi_index_on_es.xml
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/publish/virtuoso_publish_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/publish/virtuoso_publish_template.xml
deleted file mode 100644
index ab67154..0000000
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/publish/virtuoso_publish_template.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RESOURCE_PROFILE>
-	<HEADER>
-		<RESOURCE_IDENTIFIER value="b7a6c826-6d5e-46c7-a553-4c0fc1d9ab72_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
-		<RESOURCE_TYPE value="WorkflowTemplateDSResourceType"/>
-		<RESOURCE_KIND value="WorkflowTemplateDSResources"/>
-		<RESOURCE_URI value=""/>
-		<DATE_OF_CREATION value="2017-07-12T17:00:00.0Z"/>
-	</HEADER>
-	<BODY>
-		<CONFIGURATION>
-			<PARAMETERS>
-				<PARAM name="publisherEndpoint" description="Parthenos Publisher Endpoint" required="true" type="string"/>
-				<PARAM name="cleanMdstoreId" description="Store for transformed records" required="true" type="string"/>
-			</PARAMETERS>
-			<WORKFLOW>
-				<NODE name="fetchMdStore" type="FetchMDStoreRecords" isStart="true">
-					<DESCRIPTION>Fetch records from MDStore</DESCRIPTION>
-					<PARAMETERS>
-						<PARAM name="mdId" ref="cleanMdstoreId"/>
-						<PARAM name="eprParam" value="clean_epr"/>
-						<PARAM name="noCursorTimeout" value="true"/>
-					</PARAMETERS>
-					<ARCS>
-						<ARC to="publish"/>
-					</ARCS>
-				</NODE>
-				<NODE name="publish" type="PublishVirtuoso">
-					<DESCRIPTION>Feed records into Virtuoso</DESCRIPTION>
-					<PARAMETERS>
-						<PARAM name="inputEprParam" value="clean_epr"/>
-						<PARAM name="publisherEndpoint" ref="publisherEndpoint"/>
-					</PARAMETERS>
-					<ARCS>
-						<ARC to="success"/>
-					</ARCS>
-				</NODE>
-			</WORKFLOW>
-		</CONFIGURATION>
-	</BODY>
-</RESOURCE_PROFILE>
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo_hi_import_periodo_into_graphdb.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo-hi/repo_hi_import_periodo_into_graphdb.xml
similarity index 100%
rename from dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo_hi_import_periodo_into_graphdb.xml
rename to dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo-hi/repo_hi_import_periodo_into_graphdb.xml
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/NEW_repo_hi_x3m.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo-hi/repo_hi_main.xml
similarity index 94%
rename from dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/NEW_repo_hi_x3m.xml
rename to dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo-hi/repo_hi_main.xml
index 5bc901b..ad49b61 100644
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/NEW_repo_hi_x3m.xml
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo-hi/repo_hi_main.xml
@@ -40,9 +40,9 @@
 				<NODE name="registerAggregationWf" type="RegisterWorkflowFromTemplate">
 					<DESCRIPTION>Create Workflow</DESCRIPTION>
 					<PARAMETERS>
-						<PARAM name="wfName" value="Aggregate Metadata (X3M)"/>
-						<PARAM name="wfTemplate" value="/eu/dnetlib/ariadneplus/workflows/repo-hi/x3m_aggregation_wf.xml.st"/>
-						<PARAM name="description" value="Collect, transform with X3M, and export metadata"/>
+						<PARAM name="wfName" value="Aggregate, enrich and index AriadnePlus content"/>
+						<PARAM name="wfTemplate" value="/eu/dnetlib/ariadneplus/workflows/repo-hi/full_aggregation_wf.xml.st"/>
+						<PARAM name="description" value="Aggregate, enrich and index AriadnePlus content on shadow and public instance"/>
 					</PARAMETERS>
 					<ARCS>
 						<ARC to="createNative"/>
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo_bye_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo_bye_template.xml
index 391160f..4a3d493 100644
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo_bye_template.xml
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo_bye_template.xml
@@ -18,6 +18,7 @@
 				<PARAM name="indexId" description="Index Identifier" required="true" type="string"/>
 			</PARAMETERS>
 			<WORKFLOW>
+				<!--NOTE: does not remove data from ElasticSearch and GraphDB-->
 				<NODE name="deleteCollMdStore" type="DeleteMDStore" isStart="true">
 					<DESCRIPTION>Delete the mdstore of collected records</DESCRIPTION>
 					<PARAMETERS>
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/collection_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/collection_template.xml
similarity index 100%
rename from dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/collection_template.xml
rename to dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/collection_template.xml
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/enrich_graphdb_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/enrich_graphdb_template.xml
similarity index 100%
rename from dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/enrich_graphdb_template.xml
rename to dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/enrich_graphdb_template.xml
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/graphdb_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/graphdb_template.xml
similarity index 91%
rename from dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/graphdb_template.xml
rename to dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/graphdb_template.xml
index 1f1e054..4e2b2a8 100644
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/graphdb_template.xml
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/graphdb_template.xml
@@ -13,7 +13,7 @@
                 <PARAM description="Datasource Id" name="dsId" required="true" type="string"/>
                 <PARAM description="Datasource Interface" name="interface" required="true" type="string"/>
                 <PARAM description="Store for transformed records" name="cleanMdstoreId" required="true" type="string"/>
-                <PARAM name="publisherEndpoint"     description="AriadnePlus Publisher Endpoint"      required="true" type="string">http://localhost:8080/ariadneplus/publish</PARAM>
+                <PARAM name="stagingPublisherEndpoint" description="GraphDB Publisher Endpoint" required="true" type="string"/>
             </PARAMETERS>
             <WORKFLOW>
                 <NODE isStart="true" name="fetchMdStore" type="FetchMDStoreRecords">
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/import_periodo_into_graphdb_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/import_periodo_into_graphdb_template.xml
similarity index 100%
rename from dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/import_periodo_into_graphdb_template.xml
rename to dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/import_periodo_into_graphdb_template.xml
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/index_on_es_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/index_on_es_template.xml
similarity index 92%
rename from dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/index_on_es_template.xml
rename to dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/index_on_es_template.xml
index ef24ed1..e8af7a4 100644
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/index_on_es_template.xml
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/index_on_es_template.xml
@@ -12,7 +12,7 @@
                 <PARAM description="Datasource Name" name="dsName" required="true" type="string"/>
                 <PARAM description="Datasource Id" name="dsId" required="true" type="string"/>
                 <PARAM description="Datasource Interface" name="interface" required="true" type="string"/>
-                <PARAM description="AriadnePlus Publisher Endpoint" name="publisherEndpoint" required="true" type="string">http://localhost:8281/ariadneplus-graphdb</PARAM>
+                <PARAM description="AriadnePlus Publisher Endpoint" name="publisherEndpoint" required="true" type="string"/>
             </PARAMETERS>
             <WORKFLOW>
                 <NODE isStart="true" name="indexOnES" type="IndexOnES">
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/index_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/index_template.xml
similarity index 100%
rename from dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/index_template.xml
rename to dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/index_template.xml
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml
new file mode 100644
index 0000000..7f28a05
--- /dev/null
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml
@@ -0,0 +1,75 @@
+<RESOURCE_PROFILE>
+    <HEADER>
+        <RESOURCE_IDENTIFIER value="1fc9e0f9-1af0-43a3-a4a3-165b8f0086f0_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+        <RESOURCE_TYPE value="WorkflowTemplateDSResourceType"/>
+        <RESOURCE_KIND value="WorkflowTemplateDSResources"/>
+        <RESOURCE_URI value=""/>
+        <DATE_OF_CREATION value="2020-06-16T16:53:35+02:00"/>
+    </HEADER>
+    <BODY>
+        <CONFIGURATION>
+            <PARAMETERS>
+                <PARAM description="Datasource Name" name="dsName" required="true" type="string"/>
+                <PARAM description="Datasource Id" name="dsId" required="true" type="string"/>
+                <PARAM description="Datasource Interface" name="interface" required="true" type="string"/>
+                <PARAM description="Public Publisher Endpoint" name="publisherEndpoint" required="true" type="string"/>
+                <PARAM description="Sparql update query to enrich GraphDB content" name="sparqlUpdateQuery" required="true" type="string"/>
+            </PARAMETERS>
+            <WORKFLOW>
+                <NODE name="publishToPublicGraphDB" type="LaunchWorkflowTemplate" isStart="true">
+                    <DESCRIPTION>Publish records to the public GraphDB</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="7426eaaf-93c9-4914-b69a-c9d5c478405a_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId"               value="$dsId$" />
+                                <ENTRY key="dsName"             value="$dsName$" />
+                                <ENTRY key="interface"          value="$interface$" />
+                                <ENTRY key="cleanMdstoreId"     ref="cleanMdstoreId"/>
+                                <ENTRY key="publisherEndpoint"  ref="publisherEndpoint" />
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="enrichPublicGraphDB"/>
+                    </ARCS>
+                </NODE>
+                <NODE name="enrichPublicGraphDB" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Enrich public GraphDB with sparql update query</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="f780a64d-bb00-4c9b-8393-f738846945f3_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId"               value="$dsId$" />
+                                <ENTRY key="dsName"             value="$dsName$" />
+                                <ENTRY key="interface"          value="$interface$" />
+                                <ENTRY key="publisherEndpoint"  ref="publisherEndpoint" />
+                                <ENTRY key="sparqlUpdateQuery"  ref="sparqlUpdateQuery" />
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="indexOnPublicES"/>
+                    </ARCS>
+                </NODE>
+                <NODE name="indexOnPublicES" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Index on public Elasticsearch all records of an API from GraphDB</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="3819eb3d-fdea-4fc3-925f-9ce0f61be9ee_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId"               value="$dsId$" />
+                                <ENTRY key="dsName"             value="$dsName$" />
+                                <ENTRY key="interface"          value="$interface$" />
+                                <ENTRY key="publisherEndpoint"  ref="publisherEndpoint" />
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="success"/>
+                    </ARCS>
+                </NODE>
+            </WORKFLOW>
+        </CONFIGURATION>
+    </BODY>
+</RESOURCE_PROFILE>
\ No newline at end of file
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/transform_x3m_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/transform_x3m_template.xml
similarity index 100%
rename from dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/transform_x3m_template.xml
rename to dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/transform_x3m_template.xml

From be64ce5dcf165b2d6107152726ebf37bfa6ececf Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Mon, 14 Dec 2020 18:22:13 +0100
Subject: [PATCH 02/10] changed workflow name ad description

---
 .../bootstrap/profiles/workflows/repo-hi/repo_hi_main.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo-hi/repo_hi_main.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo-hi/repo_hi_main.xml
index ad49b61..c903e38 100644
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo-hi/repo_hi_main.xml
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/repo-hi/repo_hi_main.xml
@@ -8,8 +8,8 @@
 		<DATE_OF_CREATION value="2018-02-12T12:00:00.0Z"/>
 	</HEADER>
 	<BODY>
-		<WORKFLOW_NAME>Aggregate Metadata (X3M)</WORKFLOW_NAME>
-		<WORKFLOW_DESCRIPTION>Collect, transform with X3M, and export metadata</WORKFLOW_DESCRIPTION>
+		<WORKFLOW_NAME>Aggregate and Publish Metadata</WORKFLOW_NAME>
+		<WORKFLOW_DESCRIPTION>Aggregate, enrich and publish metadata</WORKFLOW_DESCRIPTION>
 		<WORKFLOW_INFO>
 			<FIELD name="Action">Aggregate Metadata</FIELD>
 			<FIELD name="Datasource class">Content Provider</FIELD>

From 687d5ab9ecc58e8db9d6ef0d54c30e4c55b49987 Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Mon, 14 Dec 2020 18:27:23 +0100
Subject: [PATCH 03/10] only one start node

---
 .../ariadneplus/workflows/repo-hi/full_aggregation_wf.xml.st  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/full_aggregation_wf.xml.st b/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/full_aggregation_wf.xml.st
index dcb4d41..b409e64 100644
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/full_aggregation_wf.xml.st
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/full_aggregation_wf.xml.st
@@ -120,7 +120,7 @@
                         <ARC to="workflowDONE"/>
                     </ARCS>
                 </NODE>
-                <NODE name="enrichStagingGraphDB" type="LaunchWorkflowTemplate" isStart="true">
+                <NODE name="enrichStagingGraphDB" type="LaunchWorkflowTemplate">
                      <DESCRIPTION>Enrich GraphDB with sparql update query</DESCRIPTION>
                      <PARAMETERS>
                          <PARAM name="wfTemplateId" value="f780a64d-bb00-4c9b-8393-f738846945f3_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
@@ -138,7 +138,7 @@
                          <ARC to="indexOnStagingES"/>
                      </ARCS>
                 </NODE>
-                <NODE name="indexOnStagingES" type="LaunchWorkflowTemplate" isStart="true">
+                <NODE name="indexOnStagingES" type="LaunchWorkflowTemplate">
                     <DESCRIPTION>Index on Staging Elasticsearch all records of an API from GraphDB</DESCRIPTION>
                     <PARAMETERS>
                         <PARAM name="wfTemplateId" value="3819eb3d-fdea-4fc3-925f-9ce0f61be9ee_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>

From 4edfc4af05add838e564c2567aabecca23615c21 Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Mon, 14 Dec 2020 18:56:49 +0100
Subject: [PATCH 04/10] new_agg_wf.xml annotated with comments to guide the
 (manual) migration of old workflows to the new one

---
 .../eu/dnetlib/wf_migration/new_agg_wf.xml    | 195 ++++++++++++++++++
 .../eu/dnetlib/wf_migration/old_agg_wf.xml    | 139 +++++++++++++
 2 files changed, 334 insertions(+)
 create mode 100644 dnet-ariadneplus/src/test/resources/eu/dnetlib/wf_migration/new_agg_wf.xml
 create mode 100644 dnet-ariadneplus/src/test/resources/eu/dnetlib/wf_migration/old_agg_wf.xml

diff --git a/dnet-ariadneplus/src/test/resources/eu/dnetlib/wf_migration/new_agg_wf.xml b/dnet-ariadneplus/src/test/resources/eu/dnetlib/wf_migration/new_agg_wf.xml
new file mode 100644
index 0000000..e899548
--- /dev/null
+++ b/dnet-ariadneplus/src/test/resources/eu/dnetlib/wf_migration/new_agg_wf.xml
@@ -0,0 +1,195 @@
+<RESOURCE_PROFILE>
+    <HEADER>
+        <RESOURCE_IDENTIFIER value="6c51cbe5-edcf-46f1-ba78-bbd8ea3a9929_V29ya2Zsb3dEU1Jlc291cmNlcy9Xb3JrZmxvd0RTUmVzb3VyY2VUeXBl"/>
+        <RESOURCE_TYPE value="WorkflowDSResourceType"/>
+        <RESOURCE_KIND value="WorkflowDSResources"/>
+        <RESOURCE_URI value=""/>
+        <DATE_OF_CREATION value="2020-12-14T18:49:59+01:00"/>
+    </HEADER>
+    <BODY>
+        <!-- CHANGED WF NAME -->
+        <WORKFLOW_NAME>Aggregate, enrich and index AriadnePlus content</WORKFLOW_NAME>
+        <!-- CHANGED WF DESCRIPTION -->
+        <WORKFLOW_DESCRIPTION>Aggregate, enrich and index AriadnePlus content on shadow and public instance</WORKFLOW_DESCRIPTION>
+        <WORKFLOW_INFO/>
+        <WORKFLOW_FAMILY>aggregator</WORKFLOW_FAMILY>
+        <WORKFLOW_PRIORITY>50</WORKFLOW_PRIORITY>
+        <DATASOURCE id="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU=" interface="api_________::ariadne_plus::ads::273"/>
+        <CONFIGURATION start="MANUAL" status="WAIT_USER_SETTINGS">
+            <PARAMETERS>
+                <PARAM description="Incremental or refresh mode" function="validValues(['REFRESH','INCREMENTAL'])" managedBy="user" name="harvestingMode" required="true" type="string">INCREMENTAL</PARAM>
+                <PARAM category="MDSTORE_ID" description="Store for collected records" managedBy="system" name="collMdstoreId" required="true">36aadfcc-648b-43f7-96f3-b4ae612b3fa4_TURTdG9yZURTUmVzb3VyY2VzL01EU3RvcmVEU1Jlc291cmNlVHlwZQ==</PARAM>
+                <PARAM description="True to pass the full record to x3m" managedBy="user" name="passFullRecord" type="boolean">false</PARAM>
+                <PARAM description="Incremental or refresh mode" function="validValues(['REFRESH','INCREMENTAL'])" managedBy="user" name="transformationMode" type="string">REFRESH</PARAM>
+                <PARAM description="Enable verbose logging of X3M" managedBy="user" name="verboseTransformationLogging" required="false" type="boolean"/>
+                <PARAM category="TRANSFORMATION_RULE_ID" description="Mapping policy to apply by X3M" function="listProfiles('TransformationRuleDSResourceType', '//TITLE')" managedBy="user" name="mappingPolicyProfile" required="false" type="string"/>
+                <PARAM description="mapping url" managedBy="user" name="mappingUrl" required="true" type="string"/>
+                <PARAM category="CLEANER_RULE_ID" description="Cleaning rule" function="listProfiles('CleanerDSResourceType', '//CLEANER_NAME')" managedBy="user" name="cleaningRuleId" required="true" type="string"/>
+                <PARAM category="MDSTORE_ID" description="Store for cleaned records" managedBy="system" name="cleanMdstoreId" required="true">971d3cf8-b720-4f29-a16d-f4453c962343_TURTdG9yZURTUmVzb3VyY2VzL01EU3RvcmVEU1Jlc291cmNlVHlwZQ==</PARAM>
+                <PARAM category="INDEX_ID" description="Identifier of the Index for Content Checker" managedBy="system" name="indexId" required="true">null</PARAM>
+                <PARAM description="Index Interpretation for Content Checker" managedBy="system" name="indexInterpretation" required="true" type="string">transformed</PARAM>
+                <PARAM description="Index feeding type for Content Checker" function="validValues(['REFRESH','INCREMENTAL'])" managedBy="user" name="feedingType" required="true" type="string">REFRESH</PARAM>
+               <!-- ADD THESE IN PLACE OF 'publisherEndpoint' -->
+                <PARAM description="Staging Publisher Endpoint" managedBy="user" name="stagingPublisherEndpoint" required="true" type="string">https://aggregator.ariadne.d4science.org/ariadneplus-graphdb</PARAM>
+                <PARAM description="Public  Publisher Endpoint" managedBy="user" name="publicPublisherEndpoint" required="true" type="string">https://aggregator.ariadne.d4science.org/ariadneplus-graphdb-public</PARAM>
+                <PARAM description="Sparql update query to enrich GraphDB content" managedBy="user" name="sparqlUpdateQuery" required="true" type="string"/>
+            </PARAMETERS>
+            <WORKFLOW>
+                <NODE isStart="true" name="collection" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Collect metadata</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="8536236a-7074-4155-9279-8cb2fcc8887a_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="format" value=""/>
+                                <ENTRY key="dsId" value="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU="/>
+                                <ENTRY key="dsName" value="Archaeology Data Service"/>
+                                <ENTRY key="interface" value="api_________::ariadne_plus::ads::273"/>
+                                <ENTRY key="collMdstoreId" ref="collMdstoreId"/>
+                                <ENTRY key="harvestingMode" ref="harvestingMode"/>
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="transform"/>
+                    </ARCS>
+                </NODE>
+                <NODE name="transform" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Transform records</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="bb36d5af-442c-488b-ad42-d9b068f6f1c0_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId" value="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU="/>
+                                <ENTRY key="interface" value="api_________::ariadne_plus::ads::273"/>
+                                <ENTRY key="collMdstoreId" ref="collMdstoreId"/>
+                                <ENTRY key="cleanMdstoreId" ref="cleanMdstoreId"/>
+                                <ENTRY key="enableSchemaValidation" ref="enableSchemaValidation"/>
+                                <ENTRY key="useDeclaredSchema" ref="useDeclaredSchema"/>
+                                <ENTRY key="schemaURL" ref="schemaURL"/>
+                                <ENTRY key="mappingPolicyProfile" ref="mappingPolicyProfile"/>
+                                <ENTRY key="verboseTransformationLogging" ref="verboseTransformationLogging"/>
+                                <ENTRY key="cleaningRuleId" ref="cleaningRuleId"/>
+                                <ENTRY key="transformationMode" ref="transformationMode"/>
+                                <ENTRY key="passFullRecord" ref="passFullRecord"/>
+                                <ENTRY key="mappingUrl" ref="mappingUrl"/>
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="index"/>
+                    </ARCS>
+                </NODE>
+                <NODE name="index" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Index record</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="23e81407-da05-46a6-a11e-928f92432922_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId" value="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU="/>
+                                <ENTRY key="interface" value="api_________::ariadne_plus::ads::273"/>
+                                <ENTRY key="cleanMdstoreId" ref="cleanMdstoreId"/>
+                                <ENTRY key="indexId" ref="indexId"/>
+                                <ENTRY key="feedingType" ref="feedingType"/>
+                                <ENTRY key="interpretation" ref="indexInterpretation"/>
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <!-- CHANGE FROM publishToDBGraph -->
+                        <ARC to="publishToStagingGraphDB"/>
+                    </ARCS>
+                </NODE>
+                <!-- CHANGE FROM publishToDBGraph, from here until the end of the workflow -->
+                <NODE name="publishToStagingGraphDB" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Publish records to the Staging GraphDB</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="7426eaaf-93c9-4914-b69a-c9d5c478405a_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId" value="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU="/>
+                                <ENTRY key="dsName" value="Archaeology Data Service"/>
+                                <ENTRY key="interface" value="api_________::ariadne_plus::ads::273"/>
+                                <ENTRY key="cleanMdstoreId" ref="cleanMdstoreId"/>
+                                <ENTRY key="publisherEndpoint" ref="stagingPublisherEndpoint"/>
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="workflowDONE"/>
+                    </ARCS>
+                </NODE>
+                <NODE isStart="true" name="enrichStagingGraphDB" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Enrich GraphDB with sparql update query</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="f780a64d-bb00-4c9b-8393-f738846945f3_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId" value="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU="/>
+                                <ENTRY key="dsName" value="Archaeology Data Service"/>
+                                <ENTRY key="interface" value="api_________::ariadne_plus::ads::273"/>
+                                <ENTRY key="publisherEndpoint" ref="stagingPublisherEndpoint"/>
+                                <ENTRY key="sparqlUpdateQuery" ref="sparqlUpdateQuery"/>
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="indexOnStagingES"/>
+                    </ARCS>
+                </NODE>
+                <NODE isStart="true" name="indexOnStagingES" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Index on Staging Elasticsearch all records of an API from GraphDB</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="3819eb3d-fdea-4fc3-925f-9ce0f61be9ee_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId" value="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU="/>
+                                <ENTRY key="dsName" value="Archaeology Data Service"/>
+                                <ENTRY key="interface" value="api_________::ariadne_plus::ads::273"/>
+                                <ENTRY key="publisherEndpoint" ref="stagingPublisherEndpoint"/>
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="success"/>
+                    </ARCS>
+                </NODE>
+                <NODE name="publishToPublic" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Publish records to the public GraphDB and Elasticsearch</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="1fc9e0f9-1af0-43a3-a4a3-165b8f0086f0_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId" value="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU="/>
+                                <ENTRY key="dsName" value="Archaeology Data Service"/>
+                                <ENTRY key="interface" value="api_________::ariadne_plus::ads::273"/>
+                                <ENTRY key="cleanMdstoreId" ref="cleanMdstoreId"/>
+                                <ENTRY key="publisherEndpoint" ref="publicPublisherEndpoint"/>
+                                <ENTRY key="sparqlUpdateQuery" ref="sparqlUpdateQuery"/>
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="success"/>
+                    </ARCS>
+                </NODE>
+            </WORKFLOW>
+            <DESTROY_WORKFLOW_TEMPLATE id="b54ff264-ed25-46a5-86df-dfbefb0b22be_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ==">
+                <PARAMETERS>
+                    <PARAM name="dsId" value="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU="/>
+                    <PARAM name="dsName" value="Archaeology Data Service"/>
+                    <PARAM name="interface" value="api_________::ariadne_plus::ads::273"/>
+                    <PARAM name="collMdstoreId" ref="collMdstoreId"/>
+                    <PARAM name="cleanMdstoreId" ref="cleanMdstoreId"/>
+                    <PARAM name="indexId" ref="indexId"/>
+                </PARAMETERS>
+            </DESTROY_WORKFLOW_TEMPLATE>
+        </CONFIGURATION>
+        <NOTIFICATIONS/>
+        <SCHEDULING enabled="false">
+            <CRON>9 9 9 ? * *</CRON>
+            <MININTERVAL>10080</MININTERVAL>
+        </SCHEDULING>
+        <STATUS/>
+    </BODY>
+</RESOURCE_PROFILE>
\ No newline at end of file
diff --git a/dnet-ariadneplus/src/test/resources/eu/dnetlib/wf_migration/old_agg_wf.xml b/dnet-ariadneplus/src/test/resources/eu/dnetlib/wf_migration/old_agg_wf.xml
new file mode 100644
index 0000000..a41b9c9
--- /dev/null
+++ b/dnet-ariadneplus/src/test/resources/eu/dnetlib/wf_migration/old_agg_wf.xml
@@ -0,0 +1,139 @@
+<RESOURCE_PROFILE>
+    <HEADER>
+        <RESOURCE_IDENTIFIER value="ba8aacd4-41f0-4e21-8267-a306f9044d46_V29ya2Zsb3dEU1Jlc291cmNlcy9Xb3JrZmxvd0RTUmVzb3VyY2VUeXBl"/>
+        <RESOURCE_TYPE value="WorkflowDSResourceType"/>
+        <RESOURCE_KIND value="WorkflowDSResources"/>
+        <RESOURCE_URI value=""/>
+        <DATE_OF_CREATION value="2020-07-21T18:21:14+02:00"/>
+    </HEADER>
+    <BODY>
+        <WORKFLOW_NAME>Aggregate Metadata (X3M)</WORKFLOW_NAME>
+        <WORKFLOW_DESCRIPTION>Collect, transform with X3M, and export metadata</WORKFLOW_DESCRIPTION>
+        <WORKFLOW_INFO/>
+        <WORKFLOW_FAMILY>aggregator</WORKFLOW_FAMILY>
+        <WORKFLOW_PRIORITY>50</WORKFLOW_PRIORITY>
+        <DATASOURCE id="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU=" interface="api_________::ariadne_plus::ads::273"/>
+        <CONFIGURATION start="MANUAL" status="EXECUTABLE">
+            <PARAMETERS>
+                <PARAM description="Incremental or refresh mode" function="validValues(['REFRESH','INCREMENTAL'])" managedBy="user" name="harvestingMode" required="true" type="string">REFRESH</PARAM>
+                <PARAM category="MDSTORE_ID" description="Store for collected records" managedBy="system" name="collMdstoreId" required="true">6f7c21a0-a7be-4724-be89-833b33ad5e0a_TURTdG9yZURTUmVzb3VyY2VzL01EU3RvcmVEU1Jlc291cmNlVHlwZQ==</PARAM>
+                <PARAM description="True to pass the full record to x3m" managedBy="user" name="passFullRecord" type="boolean">false</PARAM>
+                <PARAM description="Incremental or refresh mode" function="validValues(['REFRESH','INCREMENTAL'])" managedBy="user" name="transformationMode" type="string">REFRESH</PARAM>
+                <PARAM description="Enable verbose logging of X3M" managedBy="user" name="verboseTransformationLogging" required="false" type="boolean">false</PARAM>
+                <PARAM category="TRANSFORMATION_RULE_ID" description="Mapping policy to apply by X3M" function="listProfiles('TransformationRuleDSResourceType', '//TITLE')" managedBy="user" name="mappingPolicyProfile" required="false" type="string">e1a85324-8f54-45c1-8513-208693a41666_VHJhbnNmb3JtYXRpb25SdWxlRFNSZXNvdXJjZXMvVHJhbnNmb3JtYXRpb25SdWxlRFNSZXNvdXJjZVR5cGU=</PARAM>
+                <PARAM category="CLEANER_RULE_ID" description="Cleaning rule" function="listProfiles('CleanerDSResourceType', '//CLEANER_NAME')" managedBy="user" name="cleaningRuleId" required="true" type="string">e508ddc7-ff5e-45dc-9116-96a2201d0bc9_Q2xlYW5lckRTUmVzb3VyY2VzL0NsZWFuZXJEU1Jlc291cmNlVHlwZQ==</PARAM>
+                <PARAM category="MDSTORE_ID" description="Store for cleaned records" managedBy="system" name="cleanMdstoreId" required="true">af07e923-424b-4d5e-9677-66582db7efdd_TURTdG9yZURTUmVzb3VyY2VzL01EU3RvcmVEU1Jlc291cmNlVHlwZQ==</PARAM>
+                <PARAM category="INDEX_ID" description="Identifier of the Index" managedBy="system" name="indexId" required="true">84c5cd33-b152-4fae-8796-fea0685a6c83_SW5kZXhEU1Jlc291cmNlcy9JbmRleERTUmVzb3VyY2VUeXBl</PARAM>
+                <PARAM description="Index Interpretation" managedBy="system" name="indexInterpretation" required="true" type="string">transformed</PARAM>
+                <PARAM description="Index feeding type" function="validValues(['REFRESH','INCREMENTAL'])" managedBy="user" name="feedingType" required="true" type="string">REFRESH</PARAM>
+                <PARAM description="mapping url" managedBy="user" name="mappingUrl" required="true" type="string">https://mapping.d4science.org/3MEditor/Services?id=591&amp;output=text/xml&amp;method=export</PARAM>
+                <PARAM description="AriadnePlus Publisher Endpoint" managedBy="user" name="publisherEndpoint" required="true" type="string">https://aggregator.ariadne.d4science.org/ariadneplus-graphdb</PARAM>
+            </PARAMETERS>
+            <WORKFLOW>
+                <NODE isStart="true" name="collection" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Collect metadata</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="8536236a-7074-4155-9279-8cb2fcc8887a_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="format" value=""/>
+                                <ENTRY key="dsId" value="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU="/>
+                                <ENTRY key="dsName" value="Archaeology Data Service"/>
+                                <ENTRY key="interface" value="api_________::ariadne_plus::ads::273"/>
+                                <ENTRY key="collMdstoreId" ref="collMdstoreId"/>
+                                <ENTRY key="harvestingMode" ref="harvestingMode"/>
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="transform"/>
+                    </ARCS>
+                </NODE>
+                <NODE name="transform" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Transform records</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="bb36d5af-442c-488b-ad42-d9b068f6f1c0_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId" value="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU="/>
+                                <ENTRY key="interface" value="api_________::ariadne_plus::ads::273"/>
+                                <ENTRY key="collMdstoreId" ref="collMdstoreId"/>
+                                <ENTRY key="cleanMdstoreId" ref="cleanMdstoreId"/>
+                                <ENTRY key="enableSchemaValidation" ref="enableSchemaValidation"/>
+                                <ENTRY key="useDeclaredSchema" ref="useDeclaredSchema"/>
+                                <ENTRY key="schemaURL" ref="schemaURL"/>
+                                <ENTRY key="mappingPolicyProfile" ref="mappingPolicyProfile"/>
+                                <ENTRY key="verboseTransformationLogging" ref="verboseTransformationLogging"/>
+                                <ENTRY key="cleaningRuleId" ref="cleaningRuleId"/>
+                                <ENTRY key="transformationMode" ref="transformationMode"/>
+                                <ENTRY key="passFullRecord" ref="passFullRecord"/>
+                                <ENTRY key="mappingUrl" ref="mappingUrl"/>
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="index"/>
+                    </ARCS>
+                </NODE>
+                <NODE name="index" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Index record</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="23e81407-da05-46a6-a11e-928f92432922_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId" value="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU="/>
+                                <ENTRY key="interface" value="api_________::ariadne_plus::ads::273"/>
+                                <ENTRY key="cleanMdstoreId" ref="cleanMdstoreId"/>
+                                <ENTRY key="indexId" ref="indexId"/>
+                                <ENTRY key="feedingType" ref="feedingType"/>
+                                <ENTRY key="interpretation" ref="indexInterpretation"/>
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="publishToGraphDB"/>
+                    </ARCS>
+                </NODE>
+                <NODE name="publishToGraphDB" type="LaunchWorkflowTemplate">
+                    <DESCRIPTION>Publish records to GraphDB</DESCRIPTION>
+                    <PARAMETERS>
+                        <PARAM name="wfTemplateId" value="7426eaaf-93c9-4914-b69a-c9d5c478405a_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
+                        <PARAM name="wfTemplateParams">
+                            <MAP>
+                                <ENTRY key="dsId" value="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU="/>
+                                <ENTRY key="dsName" value="Archaeology Data Service"/>
+                                <ENTRY key="interface" value="api_________::ariadne_plus::ads::273"/>
+                                <ENTRY key="cleanMdstoreId" ref="cleanMdstoreId"/>
+                                <ENTRY key="publisherEndpoint" ref="publisherEndpoint"/>
+                            </MAP>
+                        </PARAM>
+                    </PARAMETERS>
+                    <ARCS>
+                        <ARC to="success"/>
+                    </ARCS>
+                </NODE>
+            </WORKFLOW>
+            <DESTROY_WORKFLOW_TEMPLATE id="b54ff264-ed25-46a5-86df-dfbefb0b22be_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ==">
+                <PARAMETERS>
+                    <PARAM name="dsId" value="d52b32f0-2b19-4bef-930d-470ef044def5_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU="/>
+                    <PARAM name="dsName" value="Archaeology Data Service"/>
+                    <PARAM name="interface" value="api_________::ariadne_plus::ads::273"/>
+                    <PARAM name="collMdstoreId" ref="collMdstoreId"/>
+                    <PARAM name="cleanMdstoreId" ref="cleanMdstoreId"/>
+                    <PARAM name="indexId" ref="indexId"/>
+                </PARAMETERS>
+            </DESTROY_WORKFLOW_TEMPLATE>
+        </CONFIGURATION>
+        <NOTIFICATIONS/>
+        <SCHEDULING enabled="false">
+            <CRON>9 9 9 ? * *</CRON>
+            <MININTERVAL>10080</MININTERVAL>
+        </SCHEDULING>
+        <STATUS>
+            <LAST_EXECUTION_ID>wf_20200605_160619_405</LAST_EXECUTION_ID>
+            <LAST_EXECUTION_DATE>2020-06-05T16:07:19+02:00</LAST_EXECUTION_DATE>
+            <LAST_EXECUTION_STATUS>SUCCESS</LAST_EXECUTION_STATUS>
+            <LAST_EXECUTION_ERROR/>
+        </STATUS>
+    </BODY>
+</RESOURCE_PROFILE>
\ No newline at end of file

From 3e28f8fd57c2cf523a8544a2669c4f1d6e629778 Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Mon, 14 Dec 2020 18:57:36 +0100
Subject: [PATCH 05/10] increasing mid version number

---
 dnet-ariadneplus/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dnet-ariadneplus/pom.xml b/dnet-ariadneplus/pom.xml
index 3ba99bd..3abf3a6 100644
--- a/dnet-ariadneplus/pom.xml
+++ b/dnet-ariadneplus/pom.xml
@@ -10,9 +10,9 @@
 	<groupId>eu.dnetlib</groupId>
 	<artifactId>dnet-ariadneplus</artifactId>
 	<packaging>jar</packaging>
-	<version>1.0.3-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<scm>
-		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet50/modules/dnet-ariadneplus/trunk</developerConnection>
+		<developerConnection>scm:git:https://code-repo.d4science.org/D-Net/AriadnePlus.git</developerConnection>
 	</scm>
 	<dependencies>
 		<dependency>

From fa3592b1b386bea51b752fe576e5b08b5e5ff509 Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Tue, 15 Dec 2020 17:06:52 +0100
Subject: [PATCH 06/10] added missing wf node

---
 .../workflows/repo-hi/full_aggregation_wf.xml.st           | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/full_aggregation_wf.xml.st b/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/full_aggregation_wf.xml.st
index b409e64..752194a 100644
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/full_aggregation_wf.xml.st
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/full_aggregation_wf.xml.st
@@ -174,6 +174,13 @@
                         <ARC to="success"/>
                     </ARCS>
                 </NODE>
+                <NODE name="workflowDONE">
+                    <DESCRIPTION>A Fake node</DESCRIPTION>
+                    <PARAMETERS/>
+                    <ARCS>
+                        <ARC to="success"/>
+                    </ARCS>
+                </NODE>
             </WORKFLOW>
             <DESTROY_WORKFLOW_TEMPLATE id="b54ff264-ed25-46a5-86df-dfbefb0b22be_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ==">
             	<PARAMETERS>

From e5eefef4113b31ebd4efa2a1113cb268983aba7f Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Wed, 16 Dec 2020 16:09:40 +0100
Subject: [PATCH 07/10] fixed param name

---
 .../bootstrap/profiles/workflows/templates/graphdb_template.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/graphdb_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/graphdb_template.xml
index 4e2b2a8..dc8fe0d 100644
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/graphdb_template.xml
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/graphdb_template.xml
@@ -13,7 +13,7 @@
                 <PARAM description="Datasource Id" name="dsId" required="true" type="string"/>
                 <PARAM description="Datasource Interface" name="interface" required="true" type="string"/>
                 <PARAM description="Store for transformed records" name="cleanMdstoreId" required="true" type="string"/>
-                <PARAM name="stagingPublisherEndpoint" description="GraphDB Publisher Endpoint" required="true" type="string"/>
+                <PARAM name="publisherEndpoint" description="GraphDB Publisher Endpoint" required="true" type="string"/>
             </PARAMETERS>
             <WORKFLOW>
                 <NODE isStart="true" name="fetchMdStore" type="FetchMDStoreRecords">

From 6c150be5b22e7314499b38d4d0a17bdb1b17c712 Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Thu, 17 Dec 2020 13:53:26 +0100
Subject: [PATCH 08/10] added missing param

---
 .../profiles/workflows/templates/public_publishing_template.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml
index 7f28a05..50048da 100644
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml
@@ -12,6 +12,7 @@
                 <PARAM description="Datasource Name" name="dsName" required="true" type="string"/>
                 <PARAM description="Datasource Id" name="dsId" required="true" type="string"/>
                 <PARAM description="Datasource Interface" name="interface" required="true" type="string"/>
+                <PARAM name="cleanMdstoreId" description="Store for transformed records" required="true" type="string"/>
                 <PARAM description="Public Publisher Endpoint" name="publisherEndpoint" required="true" type="string"/>
                 <PARAM description="Sparql update query to enrich GraphDB content" name="sparqlUpdateQuery" required="true" type="string"/>
             </PARAMETERS>

From 0e30eccbaebc4b02addb5a25941403a5a5f829e3 Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Thu, 17 Dec 2020 17:56:13 +0100
Subject: [PATCH 09/10] fixed worng copy&paste, probably from an st file

---
 .../templates/public_publishing_template.xml         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml
index 50048da..a615410 100644
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml
@@ -23,9 +23,9 @@
                         <PARAM name="wfTemplateId" value="7426eaaf-93c9-4914-b69a-c9d5c478405a_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
                         <PARAM name="wfTemplateParams">
                             <MAP>
-                                <ENTRY key="dsId"               value="$dsId$" />
-                                <ENTRY key="dsName"             value="$dsName$" />
-                                <ENTRY key="interface"          value="$interface$" />
+                                <ENTRY key="dsId" ref="dsId"/>
+                                <ENTRY key="dsName" ref="dsName"/>
+                                <ENTRY key="interface" ref="interface"/>
                                 <ENTRY key="cleanMdstoreId"     ref="cleanMdstoreId"/>
                                 <ENTRY key="publisherEndpoint"  ref="publisherEndpoint" />
                             </MAP>
@@ -41,9 +41,9 @@
                         <PARAM name="wfTemplateId" value="f780a64d-bb00-4c9b-8393-f738846945f3_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
                         <PARAM name="wfTemplateParams">
                             <MAP>
-                                <ENTRY key="dsId"               value="$dsId$" />
-                                <ENTRY key="dsName"             value="$dsName$" />
-                                <ENTRY key="interface"          value="$interface$" />
+                                <ENTRY key="dsId" ref="dsId"/>
+                                <ENTRY key="dsName" ref="dsName"/>
+                                <ENTRY key="interface" ref="interface"/>
                                 <ENTRY key="publisherEndpoint"  ref="publisherEndpoint" />
                                 <ENTRY key="sparqlUpdateQuery"  ref="sparqlUpdateQuery" />
                             </MAP>

From 5f695ee5384c5bc39fc7fced7390d884daa3faaa Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Thu, 17 Dec 2020 20:15:51 +0100
Subject: [PATCH 10/10] fixed worng copy&paste, probably from an st
 file...again

---
 .../workflows/templates/public_publishing_template.xml      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml
index a615410..0a8732f 100644
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/templates/public_publishing_template.xml
@@ -59,9 +59,9 @@
                         <PARAM name="wfTemplateId" value="3819eb3d-fdea-4fc3-925f-9ce0f61be9ee_V29ya2Zsb3dUZW1wbGF0ZURTUmVzb3VyY2VzL1dvcmtmbG93VGVtcGxhdGVEU1Jlc291cmNlVHlwZQ=="/>
                         <PARAM name="wfTemplateParams">
                             <MAP>
-                                <ENTRY key="dsId"               value="$dsId$" />
-                                <ENTRY key="dsName"             value="$dsName$" />
-                                <ENTRY key="interface"          value="$interface$" />
+                                <ENTRY key="dsId" ref="dsId"/>
+                                <ENTRY key="dsName" ref="dsName"/>
+                                <ENTRY key="interface" ref="interface"/>
                                 <ENTRY key="publisherEndpoint"  ref="publisherEndpoint" />
                             </MAP>
                         </PARAM>