From 775f2128ae67ca697e3bad76521a594210cdb642 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <woho@hottis.de>
Date: Thu, 16 Nov 2017 13:02:00 +0100
Subject: [PATCH] use log4j

---
 .classpath                                    |   2 ++
 .../MeasurementCollector/ADataObject.class    | Bin 1642 -> 1821 bytes
 .../MeasurementCollector/ADataParser.class    | Bin 651 -> 830 bytes
 .../MeasurementCollector/AMessageParser.class | Bin 822 -> 1001 bytes
 .../MeasurementCollector/MBusParser.class     | Bin 6163 -> 6233 bytes
 .../MeasurementCollector.class                | Bin 1818 -> 1999 bytes
 .../MqttReceiver$Listener.class               | Bin 1355 -> 1355 bytes
 .../MeasurementCollector/MqttReceiver.class   | Bin 3678 -> 3700 bytes
 .../MeasurementCollector/ADataObject.java     |   5 +++++
 .../MeasurementCollector/ADataParser.java     |   4 ++++
 .../MeasurementCollector/AMessageParser.java  |   5 +++++
 .../MeasurementCollector/MBusParser.java      |  10 +++++-----
 .../MeasurementCollector.java                 |   7 ++++++-
 .../MeasurementCollector/MqttReceiver.java    |  12 ++++++------
 14 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/.classpath b/.classpath
index 9855d06..566accb 100644
--- a/.classpath
+++ b/.classpath
@@ -5,5 +5,7 @@
 	<classpathentry kind="lib" path="/home/wn/workspace-java/MeasurementCollector/libraries/jmbus-3.0.1.jar"/>
 	<classpathentry kind="lib" path="/home/wn/workspace-java/MeasurementCollector/libraries/org.eclipse.paho.client.mqttv3-1.2.0.jar"/>
 	<classpathentry kind="lib" path="/home/wn/workspace-java/MeasurementCollector/libraries/quick-json-1.0.2.3.jar"/>
