Import csvs

Dockerfile

@@ -14,6 +14,7 @@ COPY start.sh /opt/re3gistry/
 COPY httpd-vhosts.conf /etc/apache2/conf.d/
 COPY httpd.conf /etc/apache2/
 COPY public_html /var/www/localhost/htdocs/ 
+COPY server.xml /opt/tomcat/conf
 WORKDIR /opt/re3gistry
 RUN chmod +x start.sh     
 ENTRYPOINT [ "/opt/re3gistry/start.sh"  ]

httpd-vhosts.conf

@@ -31,7 +31,7 @@ ProxyPass /re3gistry2 http://localhost:8080/re3gistry2
 ProxyPassReverse /re3gistry2 http://localhost:8080/re3gistry2
 
 ## Proxy to expose the Re2gistry 2 rest API
-ProxyPass /registry/rest http://localhost:8080/re3gistry2restapi/items/any Keepalive=On
+ProxyPass /registry/rest http://localhost:8080/re3gistry2restapi/items/any Keepalive=On connectiontimeout=300 timeout=300
 ProxyPassReverse  /registry/rest http://localhost:8080/re3gistry2restapi/items/any Keepalive=On
 
 ## Proxypass to expose the Re3gistry 2 Solr instance (select)

import/CL017.csv

@@ -0,0 +1,5 @@
+LocalID|Language|label|definition
+AN|nl|Anders|
+BR|nl|Bronwater|
+OW|nl|Oppervlaktewater|
+SW|nl|Slootwater|

import/CL018.csv

@@ -0,0 +1,15 @@
+LocalID|Language|label|definition
+3|nl|Voorbehandelen uitgangsmateriaal|
+4|nl|Hoofdgrondbewerking|
+5|nl|Zaaibedbereiding|
+6|nl|Zaaien, poten|
+7|nl|Bemesten|
+8|nl|Gewasbeschermen|
+9|nl|Irrigeren, beregenen|
+10|nl|Oogsten|
+11|nl|Overige teeltmaatregelen|
+12|nl|Opslaan product|
+13|nl|Grondontsmetten|
+14|nl|Grondverbeteren|
+17|nl|Mechanische bewerkingen|
+18|nl|Loofdoding|

import/CL020.csv

