From ab1f920467b02b8a9082772ddd27584303a55ee0 Mon Sep 17 00:00:00 2001
From: Paul Harrison <paul.harrison@manchester.ac.uk>
Date: Mon, 8 Apr 2024 12:10:55 +0100
Subject: [PATCH] update to vodml 0.4.5 plugin

---
 binding_proposal_model.xml                    |  8 +++++--
 build.gradle.kts                              |  2 +-
 src/main/vo-dml/proposalManagement.vo-dml.xml |  2 +-
 src/main/vo-dml/proposaldm.vo-dml.xml         | 23 +++++++++++--------
 .../dm/proposal/prop/EmerlinExampleTest.java  |  4 ++--
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/binding_proposal_model.xml b/binding_proposal_model.xml
index d50006c..895598d 100644
--- a/binding_proposal_model.xml
+++ b/binding_proposal_model.xml
@@ -6,16 +6,20 @@
 <name>proposal</name>
 <file>proposaldm.vo-dml.xml</file>s
     <java-package>org.ivoa.dm.proposal.prop</java-package>
-<xml-targetnamespace prefix="prop" schemaFilename="proposalDM.xsd">http://ivoa.net/dm/proposalDM</xml-targetnamespace>
+<xml-targetnamespace prefix="prop">http://ivoa.net/dm/proposalDM/v0.4</xml-targetnamespace>
     <rdb inheritance-strategy="single-table"
          discriminatorColumnLength="64"/>
+    <type-detail vodml-id="Justification.text">
+        <length>3072</length>
+    </type-detail>
+  
 
 </model>
     <model>
     <name>proposalManagement</name>
     <file>proposalManagement.vo-dml.xml</file>
     <java-package>org.ivoa.dm.proposal.management</java-package>
-    <xml-targetnamespace prefix="propm" schemaFilename="proposalManagement.xsd">http://ivoa.net/dm/proposalManagment</xml-targetnamespace>
+    <xml-targetnamespace prefix="propm" >http://ivoa.net/dm/proposalManagment/v0.4</xml-targetnamespace>
         <rdb inheritance-strategy="single-table"
              discriminatorColumnLength="64"/>
     </model>
diff --git a/build.gradle.kts b/build.gradle.kts
index d50ee81..e5eee6c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.gradle.kotlin.dsl.accessors.runtime.addDependencyTo
 
 plugins {
-        id("net.ivoa.vo-dml.vodmltools") version "0.4.4"
+        id("net.ivoa.vo-dml.vodmltools") version "0.4.5"
         `maven-publish`
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
         signing
diff --git a/src/main/vo-dml/proposalManagement.vo-dml.xml b/src/main/vo-dml/proposalManagement.vo-dml.xml
index 28b3dff..a7562cf 100644
--- a/src/main/vo-dml/proposalManagement.vo-dml.xml
+++ b/src/main/vo-dml/proposalManagement.vo-dml.xml
@@ -6,7 +6,7 @@
       <name>proposalManagement</name>
       <description>The data model for managing the proposal review process. Intended to work for phase 1</description> 
       <uri/>
-      <title>TBD</title>
+      <title></title>
       <author>Paul Harrison</author>
       <version>0.3</version>
       <lastModified>2023-12-19T15:37:41Z</lastModified>
diff --git a/src/main/vo-dml/proposaldm.vo-dml.xml b/src/main/vo-dml/proposaldm.vo-dml.xml
index 12cff64..059cc09 100644
--- a/src/main/vo-dml/proposaldm.vo-dml.xml
+++ b/src/main/vo-dml/proposaldm.vo-dml.xml
@@ -9,7 +9,7 @@
       proposal to be reviewed and allocated time. It does not cover all the technical detail of instrument setup that would be needed to actually schedule the 
       observations, although the intention is that information about targets etc. could be automatically transferred to an observing system.</description> 
       <uri/>
-      <title>TBD</title>
+      <title></title>
       <author>Paul Harrison</author>
       <version>0.3</version>
       <lastModified>2024-03-26T09:49:59Z</lastModified>
@@ -24,9 +24,12 @@
         <documentationURL>not known</documentationURL>
       </import>
       <primitiveType>
-        <vodml-id>WikiDataId</vodml-id>
-        <name>WikiDataId</name>
-        <description>a WikiData identifier</description>	    
+      <vodml-id>WikiDataId</vodml-id>
+      <name>WikiDataId</name>
+      <description>a WikiData identifier</description>	    
+      <extends>
+         <vodml-ref>ivoa:stringIdentifier</vodml-ref>
+      </extends>
       </primitiveType>
             <enumeration>
                <vodml-id>ProposalKind</vodml-id>
@@ -862,7 +865,7 @@
                  </multiplicity>
                </attribute>
             </objectType>
-            <objectType abstract='true'>
+            <objectType abstract="true">
                <vodml-id>Target</vodml-id>
                <name>Target</name>
                <description>A target source</description>	    
@@ -967,7 +970,7 @@
                   <vodml-ref>proposal:Target</vodml-ref>
                </extends>
             </objectType>
-            <objectType abstract='true'>
+            <objectType abstract="true">
                <vodml-id>Field</vodml-id>
                <name>Field</name>
                <description>Definition of an observing field pointing</description>	    
@@ -1076,12 +1079,12 @@
                  </multiplicity>
                </attribute>
             </objectType>
-            <objectType abstract='true'>
+            <objectType abstract="true">
                <vodml-id>ObservingConstraint</vodml-id>
                <name>ObservingConstraint</name>
                <description>a form of constraint on the observation</description>	    
             </objectType>
-            <objectType abstract='true'>
+            <objectType abstract="true">
                <vodml-id>TimingConstraint</vodml-id>
                <name>TimingConstraint</name>
                <description>Any specific timing requirements for the observing</description>	    
@@ -1153,7 +1156,7 @@
                   <vodml-ref>proposal:TimingConstraint</vodml-ref>
                </extends>
             </objectType>
-            <objectType abstract='true'>
+            <objectType abstract="true">
                <vodml-id>PointingConstaint</vodml-id>
                <name>PointingConstaint</name>
                <description>A constraint that limits the telescope pointing</description>	    
@@ -1374,7 +1377,7 @@
                  </multiplicity>
                </attribute>
             </objectType>
-            <objectType abstract='true'>
+            <objectType abstract="true">
                <vodml-id>Observation</vodml-id>
                <name>Observation</name>
                <description></description>	    
diff --git a/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExampleTest.java b/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExampleTest.java
index c8ef77b..723ec56 100644
--- a/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExampleTest.java
+++ b/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExampleTest.java
@@ -117,7 +117,7 @@ public void testJacksonOjectIds( ) throws JsonProcessingException {
           String njn = "{\n"
                   + "    \"members\": [\n"
                   + "        {\n"
-                  + "            \"role\": \"CHAIR\",\n"
+                  + "            \"role\": \"Chair\",\n"
                   + "            \"member\": {\n"
                   + "                \"_id\": 1,\n"
                   + "                \"person\": {\n"
@@ -141,7 +141,7 @@ public void testJacksonOjectIds( ) throws JsonProcessingException {
                   + "            }\n"
                   + "        },\n"
                   + "        {\n"
-                  + "            \"role\": \"SCIENCEREVIEWER\",\n"
+                  + "            \"role\": \"ScienceReviewer\",\n"
                   + "            \"member\": {\n"
                   + "                \"_id\": 2,\n"
                   + "                \"person\": {\n"