diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.jar b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.jar
new file mode 100644
index 00000000..c771e4fa
Binary files /dev/null and b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.jar differ
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.jar.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.jar.md5
new file mode 100644
index 00000000..8ea475d5
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.jar.md5
@@ -0,0 +1 @@
+1a0d7d5fa75f604b501d51fa253cebb3
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.jar.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.jar.sha1
new file mode 100644
index 00000000..f1b55c3f
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.jar.sha1
@@ -0,0 +1 @@
+c5203941c91e6029dfbd6b48ab1c8f3c2c612ada
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.pom b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.pom
new file mode 100644
index 00000000..0fd8f949
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.pom
@@ -0,0 +1,9 @@
+
+
+ 4.0.0
+ org.mdht.dependencies
+ org.eclipse.mdht.emf.runtime
+ 3.0.0.201611150602
+ POM was created from install:install-file
+
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.pom.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.pom.md5
new file mode 100644
index 00000000..0fd60f1e
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.pom.md5
@@ -0,0 +1 @@
+9ba000c373e0a1426dab8ccde3600af7
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.pom.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.pom.sha1
new file mode 100644
index 00000000..75055e87
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/3.0.0.201611150602/org.eclipse.mdht.emf.runtime-3.0.0.201611150602.pom.sha1
@@ -0,0 +1 @@
+caa56379f9fe12a81a77aff0ed7b387153b86b6d
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/maven-metadata-local.xml b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/maven-metadata-local.xml
index 38f23997..4317920b 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/maven-metadata-local.xml
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/maven-metadata-local.xml
@@ -3,14 +3,15 @@
org.mdht.dependencies
org.eclipse.mdht.emf.runtime
- 3.0.0.201611020501
+ 3.0.0.201611150602
3.0.0.201606280501
3.0.0.201607250501
3.0.0.201608160501
3.0.0.201610260501
3.0.0.201611020501
+ 3.0.0.201611150602
- 20161104191354
+ 20161117140824
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/maven-metadata-local.xml.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/maven-metadata-local.xml.md5
index babdccd3..da7804f4 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/maven-metadata-local.xml.md5
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/maven-metadata-local.xml.md5
@@ -1 +1 @@
-463de88b040bf7fd59d17452c87e6929
\ No newline at end of file
+1e6f4fe79bd8ca77edca2ee2b5a65d06
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/maven-metadata-local.xml.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/maven-metadata-local.xml.sha1
index d440d3b5..ae3ae78e 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/maven-metadata-local.xml.sha1
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.emf.runtime/maven-metadata-local.xml.sha1
@@ -1 +1 @@
-157047ee902fd21616b8320ff7917d4aba4ebe16
\ No newline at end of file
+b532262bad374e5465c3cb291e3a2a76e88946bd
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.jar b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.jar
new file mode 100644
index 00000000..e162e9f1
Binary files /dev/null and b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.jar differ
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.jar.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.jar.md5
new file mode 100644
index 00000000..9d85b8f5
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.jar.md5
@@ -0,0 +1 @@
+934618473e36cb21f943a34a2a773e27
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.jar.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.jar.sha1
new file mode 100644
index 00000000..3455ba3b
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.jar.sha1
@@ -0,0 +1 @@
+0c812b4072b8d15c5c12a4a388eadd179ba16ae1
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.pom b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.pom
new file mode 100644
index 00000000..1c0bb767
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.pom
@@ -0,0 +1,9 @@
+
+
+ 4.0.0
+ org.mdht.dependencies
+ org.eclipse.mdht.uml.cda
+ 3.0.0.201611150602
+ POM was created from install:install-file
+
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.pom.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.pom.md5
new file mode 100644
index 00000000..9d95c498
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.pom.md5
@@ -0,0 +1 @@
+d0c265a0f6df492bb33285a55c2a5880
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.pom.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.pom.sha1
new file mode 100644
index 00000000..edd92344
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/3.0.0.201611150602/org.eclipse.mdht.uml.cda-3.0.0.201611150602.pom.sha1
@@ -0,0 +1 @@
+1d15bf073e0367fd17f29e91eef164514d3489ad
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/maven-metadata-local.xml b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/maven-metadata-local.xml
index f20e3fa6..56d35716 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/maven-metadata-local.xml
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/maven-metadata-local.xml
@@ -3,14 +3,15 @@
org.mdht.dependencies
org.eclipse.mdht.uml.cda
- 3.0.0.201611020501
+ 3.0.0.201611150602
3.0.0.201606280501
3.0.0.201607250501
3.0.0.201608160501
3.0.0.201610260501
3.0.0.201611020501
+ 3.0.0.201611150602
- 20161104191523
+ 20161117140746
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/maven-metadata-local.xml.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/maven-metadata-local.xml.md5
index 9a427629..ac3201b5 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/maven-metadata-local.xml.md5
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/maven-metadata-local.xml.md5
@@ -1 +1 @@
-68d98ccad9bd17df1537ee17fc8a7816
\ No newline at end of file
+92737fde65c0813e551516e3e6ca17c4
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/maven-metadata-local.xml.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/maven-metadata-local.xml.sha1
index 54458555..e028653c 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/maven-metadata-local.xml.sha1
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.cda/maven-metadata-local.xml.sha1
@@ -1 +1 @@
-40ee8e6ed7a3a3066c958450d5175d954e697082
\ No newline at end of file
+a02eb58d19ce002bc4f0cecbf3524707ee93a4f4
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.jar b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.jar
new file mode 100644
index 00000000..60a01ac3
Binary files /dev/null and b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.jar differ
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.jar.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.jar.md5
new file mode 100644
index 00000000..3d177141
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.jar.md5
@@ -0,0 +1 @@
+85dac3db4a46fb008906a386fdd2082f
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.jar.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.jar.sha1
new file mode 100644
index 00000000..715abea7
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.jar.sha1
@@ -0,0 +1 @@
+213cbe89c55223f8c36c4167b8efbc910c79b7fe
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.pom b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.pom
new file mode 100644
index 00000000..7cc60c8c
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.pom
@@ -0,0 +1,9 @@
+
+
+ 4.0.0
+ org.mdht.dependencies
+ org.eclipse.mdht.uml.hl7.datatypes
+ 3.0.0.201611150602
+ POM was created from install:install-file
+
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.pom.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.pom.md5
new file mode 100644
index 00000000..50fbe07a
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.pom.md5
@@ -0,0 +1 @@
+576d4b091530c225cde17a18e51e17c7
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.pom.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.pom.sha1
new file mode 100644
index 00000000..5fddc8e4
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.pom.sha1
@@ -0,0 +1 @@
+35df34f515783669840e5aaf55489dc36a6b62fb
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/maven-metadata-local.xml b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/maven-metadata-local.xml
index bbd2e6e6..5214395b 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/maven-metadata-local.xml
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/maven-metadata-local.xml
@@ -3,14 +3,15 @@
org.mdht.dependencies
org.eclipse.mdht.uml.hl7.datatypes
- 3.0.0.201611020501
+ 3.0.0.201611150602
3.0.0.201606280501
3.0.0.201607250501
3.0.0.201608160501
3.0.0.201610260501
3.0.0.201611020501
+ 3.0.0.201611150602
- 20161104191443
+ 20161117140711
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/maven-metadata-local.xml.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/maven-metadata-local.xml.md5
index 40ec6a11..5d1af271 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/maven-metadata-local.xml.md5
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/maven-metadata-local.xml.md5
@@ -1 +1 @@
-ea22d69f689d306adbea718f56e70fea
\ No newline at end of file
+4b5ada8b98025a36e5c6d4eb76e17a08
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/maven-metadata-local.xml.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/maven-metadata-local.xml.sha1
index a51dfbd3..4f3b943d 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/maven-metadata-local.xml.sha1
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.datatypes/maven-metadata-local.xml.sha1
@@ -1 +1 @@
-85be739c5e3b5c0c6a5bbc00c8dcc89a7b1ae3bd
\ No newline at end of file
+96c19d12e263e478bb97de51a3ea2c97af9d6ee1
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.jar b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.jar
new file mode 100644
index 00000000..ce92c30f
Binary files /dev/null and b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.jar differ
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.jar.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.jar.md5
new file mode 100644
index 00000000..d18d4aa4
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.jar.md5
@@ -0,0 +1 @@
+6c6a9922b5048fc42bc68d8828d0400f
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.jar.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.jar.sha1
new file mode 100644
index 00000000..9891a3ba
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.jar.sha1
@@ -0,0 +1 @@
+d2d19077848cdca539f60d8cf3502c725244b83b
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.pom b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.pom
new file mode 100644
index 00000000..b1cbcc23
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.pom
@@ -0,0 +1,9 @@
+
+
+ 4.0.0
+ org.mdht.dependencies
+ org.eclipse.mdht.uml.hl7.rim
+ 3.0.0.201611150602
+ POM was created from install:install-file
+
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.pom.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.pom.md5
new file mode 100644
index 00000000..ae20d203
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.pom.md5
@@ -0,0 +1 @@
+a3fa23981460b46303601096ddb0dede
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.pom.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.pom.sha1
new file mode 100644
index 00000000..4d1b3f60
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.pom.sha1
@@ -0,0 +1 @@
+c20d4e451160788f716ed6032c92035cfa373a1d
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/maven-metadata-local.xml b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/maven-metadata-local.xml
index e437b2e9..75ec6e09 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/maven-metadata-local.xml
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/maven-metadata-local.xml
@@ -3,14 +3,15 @@
org.mdht.dependencies
org.eclipse.mdht.uml.hl7.rim
- 3.0.0.201611020501
+ 3.0.0.201611150602
3.0.0.201606280501
3.0.0.201607250501
3.0.0.201608160501
3.0.0.201610260501
3.0.0.201611020501
+ 3.0.0.201611150602
- 20161104191305
+ 20161117140608
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/maven-metadata-local.xml.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/maven-metadata-local.xml.md5
index 30df52b0..79e4663d 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/maven-metadata-local.xml.md5
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/maven-metadata-local.xml.md5
@@ -1 +1 @@
-8e33ffdd027dfe0f9bab8dfb6418ef0f
\ No newline at end of file
+a725e7f8700ef072a616b2e265d38b22
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/maven-metadata-local.xml.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/maven-metadata-local.xml.sha1
index 16276df7..e0a3c062 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/maven-metadata-local.xml.sha1
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.rim/maven-metadata-local.xml.sha1
@@ -1 +1 @@
-945ba1a104914ac15305ca309890de2f7ea43bf5
\ No newline at end of file
+24c5681d59fce212f0d484ddbdec6fa8c75cdb6f
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.jar b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.jar
new file mode 100644
index 00000000..18a33e8c
Binary files /dev/null and b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.jar differ
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.jar.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.jar.md5
new file mode 100644
index 00000000..67f24377
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.jar.md5
@@ -0,0 +1 @@
+787324eb20fb54a876d286aad6858f19
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.jar.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.jar.sha1
new file mode 100644
index 00000000..bf2891e4
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.jar.sha1
@@ -0,0 +1 @@
+5d400b81e43734bf2a947e5e71fa8b4ea33ef64b
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.pom b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.pom
new file mode 100644
index 00000000..8d49fc87
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.pom
@@ -0,0 +1,9 @@
+
+
+ 4.0.0
+ org.mdht.dependencies
+ org.eclipse.mdht.uml.hl7.vocab
+ 3.0.0.201611150602
+ POM was created from install:install-file
+
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.pom.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.pom.md5
new file mode 100644
index 00000000..3fafd503
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.pom.md5
@@ -0,0 +1 @@
+563f525780bdd24ba86d8c553f7f3f23
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.pom.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.pom.sha1
new file mode 100644
index 00000000..f13f79f6
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/3.0.0.201611150602/org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.pom.sha1
@@ -0,0 +1 @@
+9dbbc9d9c46753d7d9d8c1c14e1ae76402ae4362
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/maven-metadata-local.xml b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/maven-metadata-local.xml
index 6c1df470..cd606802 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/maven-metadata-local.xml
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/maven-metadata-local.xml
@@ -3,14 +3,15 @@
org.mdht.dependencies
org.eclipse.mdht.uml.hl7.vocab
- 3.0.0.201611020501
+ 3.0.0.201611150602
3.0.0.201606280501
3.0.0.201607250501
3.0.0.201608160501
3.0.0.201610260501
3.0.0.201611020501
+ 3.0.0.201611150602
- 20161104191158
+ 20161117140349
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/maven-metadata-local.xml.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/maven-metadata-local.xml.md5
index 2776a9c3..571bede3 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/maven-metadata-local.xml.md5
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/maven-metadata-local.xml.md5
@@ -1 +1 @@
-c764f2f3c84ca51f48e6d62acd232e5f
\ No newline at end of file
+d4d1782d67622fee2111d3fd78430ed8
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/maven-metadata-local.xml.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/maven-metadata-local.xml.sha1
index 8a558537..488a5245 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/maven-metadata-local.xml.sha1
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.eclipse.mdht.uml.hl7.vocab/maven-metadata-local.xml.sha1
@@ -1 +1 @@
-13ed806ca75d61348d168374cf1edcb5ff1ba4b7
\ No newline at end of file
+c1a0a06a97adef84444b510aaaffe8169291a8cf
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.jar b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.jar
new file mode 100644
index 00000000..a4c2ac4c
Binary files /dev/null and b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.jar differ
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.jar.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.jar.md5
new file mode 100644
index 00000000..e7bdb337
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.jar.md5
@@ -0,0 +1 @@
+22f5a35e13b3c3612f613b61a4d97a4b
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.jar.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.jar.sha1
new file mode 100644
index 00000000..b246adb6
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.jar.sha1
@@ -0,0 +1 @@
+7b2432af426974899adb3ddc35942c80777a1c9a
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.pom b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.pom
new file mode 100644
index 00000000..72476158
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.pom
@@ -0,0 +1,9 @@
+
+
+ 4.0.0
+ org.mdht.dependencies
+ org.openhealthtools.mdht.uml.cda.consol2
+ 2.5.21.20161115
+ POM was created from install:install-file
+
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.pom.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.pom.md5
new file mode 100644
index 00000000..f19ff2bf
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.pom.md5
@@ -0,0 +1 @@
+5a701e8739fd794bcd5459cfa9180b7b
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.pom.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.pom.sha1
new file mode 100644
index 00000000..5ab3cb48
--- /dev/null
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/2.5.21.20161115/org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.pom.sha1
@@ -0,0 +1 @@
+22504b186dc77a314ac9ab4796d536d1b626e529
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/maven-metadata-local.xml b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/maven-metadata-local.xml
index 03dfd9e1..de29af83 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/maven-metadata-local.xml
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/maven-metadata-local.xml
@@ -3,13 +3,14 @@
org.mdht.dependencies
org.openhealthtools.mdht.uml.cda.consol2
- 2.5.20.20161102
+ 2.5.21.20161115
2.5.16.20160725
2.5.17.20160816
2.5.19.20161026
2.5.20.20161102
+ 2.5.21.20161115
- 20161104191654
+ 20161117141020
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/maven-metadata-local.xml.md5 b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/maven-metadata-local.xml.md5
index 4cf13e22..74dcad94 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/maven-metadata-local.xml.md5
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/maven-metadata-local.xml.md5
@@ -1 +1 @@
-99e27c8ad8fbae4e5d0dbe33edd8617f
\ No newline at end of file
+4883bdefbefc42a7afc2c06c7d940793
\ No newline at end of file
diff --git a/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/maven-metadata-local.xml.sha1 b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/maven-metadata-local.xml.sha1
index c746c3d6..8c0f5bcd 100644
--- a/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/maven-metadata-local.xml.sha1
+++ b/mdht-vocab-repo/org/mdht/dependencies/org.openhealthtools.mdht.uml.cda.consol2/maven-metadata-local.xml.sha1
@@ -1 +1 @@
-bd179c33a16681eee568679b9a882e7a4dcd160f
\ No newline at end of file
+2798d703bce609347c5f14d039514a31efeb4c91
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d82d6cae..51ee0d3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
org.sitenv
referenceccdavalidator
- 1.0.6
+ 1.0.7
war
Reference CCDA Validator
@@ -26,37 +26,37 @@
org.mdht.dependencies
org.eclipse.mdht.emf.runtime
- 3.0.0.201611020501
+ 3.0.0.201611150602
org.mdht.dependencies
org.openhealthtools.mdht.uml.cda.consol2
- 2.5.20.20161102
+ 2.5.21.20161115
org.mdht.dependencies
org.eclipse.mdht.uml.cda
- 3.0.0.201611020501
+ 3.0.0.201611150602
org.mdht.dependencies
org.eclipse.mdht.uml.hl7.datatypes
- 3.0.0.201611020501
+ 3.0.0.201611150602
org.mdht.dependencies
org.eclipse.mdht.uml.hl7.rim
- 3.0.0.201611020501
+ 3.0.0.201611150602
org.mdht.dependencies
org.eclipse.mdht.uml.hl7.vocab
- 3.0.0.201611020501
+ 3.0.0.201611150602
@@ -128,7 +128,7 @@
org.sitenv
contentvalidator-api
- 1.0.3
+ 1.0.4
diff --git a/scripts/mdht-cda.bat b/scripts/mdht-cda.bat
index 8064b25d..3a1446be 100644
--- a/scripts/mdht-cda.bat
+++ b/scripts/mdht-cda.bat
@@ -1 +1 @@
-mvn install:install-file -DlocalRepositoryPath=mdht-vocab-repo -DcreateChecksum=true -Dpackaging=jar -Dfile=C:\NIST\11_4_2016\runtime\mdht\org.eclipse.mdht.uml.cda-3.0.0.201611020501.jar -DgroupId=org.mdht.dependencies -DartifactId=org.eclipse.mdht.uml.cda -Dversion=3.0.0.201611020501
+mvn install:install-file -DlocalRepositoryPath=mdht-vocab-repo -DcreateChecksum=true -Dpackaging=jar -Dfile=C:\NIST\11_17_2016\runtime\mdht\org.eclipse.mdht.uml.cda-3.0.0.201611150602.jar -DgroupId=org.mdht.dependencies -DartifactId=org.eclipse.mdht.uml.cda -Dversion=3.0.0.201611150602
diff --git a/scripts/mdht-consol2.bat b/scripts/mdht-consol2.bat
index cff657b3..7533f575 100644
--- a/scripts/mdht-consol2.bat
+++ b/scripts/mdht-consol2.bat
@@ -1 +1 @@
-mvn install:install-file -DlocalRepositoryPath=mdht-vocab-repo -DcreateChecksum=true -Dpackaging=jar -Dfile=C:\NIST\11_4_2016\runtime\mdht\org.openhealthtools.mdht.uml.cda.consol2-2.5.20.20161102.jar -DgroupId=org.mdht.dependencies -DartifactId=org.openhealthtools.mdht.uml.cda.consol2 -Dversion=2.5.20.20161102
+mvn install:install-file -DlocalRepositoryPath=mdht-vocab-repo -DcreateChecksum=true -Dpackaging=jar -Dfile=C:\NIST\11_17_2016\runtime\mdht\org.openhealthtools.mdht.uml.cda.consol2-2.5.21.20161115.jar -DgroupId=org.mdht.dependencies -DartifactId=org.openhealthtools.mdht.uml.cda.consol2 -Dversion=2.5.21.20161115
diff --git a/scripts/mdht-datatypes.bat b/scripts/mdht-datatypes.bat
index ff761db5..db7b7a3a 100644
--- a/scripts/mdht-datatypes.bat
+++ b/scripts/mdht-datatypes.bat
@@ -1 +1 @@
-mvn install:install-file -DlocalRepositoryPath=mdht-vocab-repo -DcreateChecksum=true -Dpackaging=jar -Dfile=C:\NIST\11_4_2016\runtime\mdht\org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611020501.jar -DgroupId=org.mdht.dependencies -DartifactId=org.eclipse.mdht.uml.hl7.datatypes -Dversion=3.0.0.201611020501
+mvn install:install-file -DlocalRepositoryPath=mdht-vocab-repo -DcreateChecksum=true -Dpackaging=jar -Dfile=C:\NIST\11_17_2016\runtime\mdht\org.eclipse.mdht.uml.hl7.datatypes-3.0.0.201611150602.jar -DgroupId=org.mdht.dependencies -DartifactId=org.eclipse.mdht.uml.hl7.datatypes -Dversion=3.0.0.201611150602
diff --git a/scripts/mdht-emfruntime.bat b/scripts/mdht-emfruntime.bat
index ff3f373f..fdce5a76 100644
--- a/scripts/mdht-emfruntime.bat
+++ b/scripts/mdht-emfruntime.bat
@@ -1 +1 @@
-mvn install:install-file -DlocalRepositoryPath=mdht-vocab-repo -DcreateChecksum=true -Dpackaging=jar -Dfile=C:\NIST\11_4_2016\runtime\mdht\org.eclipse.mdht.emf.runtime-3.0.0.201611020501.jar -DgroupId=org.mdht.dependencies -DartifactId=org.eclipse.mdht.emf.runtime -Dversion=3.0.0.201611020501
+mvn install:install-file -DlocalRepositoryPath=mdht-vocab-repo -DcreateChecksum=true -Dpackaging=jar -Dfile=C:\NIST\11_17_2016\runtime\mdht\org.eclipse.mdht.emf.runtime-3.0.0.201611150602.jar -DgroupId=org.mdht.dependencies -DartifactId=org.eclipse.mdht.emf.runtime -Dversion=3.0.0.201611150602
diff --git a/scripts/mdht-rim.bat b/scripts/mdht-rim.bat
index 847bd9ae..85fe5840 100644
--- a/scripts/mdht-rim.bat
+++ b/scripts/mdht-rim.bat
@@ -1 +1 @@
-mvn install:install-file -DlocalRepositoryPath=mdht-vocab-repo -DcreateChecksum=true -Dpackaging=jar -Dfile=C:\NIST\11_4_2016\runtime\mdht\org.eclipse.mdht.uml.hl7.rim-3.0.0.201611020501.jar -DgroupId=org.mdht.dependencies -DartifactId=org.eclipse.mdht.uml.hl7.rim -Dversion=3.0.0.201611020501
+mvn install:install-file -DlocalRepositoryPath=mdht-vocab-repo -DcreateChecksum=true -Dpackaging=jar -Dfile=C:\NIST\11_17_2016\runtime\mdht\org.eclipse.mdht.uml.hl7.rim-3.0.0.201611150602.jar -DgroupId=org.mdht.dependencies -DartifactId=org.eclipse.mdht.uml.hl7.rim -Dversion=3.0.0.201611150602
diff --git a/scripts/mdht-vocab.bat b/scripts/mdht-vocab.bat
index 7d391a7e..22e96d48 100644
--- a/scripts/mdht-vocab.bat
+++ b/scripts/mdht-vocab.bat
@@ -1 +1 @@
-mvn install:install-file -DlocalRepositoryPath=mdht-vocab-repo -DcreateChecksum=true -Dpackaging=jar -Dfile=C:\NIST\11_4_2016\runtime\mdht\org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611020501.jar -DgroupId=org.mdht.dependencies -DartifactId=org.eclipse.mdht.uml.hl7.vocab -Dversion=3.0.0.201611020501
+mvn install:install-file -DlocalRepositoryPath=mdht-vocab-repo -DcreateChecksum=true -Dpackaging=jar -Dfile=C:\NIST\11_17_2016\runtime\mdht\org.eclipse.mdht.uml.hl7.vocab-3.0.0.201611150602.jar -DgroupId=org.mdht.dependencies -DartifactId=org.eclipse.mdht.uml.hl7.vocab -Dversion=3.0.0.201611150602
diff --git a/src/main/java/org/sitenv/referenceccda/services/ReferenceCCDAValidationService.java b/src/main/java/org/sitenv/referenceccda/services/ReferenceCCDAValidationService.java
index 4e778751..d3163055 100644
--- a/src/main/java/org/sitenv/referenceccda/services/ReferenceCCDAValidationService.java
+++ b/src/main/java/org/sitenv/referenceccda/services/ReferenceCCDAValidationService.java
@@ -2,12 +2,10 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.BOMInputStream;
-import org.apache.log4j.Logger;
import org.sitenv.referenceccda.dto.ValidationResultsDto;
import org.sitenv.referenceccda.dto.ValidationResultsMetaData;
import org.sitenv.referenceccda.validators.RefCCDAValidationResult;
import org.sitenv.referenceccda.validators.content.ReferenceContentValidator;
-import org.sitenv.referenceccda.validators.schema.CCDAIssueStates;
import org.sitenv.referenceccda.validators.schema.ReferenceCCDAValidator;
import org.sitenv.referenceccda.validators.vocabulary.VocabularyCCDAValidator;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +20,6 @@
@Service
public class ReferenceCCDAValidationService {
- private static Logger log = Logger.getLogger(ReferenceCCDAValidationService.class.getName());
private ReferenceCCDAValidator referenceCCDAValidator;
private VocabularyCCDAValidator vocabularyCCDAValidator;
private ReferenceContentValidator goldMatchingValidator;
@@ -57,45 +54,40 @@ public ValidationResultsDto validateCCDA(String validationObjective, String refe
private List runValidators(String validationObjective, String referenceFileName,
MultipartFile ccdaFile) throws SAXException {
List validatorResults = new ArrayList<>();
+ InputStream ccdaFileInputStream = null;
try {
- String ccdaFileContents = IOUtils.toString(new BOMInputStream(ccdaFile.getInputStream()));
+ ccdaFileInputStream = ccdaFile.getInputStream();
+ String ccdaFileContents = IOUtils.toString(new BOMInputStream(ccdaFileInputStream));
List mdhtResults = doMDHTValidation(validationObjective, referenceFileName, ccdaFileContents);
if(mdhtResults != null && !mdhtResults.isEmpty())
validatorResults.addAll(mdhtResults);
- if (shouldRunVocabularyValidation()) {
-
+ if (!mdhtResultsHaveSchemaError(mdhtResults)) {
List vocabResults = DoVocabularyValidation(validationObjective, referenceFileName, ccdaFileContents);
-
if(vocabResults != null && !vocabResults.isEmpty())
validatorResults.addAll(vocabResults);
-
- }
-
- if(shouldRunContentValidation()) {
-
- log.info("Running Content validation");
+
List contentResults = doContentValidation(validationObjective, referenceFileName, ccdaFileContents);
-
if(contentResults != null && !contentResults.isEmpty()) {
-
- log.info("Content Results = " + contentResults.size());
validatorResults.addAll(contentResults);
}
}
} catch (IOException e) {
throw new RuntimeException("Error getting CCDA contents from provided file", e);
+ }finally {
+ closeFileInputStream(ccdaFileInputStream);
}
return validatorResults;
}
- private boolean shouldRunVocabularyValidation() {
- return !CCDAIssueStates.hasSchemaError();
- }
-
- private boolean shouldRunContentValidation() {
- return !CCDAIssueStates.hasSchemaError();
+ private boolean mdhtResultsHaveSchemaError(List mdhtResults) {
+ for(RefCCDAValidationResult result : mdhtResults){
+ if(result.isSchemaError()){
+ return true;
+ }
+ }
+ return false;
}
private ArrayList DoVocabularyValidation(String validationObjective, String referenceFileName, String ccdaFileContents) throws SAXException {
diff --git a/src/main/java/org/sitenv/referenceccda/validators/schema/CCDAIssueStates.java b/src/main/java/org/sitenv/referenceccda/validators/schema/CCDAIssueStates.java
deleted file mode 100644
index 55366af1..00000000
--- a/src/main/java/org/sitenv/referenceccda/validators/schema/CCDAIssueStates.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.sitenv.referenceccda.validators.schema;
-
-public class CCDAIssueStates {
-
- /**
- * Intended to flag if the current result has the issue specified
- */
- private static boolean isIGIssue, isMUIssue, isSchemaError,
- isDataTypeSchemaError;
-
- /**
- * Intended to flag if the entire document has a schema error of any kind
- */
- private static boolean hasSchemaError;
-
- /**
- * Should be reset for each result as unique to each result
- */
- public static void resetUniqueResultValues() {
- isIGIssue = false;
- isMUIssue = false;
- isSchemaError = false;
- // if isDataTypeSchemaError is true, isSchemaError is also true, so
- // multiple states are allowed
- isDataTypeSchemaError = false;
- }
-
- /**
- * Should be reset for each validation as a whole (e.g. a full document)
- */
- public static void resetHasSchemaError() {
- hasSchemaError = false;
- }
-
- public static boolean isBaseLevelIGIssueOnly() {
- return isIGIssue && !isMUIssue;
- }
-
- public static boolean isGenericSchemaErrorOnly() {
- return isSchemaError && !isDataTypeSchemaError;
- }
-
- protected static void setIsIGIssue(boolean isIGIssue) {
- CCDAIssueStates.isIGIssue = isIGIssue;
- }
-
- protected static void setIsMUIssue(boolean isMUIssue) {
- CCDAIssueStates.isMUIssue = isMUIssue;
- }
-
- protected static void setIsSchemaError(boolean isSchemaError) {
- CCDAIssueStates.isSchemaError = isSchemaError;
- hasSchemaError = isSchemaError;
- }
-
- protected static void setIsDataTypeSchemaError(boolean isDataTypeSchemaError) {
- CCDAIssueStates.isDataTypeSchemaError = isDataTypeSchemaError;
- }
-
- /**
- * @return true if the document has at least one schema error in its results
- */
- public static boolean hasSchemaError() {
- return hasSchemaError;
- }
-
- public static boolean getCurrentIGIssueState() {
- return isIGIssue;
- }
-
- public static boolean getCurrentMUIssueState() {
- return isMUIssue;
- }
-
- public static boolean getCurrentSchemaErrorState() {
- return isSchemaError;
- }
-
- public static boolean getCurrentDataTypeSchemaErrorState() {
- return isDataTypeSchemaError;
- }
-
-}
diff --git a/src/main/java/org/sitenv/referenceccda/validators/schema/ReferenceCCDAValidator.java b/src/main/java/org/sitenv/referenceccda/validators/schema/ReferenceCCDAValidator.java
index 4b3881f3..b4885f5b 100644
--- a/src/main/java/org/sitenv/referenceccda/validators/schema/ReferenceCCDAValidator.java
+++ b/src/main/java/org/sitenv/referenceccda/validators/schema/ReferenceCCDAValidator.java
@@ -22,8 +22,6 @@
import java.util.ArrayList;
import java.util.List;
-import static org.sitenv.referenceccda.validators.schema.CCDAIssueStates.*;
-
@Component
public class ReferenceCCDAValidator extends BaseCCDAValidator implements CCDAValidator {
@@ -58,7 +56,7 @@ private void createValidationResultObjectToCollectDiagnosticsProducedDuringValid
private ArrayList processValidationResults(final XPathIndexer xpathIndexer,
ValidationResult result) {
ArrayList results = new ArrayList();
- CCDAIssueStates.resetHasSchemaError();
+ //CCDAIssueStates.resetHasSchemaError();
for (Diagnostic diagnostic : result.getErrorDiagnostics()) {
results.add(buildValidationResult(diagnostic, xpathIndexer, ValidationResultType.CCDA_MDHT_CONFORMANCE_ERROR));
}
@@ -75,28 +73,28 @@ private ArrayList processValidationResults(final XPathI
private RefCCDAValidationResult buildValidationResult(Diagnostic diagnostic, XPathIndexer xPathIndexer,
ValidationResultType resultType) {
+ boolean isResultIGIssue = false;
+ boolean isResultMUIssue = false;
+ boolean isResultSchemaError = false;
+ boolean isResultDataTypeSchemaError = false;
+ boolean isDocumentSchemaError = false;
CDADiagnostic diag = new CDADiagnostic(diagnostic);
String lineNumber = getLineNumberInXMLUsingXpath(xPathIndexer, diagnostic);
if(resultType == ValidationResultType.CCDA_MDHT_CONFORMANCE_ERROR) {
- setIssueType(diag);
- }
- return createNewValidationResult(diag, resultType, lineNumber);
- }
-
- private void setIssueType(CDADiagnostic cDiag) {
- resetUniqueResultValues();
- if (cDiag.getSource() != null) {
- if (cDiag.getSource().contains("a.consol")) {
- setIsIGIssue(true);
- } else {
- // javax.xml.validation.Validator, org.eclipse.emf.ecore, etc.
- setIsSchemaError(true);
- if (cDiag.getPath() != null && cDiag.getCode() > 0) {
- // org.eclipse.emf.ecore, etc.
- setIsDataTypeSchemaError(true);
+ if (diag.getSource() != null) {
+ if (diag.getSource().contains("a.consol")) {
+ isResultIGIssue = true;
+ } else {
+ // javax.xml.validation.Validator, org.eclipse.emf.ecore, etc.
+ isResultSchemaError = true;
+ if (diag.getPath() != null && diag.getCode() > 0) {
+ // org.eclipse.emf.ecore, etc.
+ isResultDataTypeSchemaError = true;
+ }
}
}
}
+ return createNewValidationResult(diag, resultType, lineNumber, isResultSchemaError, isResultDataTypeSchemaError);
}
private String getLineNumberInXMLUsingXpath(final XPathIndexer xpathIndexer, Diagnostic diagnostic) {
@@ -128,10 +126,10 @@ public String getPath(EObject eObject) {
}
private RefCCDAValidationResult createNewValidationResult(CDADiagnostic cdaDiag, ValidationResultType resultType,
- String resultLineNumber) {
+ String resultLineNumber, boolean isResultSchemaError, boolean isResultDataTypeSchemaError) {
return new RefCCDAValidationResult.RefCCDAValidationResultBuilder(
cdaDiag.getMessage(), cdaDiag.getPath(), null, resultType,
- resultLineNumber, getCurrentSchemaErrorState(),
- getCurrentDataTypeSchemaErrorState()).build();
+ resultLineNumber, isResultSchemaError,
+ isResultDataTypeSchemaError).build();
}
}
diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml
index b9bc82a5..a55e5f02 100644
--- a/src/main/webapp/META-INF/context.xml
+++ b/src/main/webapp/META-INF/context.xml
@@ -1,4 +1,4 @@
-
+ASd
diff --git a/src/test/java/RefCCDATest.java b/src/test/java/RefCCDATest.java
index 3bce6049..1b4be90c 100644
--- a/src/test/java/RefCCDATest.java
+++ b/src/test/java/RefCCDATest.java
@@ -1,7 +1,6 @@
import org.junit.Test;
import org.sitenv.referenceccda.validators.RefCCDAValidationResult;
import org.sitenv.referenceccda.validators.enums.ValidationResultType;
-import org.sitenv.referenceccda.validators.schema.CCDAIssueStates;
import org.sitenv.referenceccda.validators.schema.ReferenceCCDAValidator;
import org.xml.sax.SAXException;
@@ -11,6 +10,7 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
+import java.util.List;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -60,7 +60,7 @@ public void hasSchemaErrorTest() {
// global result
assertTrue(
"The document has a schema error yet the flag is set to false",
- CCDAIssueStates.hasSchemaError());
+ mdhtResultsHaveSchemaError(results));
// and for sanity, check the single results as well
boolean schemaErrorInSingleResultFound = false;
for (RefCCDAValidationResult result : results)
@@ -77,7 +77,7 @@ public void doesNotHaveSchemaErrorTest() {
// global result
assertFalse(
"The document does not have schema error yet the flag is set to true",
- CCDAIssueStates.hasSchemaError());
+ mdhtResultsHaveSchemaError(results));
// and for sanity, check the single results as well
boolean schemaErrorInSingleResultFound = false;
for (RefCCDAValidationResult result : results)
@@ -102,17 +102,17 @@ public void multipleDocumentsWithAndWithoutSchemaErrorTest() {
System.out
.println(System.lineSeparator()
+ "CCDAIssueStates.hasSchemaError(): "
- + CCDAIssueStates.hasSchemaError()
+ + mdhtResultsHaveSchemaError(results)
+ System.lineSeparator());
if (curCCDAFileIndex == 0
|| curCCDAFileIndex == LAST_SCHEMA_TEST_AND_NO_SCHEMA_ERROR_INDEX) {
assertFalse(
"The document does not have schema error yet the flag is set to true",
- CCDAIssueStates.hasSchemaError());
+ mdhtResultsHaveSchemaError(results));
} else {
assertTrue(
"The document has a schema error yet the flag is set to false",
- CCDAIssueStates.hasSchemaError());
+ mdhtResultsHaveSchemaError(results));
}
for (RefCCDAValidationResult result : results) {
@@ -176,4 +176,13 @@ private static void printResults(RefCCDAValidationResult result) {
System.out.println();
}
+ private boolean mdhtResultsHaveSchemaError(List mdhtResults) {
+ for(RefCCDAValidationResult result : mdhtResults){
+ if(result.isSchemaError()){
+ return true;
+ }
+ }
+ return false;
+ }
+
}