@@ -0,0 +1,161 @@
+LocalID|Language|label|definition
+59|nl|ppm|aantal per miljoen
+100KGM|nl|100kg|100 kilogram
+3B|nl|MJ|megajoule
+4H|nl|µm|micrometer
+ACR|nl|acre|acre
+ANN|nl|y|jaar
+ARE|nl|a|are
+BAAL|nl|baal|baal
+BAG|nl|zak|zak
+BAR|nl|bar|druk in atmosfeer
+BK|nl|mand|mand
+BLN|nl|boolean|boolean
+BLNC|nl|blanco|blanco
+BLNCKG|nl|blancoper kilogram|blancoper kilogram
+BM|nl|basin|basin
+BR|nl|brick pak|brick pak
+BUCKET|nl|emmer|emmer
+BX|nl|box|box
+C15|nl|mJ|millijoule
+C15KGM|nl|mJ/kg|millijoule per kilogram
+C18|nl|mmol|millimol
+CAN|nl|can|can
+CEL|nl|°C|graden Celcius
+CHARACTER|nl|lettercode|lettercode
+CL|nl|coil|coil
+CME|nl|cm|centimeter
+CMQ|nl|cubic centimetre|
+CMQHAR|nl|cubic centimetre|kubieke cm per hectare
+CO2EQFPCM|nl|kg CO2-eq/kg FPCM|kg CO2-eq/kg FPCM
+CP|nl|cup|cup
+D87|nl|mmol/kg|millimol per kilogram
+DAY|nl|dag|dag
+DD|nl|°|graden (hoekverdraaing)
+FAH|nl|°F|graden Fahrenheit
+FE|nl|FE (Denemarken)|FE (Denemarken)
+FOT|nl|foot|
+FRAC|nl|fractie|fractie
+FU|nl|fust|fust
+GL|nl|g/l|gram per liter
+GLI|nl|gallon (UK)|
+GLL|nl|gallon (US)|
+GM|nl|g/m2|gram per m2
+GR|nl|grootverbruik, geschenkverpakking|grootverbruik, geschenkverpakking
+GRM|nl|g|gram
+GRM100GRM|nl|g/100g|gram per 100 gram
+GRM16GN|nl|g/16gN|gram per 16gN
+GRMFE|nl|gram per FE|gram per FE
+GRMHAR|nl|g/ha|gram per hectare
+GRMKGM|nl|g/kg|gram per kilogram
+H83|nl|l/kg|liter per kilogram
+H87|nl|pieces|pieces
+HAR|nl|ha|hectare
+HUR|nl|uur|uur
+INH|nl|inch|
+JK|nl|MJ/kg|megajoule per kilogram
+KCELMLT|nl|10^3 cellen per ml|10^3 cellen per ml
+KEER|nl|keer|keer
+KGM|nl|kg|kilogram
+KGMACR|nl|kg/acre|kilogram per acre
+KGMFE|nl|kilogram per FE|kilogram per FE
+KGMHAR|nl|kg/ha|kilogram per hectare
+KGMKGM|nl|kg/kg|kilogram per kilogram
+KGMLTR|nl|kg/l|kilogram per liter
+KGMTNE|nl|kg/ton|kilogram per ton
+KMH|nl|km/h|kilometer per uur
+KMQ|nl|kg/m3|kg per kubieke meter
+KMT|nl|km|kilometer
+KP|nl|krimp|krimp
+KVEGRM|nl|kve/g|kve per gram
+KVEM|nl|kVEM|kVEM
+KVEML|nl|kve/ml|kve per milliliter
+KWH|nl|kWh|kilowattuur
+KWT|nl|kW|kilowatt
+LBR|nl|pound|
+LBRACR|nl|pound per acre|
+LOAD|nl|vracht|vracht
+LOR001|nl|aantal per 100mL|aantal per 100mL
+LOR002|nl|aantal per 200mL|aantal per 200mL
+LOR003|nl|aantal per 250mL|aantal per 250mL
+LOR004|nl|aantal per 500mL|aantal per 500mL
+LOR005|nl|aantal per 1000mL|aantal per 1000mL
+LOR008|nl|aantal per 600mL|aantal per 600mL
+LOR012|nl|aantal per 25gram|aantal per 25gram
+LOR014|nl|aantal per 400mL|aantal per 400mL
+LTR|nl|l|liter
+LTR100LTR|nl|l/100 l|liter per 100 liter
+LTRHAR|nl|l/ha|liter per hectare
+LV|nl|losverpakt|losverpakt
+M1|nl|mg/l|milligram per liter
+M33|nl|mmol/l|mmol/l
+MBR|nl|mbar|millibar
+FH|nl|µmol|micromol
+FHKGM|nl|µmol/kg|micromol per kilogram
+MC|nl|µg of mcg|microgram
+MC100GRM|nl|µg/hg|microgram per 100 gram
+MCALKGM|nl|Mcal/kg|mcal per kilogram
+MCKG|nl|µg/kg of mcg/kg|microgram per kilogram
+MCLTR|nl|µg/l of mcg/l|microgram per liter
+MEQ|nl|mEq/KAV|milli equivalenten bij KAV
+MEQ100GRM|nl|mEq/100g|milli equivalent per 100 gram
+MGM|nl|mg|milligram
+MGM100GRM|nl|mg/100g|milligram per 100 gram
+MGMKG|nl|mg/kg|milligram per kilogram
+MIN|nl|min|minuut
+MINKGM|nl|min/kg|minuut per kilogram
+MINLOG|nl|-log(H+) (bij pH)|-log(H+) (bij pH)
+MLT|nl|ml|milliliter
+MLT200GRM|nl|ml/200g|milliliter per 200 gram
+MLTGRM|nl|ml/g|milliliter per gram
+MLTMTK|nl|ml/m2|milliliter per vierkante meter
+MLTMTQ|nl|ml/m3|milliliter per kubieke meter
+MLTTNE|nl|ml/1000 kg|milliliter per 1000 kilogram
+MM100GRM|nl|mmol/100 gram|mmol/100 gram
+MMT|nl|mm|millimeter
+MONTH|nl|maand|maand
+MSCME|nl|mS/cm|milliSiemens/centimeter
+MSCME25|nl|mS/cm 25 °C|milliSiemens/centimeter bij 25 °C
+MTK|nl|m2|vierkante meter
+MTQ|nl|m3|kubieke meter
+MTQHAR|nl|kubieke meter per hectare|kubieke meter per hectare
+MTQHUR|nl|kubieke meter per uur|kubieke meter per uur
+MTR|nl|m|meter
+NBR|nl|aantal|aantal
+NBRKGM|nl|count/kg|aantal per kilogram
+NMRHAR|nl|count/ha|eenheden per hectare
+NNTEQKGM|nl|ng TEQ/kg|nanogram TEQ per kg (dioxine)
+NONE|nl|geen|geen eenheid
+NRMLTR|nl|n-l ?|NormLiter
+NX|nl|ppt|aantal per duizend
+P1|nl|%|percent
+P1FAME|nl|procent FAME|procent FAME
+P1H|nl|%/h|procent per uur
+P1NDF|nl|procent in NDF (USA)|procent in NDF (USA)
+P1NFC|nl|procent in NFC (USA)|procent in NFC (USA)
+P1RE|nl|procent in RE (USA)|procent in RE (USA)
+PALLET|nl|pallet|pallet
+PER100KGM|nl|per 100kg|per 100 kilogram
+PERITEM|nl|per item|per stuk
+PH|nl|Ph|zuurgraad
+PLHAR|nl|planten per ha|planten per ha
+PPBMC|nl|ppb/µg|ppb/µg (mycotoxinen)
+RE|nl|reep|reep
+RIT|nl|rit|rit
+ROE|nl|roede/roe|roede/roe
+ROL|nl|rol|rol
+SDHAR|nl|zaden per ha|zaden per ha
+SPECIES|nl|soort|soort
+STHAR|nl|stuks per ha|stuks per ha
+SZ|nl|stazak, zakje-buidel|stazak, zakje-buidel
+TB|nl|tube|tube
+TNE|nl|ton|ton
+TNEACR|nl|ton per acre|
+TNEHAR|nl|ton/ha|ton per ha
+U2|nl|tablet|tablet
+VB|nl|verpakkingsband|verpakkingsband
+VEMKGM|nl|VEM/kg|VEM per kg
+VLT|nl|V|volt
+VV|nl|vacuum verpakt|vacuum verpakt
+WEEK|nl|week|week
+ZZ|nl|mutually defined|mutually defined