+	<classpathentry kind="lib" path="/home/wn/workspace-java/MeasurementCollector/libraries/log4j-core-2.9.1.jar"/>
+	<classpathentry kind="lib" path="/home/wn/workspace-java/MeasurementCollector/libraries/log4j-api-2.9.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bin/de/hottis/MeasurementCollector/ADataObject.class b/bin/de/hottis/MeasurementCollector/ADataObject.class
index fe44849c155f5373139bb4996dd5dec5419e0e75..e02d929d8d64810a66e46e7eccf0a6fa7373c7a2 100644
GIT binary patch
literal 1821
zcma)6+fo}x5IrM=B;>V?1;#iw0b<A2Eo?40b|Qjfa7-@3aRrxLc^qIYmXfrp)yh@*
zmi$Cg6>uu4$_M15QaL@d5=0_4FFQRwr%!jE>7Bp-`QtADtN1R9ltOvm_y=Je2R(n=
z=w3fEZPST2!&b}e#bM+>daPsp{q7-mS)>)F5A`eUw{)lJJFh~f6*ikDQdq8sQPbC5
zy?0=IaRx+jT|M;c7E)7~ii5W4#k$>9xL&tp;vry9x0uU3=Z?5^N4Jea!9i@koj4*P
z&oZxct8aP=m)&VU4qE=U?h5@*(Cp}#Z7AIP@9Ek&)hUl_rnWBhYe6T7*A-TZ4sb?+
zry`TGN(~mh8Sa}rCNSgSGG-Mfils&#bC}QKn!>F&$+N9Hnkss@j&~F;Hck9P7{*RF
zh89b26?X~>H$6-uBi6efvdD?G<Y5YVQ7h<}r~US>iJt4-mQ`0&Z|EqHed0{V2LZLM
z*3Ul~B7D!pjpSMiiEhJt5p5ofIL~<<rG~Un@^As3!kitGVZlFj2St0-%hvzYj?FCP
zIvLdA;8@hj{M{I!&bVN9M9M)&R|d#oOA7Z#edp{*AxmagXD$w1aar7BccUe5^k2R-
zQJz2ROb!ne)SB3zd#GWJbE>;t)7j@$CDNY$OUC<mWVIYP*{SN1FnuXZk46ZRKjD7~
zWWF~&e1d8YU$LfjVcH~TZ&zV{O!g$LLVhRgM|<W;Ad@$J>Rnlpw$sbJ<_SJbY0Sz9
z(@Mzz+m+*MSIz)Y7p;AXr<`d_^LvG!ec~m4uKXH>^6$8Mgd63`5f;kTBP{-EW0vKd
z>|j)yoEI25jRLM>2Jg|k<QQ-Zx49FnRG_RSHKb_2k2_pl4R>wkXWXZV$w<1QWSW3v
z61>ZI&9cuq)Q~+RGfl=aQL>VOo=Z@CW-F+2ukZm@_?7;Au7a5?|AvKMXryeCjCJ0$
z2^`5}l0Y%!L!w-%AB~X|M@g2>B>9+?j90KY8hrcAU=B$V{4*;NIkx`9>W{DSX}wao
ze~iywRM^g<H40x0_6x^&_@Z*MFCJsVK_1)X7*9^p-{Ip16nRf2PD2^<)NYY!i`34i
edNqDGD1_XvyMe7lpd21z3tzK9g>S5&-~J2Ma*Ut=

literal 1642
zcma)6YflqF6g|_HzNi$+Ta=dyeIV-t1O!pQ$QM8p2!xMY7|N1%+q7E}e~W)Y6M;k%
ze}F&AcxGl>u*HNlnYnZ4-gD2rbGE<#{P+c64r>tv1hU7{IxTyiQ?s_EU8`4RNxI%f
zxmc7(Ub$+my|+F4WB!b%2toqgXZE>m6>Ya*8LvRhb4s%2*`<oW@Rq(;9&4+7WEYt(
z_jp<s2)TAi3ZzVkhS>G0j$7be_}nhmWlbPyZtI>?w6^UEuVTAS!L>ay6PW+^cBLKa
zhR5(*URCfbj_Y`<0<&ooa0|g3nLe$|K1pwsk7XP|^dxW(DS==*vmb*%UjiKnD{CNu
z2%?I*<I0_SDKD#gcD|@vRU_E9tByMR&X9NNu+f>VyH8$Cp(ee3e?}?4iRO?L(Zv?$
z9cN>j8A~9BI9t(g)+GG7(jc8ENKf<M(Qnw7&a{t9Ku2ARVWbgt%e2`MAsZd_G$NZV
z2`sew?%0t)gvf?x)GM2}j3CGEuC;5t>-CcpS&bu$o+xGo#EP<?CGZ?CC>py`k?t{{
z${+1b$+q`zz?P$!69~+VE2LKnX`uzcm*sx}l-QOM$Y3%GKD<~}NK3@5<pqY?#_pFD
zi0_u`)g$@AQOfJS@!ig<wnGzCYLFj(5CJ7zS^*_nz4PsP+o^3OW<jZUaZS>5$T*dk
z%wC~8o4Y`7cIE>8-*oUG*AzlrJGm+msl+Y}(KBw+FpT>=5kQv}+ERrBEHHux+)d$!
zy4)w81B?l)QlqL$5UNUCdwYnH(&z&ws)-&}0w&@(V-wtoKo2ecXH8&|XMsm}%vCjI
zaaS=N+3)E6N+Y0)gtc=}7cd|legT0em|~QnI^6~`+6ppqD@dA5+8Ok>CXd~kOhx#~
zU&uraY4azthgbY7$)%oN!aB&YoqlbkUN+9XmzY1uU7trUv1meG>+KRN*X5@;GjL8(
qPAbWkhuHKOrjh2)q9m6o#dYK~J@W#a{(z!*i#J#$K|xCm^xa?B!&kHb

diff --git a/bin/de/hottis/MeasurementCollector/ADataParser.class b/bin/de/hottis/MeasurementCollector/ADataParser.class
index 927f512a985d32a3e2ede1141ec70d718b76b871..2b080410392b20eba5abeba9b4d8e79d974f020c 100644
GIT binary patch
delta 350
zcmah^u}%U(6r5e*;Fdk$08v3fq=BQjhK?Vgz(g(VFM3%ZgfoPm53u4#Oel!Pf)DVc
z46{eCdC9z)$(#4`-m?cs{rr9(01VOHs`0>CB*w%mfzBjZnJ{{bUZ!zq&Dqk}KAeY>
zbY!%B7;iic7e#@yUjJF4j7ko^K=-fceYA{tL8FSAfM??MQ<AJtI~ncu|2^zNpstaH
zqb$AD$RWS`coiFonzi{(#(M0M11=P?K=nv1+5O-XI`~3qkMm%#$Hguky&_f^1xmyM
jtIYDzpi@5u(Zn?sSEL6-M&Jf5u5Z)xByLGNq!M>W>ykjV

delta 171
zcmXAhxedZV5Jlhk#Ot-W4RpYfQiJ7)kP2vmhysXQ3PK2pzy(kg;$wpSJ8$OAbjdY#
z@6W3P_N-dhw3oWdJt^J@*PCO8QF>yM`@v3jHliQM4>U;`C^Jzl4)nY2Q*Za6xb@CZ
kSrRI9ZF;!{BT@CY88Z=SufJ-MF=eKkbM*pQ#-gv5UrBKeoB#j-

diff --git a/bin/de/hottis/MeasurementCollector/AMessageParser.class b/bin/de/hottis/MeasurementCollector/AMessageParser.class
index 97125cef695c3f010942100fc5c9a81769481dc2..86e71a697dc00c63f358db475728216ed0bfba24 100644
GIT binary patch
delta 477
zcmah^OHKko6s(3}kg-v|qM#t+XQoFp8+IN++-Tx{V#tUwj3Fet;|#=$XyT}G;Q_n}
ziDxiY_qf(gSH1V@)vJE77kTIN`~3qzAO74q@$H*9iiQ(`?jW8-L3kTpUJV1?9E~H5
z{p(<0B**jfuUT25h>Aeg^)4LLu$D(%p!e76X*dpfL85_mfnqeAp2hJr_2jDS{d>3o
zfu=+bc3aa;i9D7xYfCIcYPKy=fb%dCi<!k(l=6!its`1`W{_%PmJ3C!@LgqfN1a7%
zsaKTL8>$I5l%KFZOt7Vn5_Fz8&Y;V;X^cx;aCo|m5-O;p%6<(yoGaWLFZ8g>lCCC$
uFic<17^d^+6nohJO%V{aDyN>&dL&8j*{0br-ZB-W)|S8lT<QcoqgFqGcuCp-

delta 298
zcmXX=OAY}+5PkDEqZ#A>|LkbQ#x3mKz|I{cZXhl~Vn{3;z)i*>#H$|Zr0P}m`&1U(
z{pkIDz5uK-IYpb(@uOpfA}SV~>1-RqLRG<oFQ~2%A`;Y82v9hOc6M-J%Ren#*_loj
zyF+3TinYXPPoB$O*AJBSJVl}xDQbF|qH*QkMvJvcFHq%D7gAT|t06|4Tb=9CL6;Mq
xBzH%9ff8vOBu7Ye5B-1iid|Tqz9G2~<XOI1R*kn@NkZ=JS{Pu+*}}-M$3IIJ7XAPL

diff --git a/bin/de/hottis/MeasurementCollector/MBusParser.class b/bin/de/hottis/MeasurementCollector/MBusParser.class
index 1bdb0468363241b54d81f05820c46af8b2641ce4..51e651c934c81994c8c40c9f0887fbca4e6e31ae 100644
GIT binary patch
delta 1889
zcmah}dr(wm6#t!Nckf;9T^1Gr7eN*^k(Y}|J{GMerx6vEW>Pb!X0CBX3>I7#CCjjf
zmAy<qEwp@PiI!HTt%9l8%Tg=Td{sUxEweOxr$Ogi3;wBTcIUfi&-tClcYeRSBJW6E
z?5@`4Z2$_WK!JsjDf+n5*83WiLPD*MX_!v1S5%dinL$E&aaFL)XH*-vPd0thSso~p
z&w?qw;s~Tr!JUL8(V`{^uWGg5rQ>eQ6j|!kY8~oz#ABAIv?ZmFRdF97)*Cd-%4<Sq
z&@A;%stS6eQHKX~%*KOanOZpFVS*(m;vA#lQ9Q2TF+$q^jG*HQ%pzFJ1Cy#W48fB+
z=3%}_aU|0M(cdx9@su3nX+oB0C6Aczh^IvxRyn#@?5|;?f(>G)=8bwCVR2R~sNYOb
zE6tEmYJ?08%^0m<3&A<Xm}dBDL**5|kw&$Ot=ukPRGKQbvn8=Ac5r6MtT4-hMx~0k
z2*ek82RjwKONfgUs4#eY!vZ0bcdO$)yw54sMzF?YA0e?<@f5K{PjKwU2MYEOQpI^a
z)u!V^d?b$Q`RZ<btYaVcizMf8#{nEtaFCE8C@#Y#L7CAwfFn9S#b;u<Gs}Kd$1xli
zd!4?xQ#!uDmjqj+8=+9l)4U=tCN<?WzE*IC5YutPVkSt(H#jTGV|wPE!}kilBe**N
z!<auKRK-^~kD+oCW?e|Z4|2gQB~hi=#EBTYTQc~gj-T)|H!d|N)|QD2G08p7;a45M
zVLm~bY}Ab6Tn7k$=*UOkXk13Cf<HxXSN>qM;W#16C@ocq2>Ok+X07S1DW75bd9#-(
zN+&DXxW9BUuvg|VmJ=x~CsM@{S6V(#K+$r7St{v#$J)RhfvV{NucXfJmC+cTToLh1
zH-Z6`;>3PewpK^+vPLIDt~lxJBvNBN@-mdDQ<4PR%wVu8xS?O{J|drRxKpf474ojk
zbW_G**bvPxS5wwT_`?`f+=zzkCR|TwLD9$@w;IOqMVKv0;>V6=NN5Y{#(V6WF=G?%
zao-!p{T?eH?uVph<0FhYO?bott}&OexXo;Yt9T0rjCYIdO<1^nJ+BT}gSBW77vrz3
zUyh#qs~`XFk98P;&F~|a5!KM-ROk&KKUJ*2Vm!mS3Cz*6u*1UssaS%gh(ZA>u#A0H
z3`7~0vt`3In8-PH{@j2Gcn&L}U<^j!dAz{YCUd7%XoRDln`&6iBM@HXMqVy=rP)jD
zxstlJJ#`(&US^aB*2~Zo47r2_ZJbXEgZXG+6R+S^J`;c_l_!b;XfQ9XdrlbZN9DRV
zHKEDEyKQ#AA+2<|X1_Jpy{+Bf^0!sww|Q*tH$_Q88oe#56FS%L@~a-^W3S)gafI=S
zJP!M#xp<Z&;qyh9`j3601%Yf&bQmZ7nn!EGR|LPa5y>8B6TX$yUhwOZO^@D$ixx=t
zFOscO?EKxMg>h+|3`?@(2~4&0j|r0{Om@jIIV`-rK^+*4F%cz1qD~p@I;tZa%i-KG
zxg*g83nD6@u9VIyC`lYqzXvzrAa2G9jAwb=LQ$ANU2!XQ!)-JOMnn+}aLHZ%tq8WL
zGkJK^(n@BYEpSi*b)gid(2G`VWuKK*b%s*evf(-$<C;s^9*RShMqZ|MIJ!|fb*pDy
zr(rd9rygw0#0t8KdcuJ@SV$Svi(im67)P0GY1jdcvM3um50@NKPE<rWi9Em+d`>$)
zm+?|BbD^|hBpfUgg?cL}QqUYZixkRJsLu?(MPeID5c6LM1-lg-P;i>RJomW>zMs_K
azgKL>ga4FL5!H^1$TS&5`8=0}`u+u@%)&YV

delta 1803
zcmZ`(X>=1+6#j0S<V})ETT;?81xf&c(uGzwA$SDgcxbU892NzS%6K}KLYwxaDN7Zq
zh_Z-ceSif;Hnrf+Hc*xV?w}}wh^TA|ii#*Iifr*t3gwTUlf2xy_q)rx-#0mwD|6ku
zuWW7r(4Df^xVMSEm6#+jk&rlEpQz`Q=%J#V;ZrIiMyZO)m_mpvtBer*1+j2(S<cXK
zaVRo85;pYGJ^~NQs7P~8RWS|Kvc1wnslp>Fk}zG4RZ`PtaM?iEC@SW9VWTkcKv_88
zMim}cF%z?7t<tCe9D*$?<{at9lb9#)6d~z9nyGji(+Q&7>R%G_U;v&`Au(U3xl(DN
z?Ct99s<m1#B4o%bq{;cNBzkV$DpyOJb3IIf4RV(!5VsMV<Y`a$>dgeD)QISXdPMhN
zEA9~3M)1ZuS4N6Uat7<=3bqsMA-&X4u#+tdtKc2Zj2I<GQCKfk@E(D9{tvKA;6p;Q
z>ubypMT{aNtYSAl;*@edTw$<}kepsHUM^Mru08lv;1fb?c~))hP_Y-E$)jplWe@hN
z_#6kM<{jibh(iKj%3^PpcP~1-aS&gt_y&jN3U7w<sET7aF86tJoF`PA#P?Ff=e0V8
zp9Fp+#9zNn0dt_@XPlN3;yY%a!EXY;5`5PI`Am@>DdTa^VxV<vV{$~`4{Mo;z6`fT
z&N+*NzvMA*O2#M;&fvU?e=wgp8K+kaVYmx~iz>RJn;VxA6}Up^Qj^$5j!8)DPrz|j
zlU`V;kd2@Yt28Q&Kt*wt5#;q<Cc8=wa&lwK#lZB=`79MuSSsWqv`WvHw<e~hDCFUL
zRfZ;n$|i*Z7B#_uLSA`3A=6Vu2^Kn$kS%kS4zeLZSy!64k0@RC^R==s6Qr#i>!VHw
z;DDQ70W)Jgf+lV*sKbKHdhm!lkT*EXr<fSDh$TETX;i^lM7E%6wC3D|hc@D2-=iiT
z)9ifsW?Pnn4--$An9Buf2#cfR>X1;d1-(Z57G!S3v)kA3Qh=AS8jEFC^S;$f(2<{d
z^7Bo21--BVL1Z(c93E>VbU_aPDtH0UV+rT_F^g>{Z0rwVDV8A)-BFC??6adc3bBGM
z2X4WASjm<Xx8W|lh?gKR5_#OKj;oDB53J&zu4-=T;qR+l`ZaD8;Bt-4UT05Z>Kjd|
zZ*uG{Mrp8Lf=6J$Mbtz&p9F*XSj;BYU@f11z;=lziU;UMUTpg;6YGX#`|9hl#m0->
z>T9s9w$_e=_H5sdCjZ-4t-PQ^bNJqsbNp?p-*1NKw3-n!6!I&YvtfDkgeEl6un8Xr
z6^;4X7j$VZ6JJ=zS3x)T%dl8EvIrBd+28I!C{uHr_%7(tJoWg25cJj|Mf29<7mMoO
zgDSJDsV4rke1BW)o#gBbn&*BKm+rhueG(B9Z~0A%Gf6bkU5B1caW}_fnz$BfIixA3
zaxB}V_{LC74CJR4EQW>2w^#4N2<&IN4r4SfU<|)CcatCYkcN9H7kW$>wMej5dQ})~
zQ8V)K!YwO_>9)Z|DmCZ4IA-%4wzJR9;yOafY&p;m2PlPQ<HSJzuW7-x1qPuVrBcgk
zrgtKiQY&iB)>PC|8nuB7voV(f)Rte8)fh(Y*z#Z}6lza5K;;4{F#*NJ1eDAJG~zon
z;X5+klFdAbC<epDY7x{)AWvXx?93C?Sx`n5-y%7Rp@{!Kguotwg94}c!*ibjlA`El
bN%6lcHsOINQW4jLi>WmQM43F7jk5j)PA0f1

diff --git a/bin/de/hottis/MeasurementCollector/MeasurementCollector.class b/bin/de/hottis/MeasurementCollector/MeasurementCollector.class
index 13d4fa5bb92e7a5eff9fd4462a32be91e81ab875..0c7455028cde9280475814e506032cfc738cbb6a 100644
GIT binary patch
literal 1999
zcmbVNZBrXn6n<_9Y)F^VhEjPc7K+-009#w|1rVVrXlw#0)F@W1mv9@F+3eEYO~=2b
z&IFYiKlsrf<@nrP+H_)UW=v*w@45G!d!BQibI$(t_wRoISb{W=5V&`wtYa?>?Z7H4
z88m&>P;OZ897okc&+ocvASrO=M81%gBi*{Sdw4=+fy<S>-OB#c?P6(bXS2K|kSVp5
z_Cw!x>#G7o1<wsa>4sJ5G*t?N0uzlct`|>z?=%n?aJ+h5`2sT~&#znZRMw7_r8jw>
zelML^rAURBr`BqY?b_kGKwmaj6-XAmBbCM#WDHytn0?a~W$8+KGBJW{#93G2p67+}
z-89YSdIA`Pz;zR8ToM>A*{<4YHV&2lSROh`r^BmBrz(A0%NLsiYZ2Zw`Y>r?97Dt$
z9@`9jx%5A{VGfcFX}iRcee&=0>y)Ioeypj}&?XHAZV8OENqTjX!aD*}-6~?5-1#9>
ze+lm)Yv8uP%{L`AN@xyq#AUnBJb}?{H&_Pd1+GO%nxXAj6_T&$M+Ir*F`0&i_YK@(
zTH9y~jtl}5cX5xkN46rl<jEslE#suCLp45HO=B4!8u)-vx+<9X2p=;ontv5|O~0l#
z1D3Cn4S`%Y^syt`vx@F%GmKT~CXZDUYxsnrJ47Wgc46G1nX4N3R3P7r?&l!^)s+20
z`Dv_UQ<uwq9ck>pBX6s@s@8g7VoMj5QS)4vZED~%fyExK9>`F}UHz!3n(Uu#Od9xt
z;rB2s-){yL=?5BN5habVEKvLpguM#914a~45xXWTI-)6G)$JfuJ_pJ(yUx*dqzz*C
zESq)gnb^l;7RO7?_)Oq#wwLS8vI+uDgV=(eNuu=YY|D`@ZN(|Y^b!Qyt~(h5X5%&f
z1QvQBD8Hu8uI_)XnGm?s%dRtNZ1~3EOIBEAz3kf*(rbD@s{d_U&#&=r^I%c;5N0^|
z`uJH%U<~~jpkzc+iZZ7m*L_IA#1Ky|Q@YK!{u#ew_!o@+#AO0+@u^KggRy7_lsFPE
zj4ZzOY5&|ACOS<9BNH=Lzzs}MaS(6gCNG}mI?0on$oHRI_j9N8Ge$GBzv0~k&XGSj
zBPIEaXkjsvYGJ8`m2<2g<j=5Co^PRWj%})ZzH^S^L4M&34_A`o$rg6z_4831%^c$e
zhWWgT4FA&@MGn`oKzz%Xzy>DSkT>v<*mRIfF&2D@Dy0lo@D;u$)*NPWfNzL?nTdIV
UZ<)ajX7D?FAI0*N+6nyd58aU<{r~^~

delta 714
zcmZvaO-~b16o#MMnbI;H+M#?Eln((ZP@pRH1E>{j{Qv<`6s?+=ijAo$Eun*nEB=5R
za(8asxNxH;ZDJGS(zwx$f5abPJgp{dT-<ZdJ@-BDc_wqehh7J*Z@)i%1`<3vwBAON
zg;K#yDU9)nErppbKh0Yh1oaa&qu;2a>d}s;JJU)p$9(iDoaeb0xp*;GdKTY&S#k3_
zHpl4~gYv$s=vr-F7s~OCy+X;|bocVPodrLGihk{woqEyJI&E=+5g)^fj{m4_MmeeQ
z?KTXGC4J!OOGXu)P3gW{D2jD?H^1i=@)e6Qf)<lZ`G_e(M{Mb0u2Qj?W=8+?#9K~r
z#>Z)G8GXhq2^}>u{xQzkoachB7^CLAB6jEu>AKP8pCf5waZ&#;1|oA@vRNb`K-=X~
zDZlOdxU85tbO!Z1GZe5`BIx6aVxrOi*bLYit~L6vE0)J~&fBeDnF)V}6`LCb^jC9O
zCal@4bMxabv#1Uf5xle@Bjmq$@XJzS5Rhm~B`&*?-8)&M?R`@clGtdFB927+U*1kw
zPOWs%DJET#n{w0LwD}^rS1KzXh=d2K4AmLS))+rnjfGW}iLk#)yvo@+bJ<vpg|(?F
zsX9xdNw3$*WMk7cuFjjiW|ifsMqE9DnG{}R`DK(t8v_!fv=bAQSpi82M4BF!<sCJE
s6Ms?I;8sG84)fe*Q&^*naEH4>KP&Pr?#W|JiRpc^&2M=iY7Y<p0M1Z+1poj5

diff --git a/bin/de/hottis/MeasurementCollector/MqttReceiver$Listener.class b/bin/de/hottis/MeasurementCollector/MqttReceiver$Listener.class
index 5eeadad797dc76f70284381d2c0b4c98cc211327..a81de45056a222ee853c97f1491e6968a29bb620 100644
GIT binary patch
delta 23
fcmX@jb((9#Ru)F7$=g^0SY;R_7-T1NvpN6(T1f^4

delta 23
fcmX@jb((9#Ru)FF$=g^0SS1)F7$hfivpN6(S=9yk

diff --git a/bin/de/hottis/MeasurementCollector/MqttReceiver.class b/bin/de/hottis/MeasurementCollector/MqttReceiver.class
index 993fb3db03ccf34ea06f2e816c8ce81dfce2946f..e5f3bd1a34a0df2e7d0d73edd7b114f0ac0088b0 100644
GIT binary patch
delta 1686
zcmah}TX0iV6kR8e-kanWN(!X~EL2*WC!tUaGzCplY?YR$7E1-WZ9|(Hb1_LlM2({2
ziz@X9zTf!PQPielXXMA>!!N)6V21JAKfl#=Zi;qv1}8aZ?|sfb`>eh8KKIIs-&a)q
z^vCx<0BFS*8XN*)+2RgQ#cRVA8EbSjl@n;_wQ{2|^N2Y-mWrvxbaqt9*6~=c?Gm5b
z-7b7nr<=rrsjr*GqN!h+#o})q;;bk(8EC*70cRlC??nJ14MBm`*9+KZW=-B}AdHAW
z<!Gv~$Fd6Ln|L%3{9ia82&^^WMn#2&bpov_C3(Q%S>Qzs>lLI80_y^@#Sv+Y2m6)(
zO$JtCm5z-9o{TkYX2z_1!Hdm^YiO5oXPvVHTjV}xpK-H+CD3&w$c((|UMzofF7hM|
z)Iis;O<r-fE$u>+irHgeDQZ=a+YNMJy9~R+dKdZ(?7&WW&=n}|#$FA31ggf(qh>5)
zlGwe49QieH2ksQ`6|Cf#nM>qy=5Ya6AUK%xq6_;B+=T&d=Tn7UW<Gz+%8dxP1B1z6
zzlK49MRvT2LOK)cG4o@6<`FOUmq8sgupBD{7WSsI((S$|?v<C^32~nk6>EJNSc;t^
z0?qP_RxeMuJasA)R-+EfyvU$nU<?xiZGm2S)!DM0^yxT8(vns-n;I^pMtnGq6B-^A
zSb4oN+a-PoJDFBGd)U(Ph|Fkp`Zyj{2p*G@TFmvhK!mrfmcMGJDxSe}8lIJwzTSBn
zlk&XYsPD%M2F_qg{;VhU45WdVa8@q&3?^O{So&{HJ15eakyK8{s{+Q}iJ|;(E<KbQ
zX<y~VIlQiJ-Kn%U4ZMZ7<%}m@a}Mtscn^~Tdci6eM#p)ndw(nXuvj%1A5JYa=;X*l
z-2pFcW1d|}d*M90inf2AT}_Ma#It_YLAGSm*s(~tEm<$dzroh)>BmMb(r|IH0XK49
z4G0Hq7gw#&3>rh<p?Mn7&@5sDv|Fap8VdWp{<ab}O=BzdO8+gk-btUXff?L7jqb3&
zs)XD6!v1QC9g)je7QKv`(6{K0l+deWw1izH^oM4P*v~_EPvgJ^-s!|WoZC>zxtS>Z
z@S%ylA0V<IpIiv-e9Z|&(1R#;VJ+J?hGDEn78`Jgr$S}yFfl}nS#WoRnI-6(A}tP{
zY{p?~PK<KDxCG))`nWU*4VyLW=AY|=-MNO|Y3hofam5Xb>gF1-naO4bn8;R+&KYE<
zaX&RRx=YAYMEyrE;sFOf;`^Az_<;Z6@C=HVE-)0BN(3j%$rf1}Rs4;p#wOJBi3gcu
z6meQx?2Ky4H_l}gB_mJZNrqAA`Jv5dIO(H#3Qzq9?w5q_q+1UG9SE23G{^J%6i{VQ
zww8)`QK6m1xdHzxGk8sHl<-Cg?_7i5XTyI#@(=t?L^lV24t;_Z>tu5!iMoqlsBP%x
z?+~wERR-{PJ$mo~J|x_ZxjY6P*An4VKk2K|$=Ju-S8O*?D!SYX{#R5Sc6(IVi;Z@8
VRSX9{vFA_m8KsxIF^<oHzW^i^Ng@CM

delta 1659
zcmZuy>r+%^9Dd%towLhPVL`k^3IVe00&56_5E-tUT3{%pA*CK*gSB;6cMm9CT<v1n
zonEc1tf<T`cJabt%$e$wA8MwlPkm^nrazz$%{1doAGGH^>y%9mv-`WezuWV>EPqt|
zTv7bZ<uASj(1LRsTmljKgEunOxp3-0yYNq)uNB7BFLh#`)I^;Ko{fs5B3Nx;DQX1V
zq591lmI<^dp9M8N$()r)C$a(5BBX5U1(t{8_uj_p`pteYwt?%hL`S25Kb09aQ)8K&
z6+jd>YFI9RaxZc>V}-or?loEsl)|UuCV?t>&{rl$JSF~>2Fl>m&?)zO+7@)6TE)D@
zz<iXeAh#N5Mz{Rd6VW>mGq476dD#=nuf=)|>ja8-niFO;Wu`}?{Z=-a9yM?~?hq)l
zGO;l;+nvptlLDSl{a`GB4)hw>fIIn|OIUqoF1I(69TD(`24f2KMu8G1-nf-aMc0|R
zv0ig`0DXm`?lQ0liv{NOB-8SQ_q;IWc3-y`meal_eFzEFocraEzNWG<0}HS)fFbNO
zuni9gw1uQ8R^(O3b|Ir7{qM>r+2dUXc4H3*kQuiG=Jz;-Bs0-IqOyoBVeabGkrNP2
z0gPj>h6#bv|FJT#4{?IptsGSm4;pv~4-@oIG8fCF(}`g#LDZb|RuyT#fxMc$<~XF%
zIu3G_e;X>3$COE2#}fi&y?ZQcQ(`!goJeGwh6~{W*nuY%{-@-u7WF(W&>*KpwVb0L
z^1q0eG)xIJN>gw28jv_5ztd~<KD=z;6}&3{)MISlYX)A&8#3-66mQCDe?`sP0!IJ%
zP;NMz97>FIR0ePy@2DJc#l2_X1m2gw`a8>y;{yX9;)sB5WeQ86<73$z_$?p6LU`fh
zMrphT7j(*jYvdxzbFPu+QZBwmE<sSOEPaD&OC8F^bYgMB4&_cT{&fytK|3A;c@K3<
z^Qa`LqIii459wHV7B_@1pmu;v-3-FvNKg+p*l3zT3;Cj8o5Q!$rek0hH_xCe5}a#e
zRc|C%Lb9RZA{IAZM0xley6CrB(MB7$+32B9AAL5>p#L;;xskt{q!|XktC_xv*lJLr
z4jId^0(Cry5V}#1^$24lBDfb#80FP%rboC?Ft*?xN-P}%*h)AZv>9YCT=cA?hmVQw
z<NJJwD-=B%godbwwHkP(pvN|5bzwVs)s-DiL%!x*T-0o2(L)0S(ZWyrEJkK9N=|*c
zY$Q*j=nPW9tPM+PZA>1!@;fy)9#Q%OHXc36gS>zp1Hs25vpDqCX{G>6TZ6;MyP-M|
z=FCC7rTjfyf>!2lBj#3W+Od*<-NY0}C-1z=L0(>{>?-m&itr4cWmtvM4^Nf0Rm0&T
zDxSmh{{eQ2Al)>Kv)+7v#KsH!9NnU-R|09+#xWLu0mlb|Z_Q#_scpP#<75F%uY=~J
zhJVnsve3hfs=zFE*07svyPBhn5yl!qi1T}`Q+#D1yHk9I_Ix^pPgv~At2kT^4*px%
wr%)8@_!OV<S#4=8sp_7WRrY^Q#^t0`_XAWq;nmDsD7>A<8A<`ZD#x?HUjha~7XSbN

diff --git a/src/de/hottis/MeasurementCollector/ADataObject.java b/src/de/hottis/MeasurementCollector/ADataObject.java
index 1464a8b..5e99256 100644
--- a/src/de/hottis/MeasurementCollector/ADataObject.java
+++ b/src/de/hottis/MeasurementCollector/ADataObject.java
@@ -3,7 +3,12 @@ package de.hottis.MeasurementCollector;
 import java.time.LocalDateTime;
 import java.util.Map;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 public abstract class ADataObject {
+	final protected Logger logger = LogManager.getRootLogger();
+
 	private LocalDateTime timestamp;
 	private String name;
 	private Map<String, Object> values;
diff --git a/src/de/hottis/MeasurementCollector/ADataParser.java b/src/de/hottis/MeasurementCollector/ADataParser.java
index ea955dd..e69995e 100644
--- a/src/de/hottis/MeasurementCollector/ADataParser.java
+++ b/src/de/hottis/MeasurementCollector/ADataParser.java
@@ -3,9 +3,13 @@ package de.hottis.MeasurementCollector;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openmuc.jmbus.DataRecord;
 
 public abstract class ADataParser {
+	final protected Logger logger = LogManager.getRootLogger();
+
 	protected String name;
 	
 	public ADataParser(String name) {
diff --git a/src/de/hottis/MeasurementCollector/AMessageParser.java b/src/de/hottis/MeasurementCollector/AMessageParser.java
index 2f54681..cb2f055 100644
--- a/src/de/hottis/MeasurementCollector/AMessageParser.java
+++ b/src/de/hottis/MeasurementCollector/AMessageParser.java
@@ -3,7 +3,12 @@ package de.hottis.MeasurementCollector;
 import java.time.LocalDateTime;
 import java.util.Properties;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 public abstract class AMessageParser {
+	final protected Logger logger = LogManager.getRootLogger();
+
 	private String topic;
 	protected DataObjectQueue queue;
 	protected Properties config;
diff --git a/src/de/hottis/MeasurementCollector/MBusParser.java b/src/de/hottis/MeasurementCollector/MBusParser.java
index 147ff41..529b41f 100644
--- a/src/de/hottis/MeasurementCollector/MBusParser.java
+++ b/src/de/hottis/MeasurementCollector/MBusParser.java
@@ -48,7 +48,7 @@ public class MBusParser extends AMessageParser {
 					ADataParser dataParser = (ADataParser) constructor.newInstance(nameInDatabase);
 					
 					dataParsers.put(nameInMsg, dataParser);
-					System.out.println(dataParserClassName + " registered for " + nameInMsg + ", " + nameInDatabase);
+					logger.info(dataParserClassName + " registered for " + nameInMsg + ", " + nameInDatabase);
 				}
 			}
 		}
@@ -82,16 +82,16 @@ public class MBusParser extends AMessageParser {
 				List<ADataObject> measurementItems = dataParsers.get(name).parse(timestamp, dataRecords);
 
 				for (ADataObject ado : measurementItems) {
-					System.out.println(ado);
+					logger.debug(ado);
 				}
 
 				queue.add(measurementItems);
-				System.out.println("Queue size: " + queue.size());
+				logger.debug("Queue size: " + queue.size());
 			} else {
-				System.out.println("unknown name: " + name);
+				logger.warn("unknown name: " + name);
 			}
 		} catch (Exception e) {
-			System.out.println("Exception when handling mbus message: " + e);
+			logger.error("Exception when handling mbus message: " + e);
 		}
 
 	}
diff --git a/src/de/hottis/MeasurementCollector/MeasurementCollector.java b/src/de/hottis/MeasurementCollector/MeasurementCollector.java
index 1f151b6..8feeaee 100644
--- a/src/de/hottis/MeasurementCollector/MeasurementCollector.java
+++ b/src/de/hottis/MeasurementCollector/MeasurementCollector.java
@@ -2,12 +2,17 @@ package de.hottis.MeasurementCollector;
 
 import java.util.Properties;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+
 public class MeasurementCollector {
 	static final String PROPS_FILENAME = "measurementCollector.props";
+	static final Logger logger = LogManager.getRootLogger();
 	
 	
 	public static void main(String[] args) throws Exception {
-		System.out.println("MeasurementCollector starting");
+		logger.info("MeasurementCollector starting");
 		
 		final Properties config = new Properties();
 		config.load(MeasurementCollector.class.getClassLoader().getResourceAsStream(PROPS_FILENAME));
diff --git a/src/de/hottis/MeasurementCollector/MqttReceiver.java b/src/de/hottis/MeasurementCollector/MqttReceiver.java
index 42491b1..e7b6b10 100644
--- a/src/de/hottis/MeasurementCollector/MqttReceiver.java
+++ b/src/de/hottis/MeasurementCollector/MqttReceiver.java
@@ -4,6 +4,8 @@ import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Properties;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.eclipse.paho.client.mqttv3.IMqttMessageListener;
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
@@ -13,6 +15,8 @@ import org.eclipse.paho.client.mqttv3.MqttMessage;
 
 
 public class MqttReceiver {
+	final protected Logger logger = LogManager.getRootLogger();
+
 	static final String MQTT_BROKER_PROP = "mqtt.broker";
 	static final String MQTT_CLIENTID_PROP = "mqtt.clientid";
 	static final String MQTT_USERNAME_PROP = "mqtt.username";
@@ -50,11 +54,7 @@ public class MqttReceiver {
 		try {
 			client = new MqttClient(broker, clientId);
 			client.connect(connOpts);
-			while (! client.isConnected()) {
-				System.out.print(".");
-			}
-			System.out.println();
-			System.out.println("Connected");
+			logger.info("Connected");
 		} catch (MqttException e) {
 			throw new MeasurementCollectorException("MqttReceiver.connect", e);
 		}
@@ -64,7 +64,7 @@ public class MqttReceiver {
 		try {
 			parsers.put(parser.getTopic(), parser);
 			client.subscribe(parser.getTopic(), listener);
-			System.out.println("Subscribed: " + parser.getTopic());
+			logger.info("Subscribed: " + parser.getTopic());
 		} catch (MqttException e) {
 			throw new MeasurementCollectorException("MqttReceiver.registerParser", e);
 		}