From fef63c3f834cff8368c51f2efc10e710325c9547 Mon Sep 17 00:00:00 2001
From: marcos <marcos@sticcs-spe69>
Date: Mon, 7 Aug 2017 16:34:24 -0300
Subject: [PATCH] Fix AlarmMessageSenderImple configuration

---
 docker-compose.yml        |  16 ++++--
 pinpoint-web/mail.zip     | Bin 4213 -> 3959 bytes
 pinpoint-web/start-web.sh | 117 +++++++++++++++++++++++---------------
 3 files changed, 80 insertions(+), 53 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index bb46547..f89c159 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -55,6 +55,8 @@ services:
       COLLECTOR_UDP_SPAN_LISTEN_PORT: 9996
       CLUSTER_ENABLE: 'true'
       CLUSTER_ZOOKEEPER_ADDRESS: pinpoint-hbase
+#      CLUSTER_LISTEN_IP:
+#      CLUSTER_LISTEN_PORT
       DISABLE_DEBUG: 'true'
       TZ: "America/Recife"
   
@@ -77,25 +79,27 @@ services:
       CLUSTER_ENABLE: 'true'
       CLUSTER_ZOOKEEPER_ADDRESS: pinpoint-hbase
       CLUSTER_WEB_TCP_PORT: 9997
-      CONFIG_SENDUSAGE: 'false'
+#      CLUSTER_CONNECT_ADDRESS:  
+#      CONFIG_SENDUSAGE: 'false'
       ADMIN_PASSWORD: admin123
       DISABLE_DEBUG: 'true'
       JDBC_DRIVER: com.mysql.jdbc.Driver
       JDBC_URL: jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8
       JDBC_USERNAME: admin
       JDBC_PASSWORD: admin
-      MAIL_ENABLE: 'true'
+      BATCH_ENABLE: 'true'
+#      BATCH_SERVER_IP: 127.0.0.1
       MAIL_HOST: stmp.test.com
       MAIL_PORT: 123
       MAIL_USERNAME: user
       MAIL_PASSWORD: pass
-      MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL: smtp
+#      MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL: smtp
       MAIL_PROPERTIES_MAIL_SMTP_AUTH: 'true'
       MAIL_PROPERTIES_MAIL_SMTP_PORT: 587
-      MAIL_PROPERTIES_MAIL_SMTP_FROM: test@example.com
+#      MAIL_PROPERTIES_MAIL_SMTP_FROM: test@example.com
       MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE: 'true'
-      MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED: 'true'
-      MAIL_PROPERTIES_MAIL_DEBUG: 'true'
+#      MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED: 'true'
+#      MAIL_PROPERTIES_MAIL_DEBUG: 'true'
       TZ: "America/Recife"
 
 volumes:
diff --git a/pinpoint-web/mail.zip b/pinpoint-web/mail.zip
index 4263a5b54f644ebb6aa876ca58f20de2790608de..851516bf54f1f3cb8ce967a2b9430270b6c24b3a 100644
GIT binary patch
delta 2749
zcmaJ@XEYqz7M|#3bR#;W_kNX&N%Sx?dN(PI-UlOE48lkdZFC`5jV>6ymqZI9dI%vT
z620dt@g(=HTi#vkoj?2RwZ8A{z0cbFobQPHg!6?H0imM?DbAIE>!*z)5dLYK2xNZR
zEdqJMNE1?=0HF#M;XP8QE3JyV0to=%i1Q-U!OZwf++<Yc5g_0V+R0PSd$bs=pqR(3
zF4^NA*OeB>HxazkesYI1Gf!4Z<p88|K-ebLWi?37CyiE_)@wakR6SX!TkD;f*#Q81
zkRUW8&|uc(y^K7Wpsg~CD$<%|9<TDCz_N%<xL0?BVYSY*sVa#PWn0OlFPEcB4gwQn
z;M1&ZKvf4z-3QZU^*qa^LZ(vdH|#`&U~_|oAuddHIfdKBA|%yQ$j~Jr;$^&Tu?Rev
zh>4{ipA3pmVq)`f%8?L1eET$WXOeG&!YK>sB#T;hmts)wPMr1XY7S3@bYj^w>T|N|
zRb<77;4_F+dIquKW8fHGJe~bhR2@c-Ij!7+nS9J&enUI;Aq2cJ#|GD_aGdQKFLnq*
zf*3VphCz`6bLCph#LiWD(pdwIX{^?H^$|h3%WypwiO+7F!toc}i#zNfZ5zDBxW3v(
z)+U^a+j%`Kp5m)){N_nu++>UiBK!Q*@Qu~Om>>$)ei$^xVWK=zc8r@Q6jM*HUAEv2
z`#om^80ZEg;9xnU;lG8}eZ|(&BYIJ~o-}aRti1`bvQ?A^>7g)9Z{L%viHkXBf!RH|
zRl%SSa5dhQ7Gc%gtjxQHmpWCq7*9|?t#)QTMTSLai>ar|7nFnWCFXCN1bx}3!pi*~
z#dIT#F2UAR8q#q+XssAZjPEgPYpr*kh+dRC$S+|sS1y`&BWXJ0OOU2CL4j!;-`B6a
ztlCJR+g6rMq~wPZd#9(^y^OAXX)SuL6!Wiq$qM^?R5<CVeR<Vo=3KaGWto+>?*%>=
zTN3jHXclbR3w+JT1a;phkaydL!Se8~y{AcDs;_y>OOx{hT-uy5_T$rAR8piUkgv;a
zq_}rhV8)mWth}dqVE>Ip@ZyTk<B)J{l%=LxmGpv4#38xO>z$kYu;5wD*NNy(h-gJ*
zhP{)xws}6{Q~WJ5Tn(bw2p6EAT~!9%Vz-R=8XM$W>|=Ysn$FeFW2c7RXhD{KL+=S}
zw6cRQAO=xpJfVxBax0X}CVhK&CaPsc<JLU<?TEH^sru2RnVyEVM9wQ+x`5S`qKH(X
z-`7TI71sQXPkSLi%8{adOW1YJ(%nt+c%*xp^6O-kHJfAuJ+?=ox?2klyKq){WNbvs
zLg%MB<IzB1?C^$dc0?M~QD@k3EGBJ4bl=T-vauw(6;_OC)#%mV<oUH&SwU23lR@}<
zox1#N3tk{mb@sWPB<|FPi|UNO6Rx-%2@`M-IG+${`8AH2+Ep>KSEWkCUC<*DPZwDD
zETQe3kz>jm*dJJe%MX}V;J==9E|;^4S6%SVzzCqNds%>F@x3zh3{`RW^?L(Z3{q2k
zQNMI)A<Qu-UA4weMHx9nw^?(-9yFZu@kM(^NZ5?-JA(*NJW|<*rnz*P$<u@^lt%0H
zY|CzuwSRG7jpt!m6EysSIlEREEK|##(%sqh@ecQZyO;rA;PaSyD?xB^mhl~qP!#<M
zu4A3R)AD>~tuC{TVwb{7hqI<Om6W%ib-z8)gBQ~PZfNV;olCjP;8O6y!+4)yL{Bfb
z;3X6vh}Aa;+2Mh(Nmqqn*C#SOu7|pW)3oHX*=(z>C&enH-9fLq^S3|C`<x(T+u6u(
z)UeNsr>KY^+aJ-X*uAcXl9(18MGW|B51OPLhQ>pxrCv}Eop$tiNA-}Y+AhsnWDLy1
z-eaQI-!yEC!pwF#Ym&f0ey--z@`n_4l-#64U-q^>GGulpJZCV4D9bz>bsou;?~_gp
zj6<?%_4O+<qt`aCX<vFsr`_CJO0#2;b?)=^S2CyleAB0mo}{3f;@jX8e#M4&&#FIA
zzAItgdxDJ;VFW$+olA{*B1|5CJvC4i#dwO5y?d5)U#q_DViOi$ac~e!=r&GiuZ?|&
zJtfihq6>~XLJw#iE6F!d{W8xQ6dR#M>^JwFz4fCc>Vs1Ji%ZS-L*LPRT6y=rnM#GE
z)g7h)@02`@c24_vn6=q#6ehSY5Z${Vw!O;CLH1+}^179aWh!&xrZw<Wr7M{UyIvaB
z(v}oE;Y6f=kFUxOKelh#`D&)jvcvr4e!WPV0g;&OG*4|vf^07LlasyQSeFDtS6Wg0
zOV5_enkF8R&^(ZaoKhP?35gg90RS?<kI#kb>Dj>x0svqDcS^2>F*7olm!b{z41GyX
zE}WV%*PA<y&bM<f)3m|A5d6@MmaGKV$j-aimRvsYfBFgz4HrC5>`QOm>1f?~%9x`1
zMu`BYMCbQ7M%OGcB39kUc7Wn}q@(FtyU<D?I5j-DrLa&=g*P3MeJ|Zr-!Cn+SuouP
zqBEs@xFYDFUH1GKbEb}xHUN#F_@@Xnc|ci(i#S7YVICH$MpBd{TIGH08lW%Up484K
z<XEzJ46o3@O4vnO&tv7#?Q<+WOaq*TN#XN3XYd`4an`A1Sw75WuO$C4Pbp9WZKN+d
z8s=c?R^shu-I1HeO9@(Ij|v<l&MhF@tbHj_s&=dSHx^95HSU8(2%ZS+E4N6SO+4cn
zyiL~k-m|*L^%{0tos)G7H+`6%Ja)5yylOAj=r*)rqSVJTF8(%UV_kgys8vB|?2sp6
z-h#CI_>F8!amHuM5Tk72L3Eoq@8rAOFwjWQxww&(N_vr0yxin4N2J$dl<yG-qs*%O
zW9)ZMx^he)_BBGhunU!GU<7|l*Ak3y^11DmkF6^^fpg}nFLW`CT-q)~g>pfHWo(5h
z^EIn$DhahkKz+HQtD$xuMBN=4Rd;dr-S@pWy1|G-8Hf+nL;IB3-OoqkgCrvi)EkG4
zRf0DJq!!}JHI^%QR=CCJqHAAH-CY9DL}e!?&|)g|4wsF$?z3?uz&i=4#w1Ia-oypf
zI=R)&pAC7))umD*qE4=rlfnbGHiPV{*38k`)G7G}H4jS!Hyj&}Tera_g-;jfnPy~l
zH!W8u`*aj6diSR66+4c(6uuGlpH|&I+L5Un*mf~w^p`5Tp~>H;_U>C#`nu&(j18*d
z?uN;FI3DR@Xz@k8VRxKIzqUyUq-G0E5nqYb!A2p0vsAp}rCN<9l4j7OAv;}?5^wYA
zaf~7K8o>?1KRUXof&|*y>Uha_)zLJh000{RfI9$+{0(y@qcljNfWIxGKlij@7izb!
zm`E=V$-hqhH-q{g49tHSp0@rDK1eSg?|*auA^-r_uTo;77U24S0e+;7p%(cE=1LL%
zBW>^%W|La#Z<s#@`cJh;1pq*<Fn4L-Vt>W@pP|3HBGo^O;SR%xZ;<0I$!{<jLW!>g
R=Z`mn4B&QE-!brq_aBHlukZi>

delta 2963
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

diff --git a/pinpoint-web/start-web.sh b/pinpoint-web/start-web.sh
index d8cb5fe..f55c4db 100644
--- a/pinpoint-web/start-web.sh
+++ b/pinpoint-web/start-web.sh
@@ -28,7 +28,8 @@ jdbc.username=${JDBC_USERNAME}
 jdbc.password=${JDBC_PASSWORD}
 " > /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/jdbc.properties
 
-MAIL_ENABLE=${MAIL_ENABLE:-false}
+BATCH_ENABLE=${BATCH_ENABLE:-false}
+BATCH_SERVER_IP=${BATCH_SERVER_IP:-127.0.0.1}
 MAIL_HOST=${MAIL_HOST:-}
 MAIL_PORT=${MAIL_PORT:-}
 MAIL_USERNAME=${MAIL_USERNAME:-}
@@ -41,67 +42,89 @@ MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE=${MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE:-tru
 MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED=${MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED:-}
 MAIL_PROPERTIES_MAIL_DEBUG=${MAIL_PROPERTIES_MAIL_DEBUG:-}
 
-cp /assets/pinpoint-web.properties /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
-cp /assets/hbase.properties /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/hbase.properties
+#Manipuled files with SED
+WEB_INF_CLASSES_DIR=/usr/local/tomcat/webapps/ROOT/WEB-INF/classes
+BATCH_PROPERTIES_FILE=${WEB_INF_CLASSES_DIR}/batch.properties
+HBASE_PROPERTIES_FILE=${WEB_INF_CLASSES_DIR}/hbase.properties
+PINPOINT_WEB_PROPERTIES_FILE=${WEB_INF_CLASSES_DIR}/pinpoint-web.properties
+APPLICATION_CONTEXT_WEB_FILE=${WEB_INF_CLASSES_DIR}/applicationContext-web.xml
+APPLICATION_CONTEXT_MAIL_FILE=${WEB_INF_CLASSES_DIR}/applicationContext-mail.xml
+LOG4J_FILE=${WEB_INF_CLASSES_DIR}/log4j.xml
 
-sed -i "s/cluster.enable=true/cluster.enable=${CLUSTER_ENABLE}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
-sed -i "s/cluster.zookeeper.address=localhost/cluster.zookeeper.address=${CLUSTER_ZOOKEEPER_ADDRESS}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
+cp /assets/pinpoint-web.properties ${PINPOINT_WEB_PROPERTIES_FILE}
+cp /assets/hbase.properties ${HBASE_PROPERTIES_FILE}
+
+sed -i "s/cluster.enable=true/cluster.enable=${CLUSTER_ENABLE}/g" ${PINPOINT_WEB_PROPERTIES_FILE}
+sed -i "s/cluster.zookeeper.address=localhost/cluster.zookeeper.address=${CLUSTER_ZOOKEEPER_ADDRESS}/g" ${PINPOINT_WEB_PROPERTIES_FILE}
 if [ "$CLUSTER_WEB_TCP_PORT" != "" ]; then
-    sed -i "/cluster.web.tcp.port=/ s/=.*/=${CLUSTER_WEB_TCP_PORT}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
+    sed -i "/cluster.web.tcp.port=/ s/=.*/=${CLUSTER_WEB_TCP_PORT}/" ${PINPOINT_WEB_PROPERTIES_FILE}
 fi
 if [ "$CLUSTER_CONNECT_ADDRESS" != "" ]; then
-    sed -i "/cluster.connect.address=/ s/=.*/=${CLUSTER_CONNECT_ADDRESS}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
+    sed -i "/cluster.connect.address=/ s/=.*/=${CLUSTER_CONNECT_ADDRESS}/" ${PINPOINT_WEB_PROPERTIES_FILE}
 fi
 
-sed -i "s/admin.password=admin/admin.password=${ADMIN_PASSWORD}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
+sed -i "s/admin.password=admin/admin.password=${ADMIN_PASSWORD}/g" ${PINPOINT_WEB_PROPERTIES_FILE}
 
-sed -i "s/hbase.client.host=localhost/hbase.client.host=${HBASE_HOST}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/hbase.properties
-sed -i "s/hbase.client.port=2181/hbase.client.port=${HBASE_PORT}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/hbase.properties
+sed -i "s/hbase.client.host=localhost/hbase.client.host=${HBASE_HOST}/g" ${HBASE_PROPERTIES_FILE}
+sed -i "s/hbase.client.port=2181/hbase.client.port=${HBASE_PORT}/g" ${HBASE_PROPERTIES_FILE}
 
 if [ "$CONFIG_SENDUSAGE" != "" ]; then
-    sed -i "/config.sendUsage=/ s/=.*/=${CONFIG_SENDUSAGE}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
+    sed -i "/config.sendUsage=/ s/=.*/=${CONFIG_SENDUSAGE}/" ${PINPOINT_WEB_PROPERTIES_FILE}
 fi
 
 if [ "$DISABLE_DEBUG" == "true" ]; then
-    sed -i 's/level value="DEBUG"/level value="INFO"/' /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/log4j.xml
+    sed -i 's/level value="DEBUG"/level value="INFO"/' ${LOG4J_FILE}
 fi
 
-if [ "$MAIL_ENABLE" == "true" ]; then
-    sed -i 's/<\/beans>/<import resource="classpath:applicationContext-mail.xml" \/><\/beans>/' /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/applicationContext-web.xml
+if [ "$BATCH_ENABLE" == "true" ]; then
+    sed -i "/batch.enable=/ s/=.*/=${BATCH_ENABLE}/" ${BATCH_PROPERTIES_FILE}
+    
+    if [ "$BATCH_SERVER_IP" != "" ]; then
+        sed -i "/batch.server.ip=/ s/=.*/=${BATCH_SERVER_IP}/" ${BATCH_PROPERTIES_FILE}
+    fi
+    
+    sed -i 's/<\/beans>/<import resource="classpath:applicationContext-mail.xml" \/><\/beans>/' ${APPLICATION_CONTEXT_WEB_FILE}
 	
-	if [ "$MAIL_HOST" != "" ]; then
-        sed -i "s/smtp.gmail.com/${MAIL_HOST}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/applicationContext-mail.xml
-	fi
-	if [ "$MAIL_PORT" != "" ]; then
-        sed -i "s/587/${MAIL_PORT}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/applicationContext-mail.xml
-	fi
-	if [ "$MAIL_USERNAME" != "" ]; then
-        sed -i "s/UserName/${MAIL_USERNAME}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/applicationContext-mail.xml
-	fi
-	if [ "$MAIL_PASSWORD" != "" ]; then
-        sed -i "s/PassWord/${MAIL_PASSWORD}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/applicationContext-mail.xml
-	fi
-	if [ "$MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL" != "" ]; then
-	    sed -i "/mail.transport.protocol/ s/<\!-- //; s/ -->//; s/>.*</>${MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL}</" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/applicationContext-mail.xml
-	fi
-	if [ "$MAIL_PROPERTIES_MAIL_SMTP_PORT" != "" ]; then
-		sed -i "/mail.smtp.port/ s/<\!-- //; s/ -->//; s/>.*</>${MAIL_PROPERTIES_MAIL_SMTP_PORT}</" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/applicationContext-mail.xml
-	fi
-	if [ "$MAIL_PROPERTIES_MAIL_SMTP_AUTH" != "" ]; then
-		sed -i "/mail.smtp.auth/ s/<\!-- //; s/ -->//; s/>.*</>${MAIL_PROPERTIES_MAIL_SMTP_AUTH}</" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/applicationContext-mail.xml
-	fi
-	if [ "$MAIL_PROPERTIES_MAIL_SMTP_FROM" != "" ]; then
-		sed -i "/mail.smtp.from/ s/<\!-- //; s/ -->//; s/>.*</>${MAIL_PROPERTIES_MAIL_SMTP_FROM}</" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/applicationContext-mail.xml
-	fi
-	if [ "$MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE" != "" ]; then
-		sed -i "/mail.smtp.starttls.enable/ s/<\!-- //; s/ -->//; s/>.*</>${MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE}</" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/applicationContext-mail.xml
-	fi
-	if [ "$MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED" != "" ]; then
-		sed -i "/mail.smtp.starttls.required/ s/<\!-- //; s/ -->//; s/>.*</>${MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED}</" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/applicationContext-mail.xml
-	fi
-	if [ "$MAIL_PROPERTIES_MAIL_DEBUG" != "" ]; then
-		sed -i "/mail.debug/ s/<\!-- //; s/ -->//; s/>.*</>${MAIL_PROPERTIES_MAIL_DEBUG}</" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/applicationContext-mail.xml
-	fi
+    if [ "$MAIL_HOST" != "" ]; then
+        sed -i "s/smtp.gmail.com/${MAIL_HOST}/" ${APPLICATION_CONTEXT_MAIL_FILE}
+    fi
+    if [ "$MAIL_PORT" != "" ]; then
+        sed -i "s/587/${MAIL_PORT}/" ${APPLICATION_CONTEXT_MAIL_FILE}
+    fi
+    if [ "$MAIL_USERNAME" != "" ]; then
+        sed -i "s/UserName/${MAIL_USERNAME}/" ${APPLICATION_CONTEXT_MAIL_FILE}
+    fi
+    if [ "$MAIL_PASSWORD" != "" ]; then
+        sed -i "s/PassWord/${MAIL_PASSWORD}/" ${APPLICATION_CONTEXT_MAIL_FILE}
+    fi
+    if [ "$MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL" != "" ]; then
+    	PATTERN="mail.transport.protocol"
+        sed -i "/${PATTERN}/ s/<\!-- \| -->//g;/${PATTERN}/ s/>.*</>${MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL}</" ${APPLICATION_CONTEXT_MAIL_FILE}
+    fi
+    if [ "$MAIL_PROPERTIES_MAIL_SMTP_PORT" != "" ]; then
+    	PATTERN="mail.smtp.port"
+        sed -i "/${PATTERN}/ s/<\!-- \| -->//g;/${PATTERN}/ s/>.*</>${MAIL_PROPERTIES_MAIL_SMTP_PORT}</" ${APPLICATION_CONTEXT_MAIL_FILE}
+    fi
+    if [ "$MAIL_PROPERTIES_MAIL_SMTP_AUTH" != "" ]; then
+    	PATTERN="mail.smtp.auth"
+        sed -i "/${PATTERN}/ s/<\!-- \| -->//g;/${PATTERN}/ s/>.*</>${MAIL_PROPERTIES_MAIL_SMTP_AUTH}</" ${APPLICATION_CONTEXT_MAIL_FILE}
+    fi
+    if [ "$MAIL_PROPERTIES_MAIL_SMTP_FROM" != "" ]; then
+    	PATTERN="mail.smtp.from"
+        sed -i "/${PATTERN}/ s/<\!-- \| -->//g;/${PATTERN}/ s/>.*</>${MAIL_PROPERTIES_MAIL_SMTP_FROM}</" ${APPLICATION_CONTEXT_MAIL_FILE}
+    fi
+    if [ "$MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE" != "" ]; then
+    	PATTERN="mail.smtp.starttls.enable"
+        sed -i "/${PATTERN}/ s/<\!-- \| -->//g;/${PATTERN}/ s/>.*</>${MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE}</" ${APPLICATION_CONTEXT_MAIL_FILE}
+    fi
+    if [ "$MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED" != "" ]; then
+    	PATTERN="mail.smtp.starttls.required"
+        sed -i "/${PATTERN}/ s/<\!-- \| -->//g;/${PATTERN}/ s/>.*</>${MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED}</" ${APPLICATION_CONTEXT_MAIL_FILE}
+    fi
+    if [ "$MAIL_PROPERTIES_MAIL_DEBUG" != "" ]; then
+    	PATTERN="mail.debug"
+        sed -i "/${PATTERN}/ s/<\!-- \| -->//g;/${PATTERN}/ s/>.*</>${MAIL_PROPERTIES_MAIL_DEBUG}</" ${APPLICATION_CONTEXT_MAIL_FILE}
+    fi
 	
 fi