import/CL021.csv

@@ -0,0 +1,16 @@
+LocalID|Language|label|definition
+DG|nl|Dalgrond|
+DZ|nl|Dekzand|
+JK|nl|Jonge zeeklei|
+KV|nl|Kleiig veen|
+KY|nl|Klei(IJsselmeergronden)|
+LO|nl|Loss|
+MA|nl|Maasklei|
+NV|nl|Niet-kleiig veen|
+OB|nl|Onbekend|
+OZ|nl|Oude zeeklei|
+RI|nl|Rivierklei|
+RO|nl|Rodoorngrond|
+ZD|nl|Zee- / Duinzand|
+ZV|nl|Zavel|
+ZY|nl|Zand(IJsselmeergronden)|

import/CL022.csv

@@ -0,0 +1 @@
+LocalID|Language|label|definition|n|p|k|compositionUnit|type

import/convert.sh

@@ -0,0 +1,4 @@
+head -1 CL021.csv > CL020.csv
+cat generated_codelist.csv|grep cl020|cut -d';' -f4|jq -r  '[.code,"nl",.unit // .description, .description] | @tsv'|sed 's/\t/|/g' >> CL020.csv
+
+cat generated_codelist.csv|grep cl022|cut -d';' -f4|jq -r  '[.code,"nl",.description, .description, .n, .p, .k, .composition,.type] | @tsv'|sed 's/\t/|/g'

re3gistry

@@ -1 +1 @@
-Subproject commit ccde621104ea1b3c30455b557007e95a5e8d4d55
+Subproject commit 37a4a357954ba643b1e76b524c8168bcbd2d3b5e

server.xml

@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!-- APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="8080" protocol="HTTP/1.1"
+               connectionTimeout="40000"
+               redirectPort="8443"
+               maxParameterCount="1000"
+               />
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443"
+               maxParameterCount="1000"
+               />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true"
+               maxParameterCount="1000"
+               >
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true"
+               maxParameterCount="1000"
+               >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!--
+    <Connector protocol="AJP/1.3"
+               address="::1"
+               port="8009"
+               redirectPort="8443"
+               maxParameterCount="1000"
+               />
+    -->
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>