From d5756571958010a1fa5aa16db71df5a088d343d2 Mon Sep 17 00:00:00 2001
From: Matt Jones <gitcode@magisa.org>
Date: Tue, 3 Sep 2019 18:29:32 -0800
Subject: [PATCH] Fix emlparser servlet by adding utilities.jar.

Now the servlet runs again and parses 2.2.0 and 2.1.1 docs properly.
---
 build.xml                     |   2 ++
 lib/eml.jar                   | Bin 40124 -> 40133 bytes
 src/main/resources/config.xml |   3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 757feb9e..b8919a60 100644
--- a/build.xml
+++ b/build.xml
@@ -429,6 +429,8 @@
           tofile="${servlet.install.dir}/WEB-INF/lib/xml-apis.jar"/>
         <copy file="${xmlp}"
           tofile="${servlet.install.dir}/WEB-INF/lib/xercesImpl.jar"/>
+        <copy file="${utilities}"
+          tofile="${servlet.install.dir}/WEB-INF/lib/utilities.jar"/>
 
         <!-- Copy eml-2.0.0 schema. Add code here for copying any other schemas. -->
         <checkout-and-copy dest = "${build.emlgit}" refname = "${eml2_0_0-tag}" target = "${servlet.install.dir}/schema/eml-2.0.0" />
diff --git a/lib/eml.jar b/lib/eml.jar
index 234fe4debb3f32515e1371556ca3eebb1f34e488..5e1b44cea274011a2bf4e00b87d448cca86fa9c7 100644
GIT binary patch
delta 1459
zcmdn9lj-PACY}IqW)?061`Y;>n#mJ+G?}U=Pc-iZk;fE3<O_WuIa!j?7)1FonuDlz
zMzi|r$;$r6%T(V#XJTNu#>2n>G=d>HKQApaU9TcHXKncHyxRsmwQ>6oeW-rBtKa!n
zUc`5UHPT&cZ|_zz<_wSJ@yZiQkhk~R_vF^qQZ5z_*C3nrD-$pI<%LD5`aAHg-Raf+
zMrrR(yV)MuX%_qKyeFMhUL&k*60<a->7#}7g7x(q{G2Bo<`ePA*NhB3q`&Txjecu8
z`;~(1tqz~f&-a?%&*p6@dVDLITl3(~gbII)wYGN_e!iW(ZRV8EN2F_F3^EP*>-cwV
zQn|9cH=D1_Z&B2OJ4IC+HywK=D?eG3uO|EN7SogG{wgffx^Ydv!LImuoovBH?(>_u
z?wpz=buBT*p*}(7PUOv2ZO6iP)j5j=Z5B`PybyV<LXo*B)L+z!Em7Jl=MamKcFT=y
zR+G(3l9@j7T)3{=#-`77y?T>>jg6wCMY`%I$tmA;8SlMYW4NGcZ-n&}CsP(4d0FvY
zt&&nX-qUP;SbR!5Dchv5Goi))!iBfGOrnKV?VFAFi-;_H7E#ZqafSb3&62BY7s_5a
z_SO28`kJ5GVUq){Z9E}-Xp`fYu&AqNY=lH#Mc=NPwcRTvan+{D57~8QA5ckWe9yU4
z{Oa_?u6Li^6C6d(IV{M%X={8ye3@xe;#qh53Gp7h;>J>k7ewhaMRL0bXev4yC+N4C
zEKK05OImUJMc?ET+cXN^)qiE|6q@rynbmyOp@jmU_r354>J8zO-0S7^+x1xBOVRoh
zX<we+jQQKMRV##7zQ66%KU1ro{v7oaUpGt+=dzz}df)Qz>&Tb#3k9b&GR4P<Wq;Vi
zy!PH_L(gtCn^!d}m!8%+Tg*2nK27|l>!uI;ispRDSa$QH%fH-0hn<tTFC=ZQH;%Y@
zYHDM&5yu({-mpDlYb5SQZoGX{Va>)~(du5qFqSu~T5oLLFg;p#-;^5*|7@3T{quwS
z{QKY0JRfR;^KKm6YX3FA>FzZtwmsLsceYms-Cv$0|Jpj_Nz>`4Mvv|HpI6mZ49WU#
zz5Zro%5?qAOmCmU^Bg@N@Ae+CdARrG$4AQIyMM1~JFoKoU+zzKSPtS~sGhv}C`&#Q
zFpq3DW1k16uW^>if%twJ-i#o6wq}b2h*or3zz?Di2eR>k=+kj$xIpyG%ur?!{UN83
z14I{>N^pbd-i8pc{NpYo77$;&e;pfB&E(0)r&<EJlbNPDfGC$~1|X_znmvfxKFt|K
z{h8(tqFkrD@uK9~$up*FD}Y2a7kyu-3Czd8m>C$ffcY2(mNXt>nQZ7JGx`5?8ITFG
zGh~>I*`Xp_lXKWPCuhyz0m)PVWiE3<W!NU~m>~obJp&Z=)_{vPXz)*#o(Wd3Ia7vd
zh9+F*tR}B^05E(+m_a2GC>)jjE35+fqxl&a9?LQ?Xu@0sq?a_xO<p+D0%ZPepeY9e
zfu=}KeiJA+*<cpfY`a-9Oef;NqNTHB<w0h>H@-bV2<W+bRt5%j6tkvH-Z;w)WY$Zd
zuD3ZrT@sV!XRCmNWphW)mD4~6Rf#Y#7^3JZD1|EInA|*D9&AP3n>7g>K*b+~7#Ivt
z6n9NNINKg<prf)`_*<YeJlN5_^q>o9px9*Fe*Vd>bHHI2IY)*`q#rEWJ4ci4&{U9_
E0NOZ99smFU

delta 1464
zcmX@QlWEURCY}IqW)?061`Y;>yKNJBG@0(SO*HRi0<w=OfXEm6KytDqqcMo`V>Aa*
z?TlviciWWxk00$}zsJPD(9FZY05pOjIX^EgGhMGDH)n0QZ~koq9^3W%4}I8McIoki
zGU;owZKci|OLuD<O)j|F?s(Fd>CN%}N&7FU+?84G&=|Dj$afFBlW*VLbzA*}^Ta~a
z>n}}aFL|G*mv(6ut6sj|q?B(Qw~uh}Ue^>$u+bBEQO})oS>VYAX4Xs5US>-_tbT2B
zp8MfLM$<b{x)=VOEKWYV-HUnQo7n1XMO6!Np7)&3r?y*{)Rmt#n_M*SM?*iin(nlN
z?;WR4Yx#9!_q2rRDyKwG$u1X{&R$dZEP2zR#{4z%+mvqZl0Oo|di$5?1@(1z@|pFj
z9_|cpj1CMqYqf>Do};J5TKjf^rpCMtE#4+g)gom=Tc(-DooI*&D{k#`ywS$=+Mw}>
zkm9u{CS9GEI~aGezgW%Y+$`Ss+V-Zpoc|4lIh%zl*^bsaH}qR)^Q=f%zm0EcfGOkQ
z#gARKZ*XY#J=G*FA04N^(@8)jyyt^-)~>m(3zYnx7nD7`-sE&$rv5Zz>o2`I{abFC
zn)JSk-M^^r(5(8SIYM1pYL!kA*E{Zct$sDneUVdbu9yF3w@w|O&@Dza{jRbzp6WcX
zRV-ih%f{#8-G71+0<FdZ8R2F6CLiqYN*&zr=pz3U@ojD0lD&xmykZ9zH7aXNov=W1
zgRt|g00VY=!z*$n$30W5MJnpwpJnW1n)760leF){fR4)PB`PbUwAy?8CS9nTR2X7)
zRDP3WZRM}k^EZaIu6l6zV!*|{ZtWi@K4sY{7gn_BLviHCxtHzZr~DI?N|e<2@HBNJ
z+j;2=uXOu8qf8zKKKIs*P0O5F{NR(;?3BqVPitRRTwXjg{kZw3?ME4(`mJ;5{#T!}
zVN<U*)AkgB8zm+;zJzRe`Qp^F^V-rarrS2Wj7#hhWxSoE_)Y1})fYnRe+m7MoagjU
zisL;0zwDAPoBYjlCY{~>KXk+Fn8OX<U)dG!O21mG_if`YXE(ncaqEr$RsRXvB;>U0
z*`Cj{<~~>Oe<ia#Y2HVRl8TS6HUHS!=11Q9*U$G+9F}o7fEj1=IhK4TVAj}d&pr=K
z-{&lo1M$N(yct3C63rF~5Uu63fFDGk31s61(O2TmaDnJWnW4-e`e#lf2Z*jImEZ=^
z(;7m+@^89~SU`M*{&j3Xdh&&-mcX1knR}W8i03=a07TVKvj<TJra6Ns*6Hpb%5S<G
zFG^;eyl}cUNaEad8K#{qlLKZdO=9JmEHQ&e0i>*$UG_sLFi*#_Ffix>^E3=BY1Cqe
zsAZX)HA56+K;sM<rc<0CK_k87oW$bd0H9w*m_daJC`^?7*K#er%D~9L&<(`;FoS^f
zl13*DkhaO48vNSmn#x?3Ia*5q%>e2^bwK}Q|Cu%*i+g9vFo`+=O^}&<e5SNK*x3<M
zx3>a|p$wo-QxvPVPiCCu0`?mJodkytpzGd<GB9YMsM#L}G)!`G-7Hy<@pEU%F!g4F
zMNVf5U^wvnjXOf-z~XYH00V;_iZM?n^Ut;gncz2DhAF*tvcPPG$vv~>K_Y8`B8?3|
z5!uNvW-Ee3xaY_)UGJJ~(62h#Z;lYy6QK!`b;)cD3^qWIpn9Eqa{U|!ww+T!)&T$`
Ca#8>Q

diff --git a/src/main/resources/config.xml b/src/main/resources/config.xml
index 55946a6d..5b65e875 100644
--- a/src/main/resources/config.xml
+++ b/src/main/resources/config.xml
@@ -43,11 +43,12 @@
   	eml://ecoinformatics.org/eml-2.0.1 https://knb.ecoinformatics.org/emlparser/schema/eml-2.0.1/eml.xsd     
   	eml://ecoinformatics.org/eml-2.1.0 https://knb.ecoinformatics.org/emlparser/schema/eml-2.1.0/eml.xsd    
   	eml://ecoinformatics.org/eml-2.1.1 https://knb.ecoinformatics.org/emlparser/schema/eml-2.1.1/eml.xsd       	 
-  	https://eml.ecoinformatics.org/eml-2.2.0 https://knb.ecoinformatics.org/emlparser/schema/eml-2.2.0/eml.xsd
+  	https://eml.ecoinformatics.org/eml-2.2.0 https://eml.ecoinformatics.org/eml-2.2.0/eml.xsd
   	eml://ecoinformatics.org/literature-2.1.0 https://knb.ecoinformatics.org/emlparser/schema/eml-2.1.0/eml-literature.xsd     
   	eml://ecoinformatics.org/project-2.1.0 https://knb.ecoinformatics.org/emlparser/schema/eml-2.1.0/eml-project.xsd     
   	eml://ecoinformatics.org/literature-2.1.1 https://knb.ecoinformatics.org/emlparser/schema/eml-2.1.1/eml-literature.xsd     
   	eml://ecoinformatics.org/project-2.1.1 https://knb.ecoinformatics.org/emlparser/schema/eml-2.1.1/eml-project.xsd     
+  	http://www.xml-cml.org/schema/stmml-1.2 https://eml.ecoinformatics.org//eml-2.2.0/stmml.xsd     
   	http://www.xml-cml.org/schema/stmml-1.1 https://knb.ecoinformatics.org/emlparser/schema/eml-2.1.0/stmml.xsd     
   	http://www.xml-cml.org/schema/stmml https://knb.ecoinformatics.org/emlparser/schema/eml-2.0.1/stmml.xsd
   </namespaces>