Produced by Araxis Merge on 9/15/2018 10:47:17 PM Eastern Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | MHV_2018.4.0.0.zip\2018.4.0.0\national portal\mhv_source\mhv_devops\src\main\liferay | tomcat-server.xml | Thu Aug 23 21:39:16 2018 UTC |
| 2 | MHV_2018.4.0.0.zip\2018.4.0.0\national portal\mhv_source\mhv_devops\src\main\liferay | tomcat-server.xml | Sat Sep 15 20:01:55 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 6 | 522 |
| Changed | 5 | 12 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | <?xml | |
| 2 | version='1 .0' | |
| 3 | encoding=' utf-8' | |
| 4 | ?> | |
| 5 | <!-- | |
| 6 | Licensed to the Ap ache Softw are Founda tion (ASF) under one or more | |
| 7 | contribu tor licens e agreemen ts. See t he NOTICE file distr ibuted wit h | |
| 8 | this wor k for addi tional inf ormation r egarding c opyright o wnership. | |
| 9 | The ASF licenses t his file t o You unde r the Apac he License , Version 2.0 | |
| 10 | (the "Li cense"); y ou may not use this file excep t in compl iance with | |
| 11 | the Lice nse. You may obtain a copy of the Licen se at | |
| 12 | ||
| 13 | http ://www.apa che.org/li censes/LIC ENSE-2.0 | |
| 14 | ||
| 15 | Unless r equired by applicabl e law or a greed to i n writing, software | |
| 16 | distribu ted under the Licens e is distr ibuted on an "AS IS" BASIS, | |
| 17 | WITHOUT WARRANTIES OR CONDIT IONS OF AN Y KIND, ei ther expre ss or impl ied. | |
| 18 | See the License fo r the spec ific langu age govern ing permis sions and | |
| 19 | limitati ons under the Licens e. | |
| 20 | --> | |
| 21 | <!-- Note: A "Serve r" is not itself a " Container" , so you m ay not | |
| 22 | defin e subcompo nents such as "Valve s" at this level. | |
| 23 | Docum entation a t /docs/co nfig/serve r.html | |
| 24 | --> | |
| 25 | <Server | |
| 26 | port=" PORT " | |
| 27 | shutdown=" SHUTDOWN" | |
| 28 | > | |
| 29 | ||
| 30 | <Listener | |
| 31 | className= "org.apach e.catalina .startup.V ersionLogg erListener " | |
| 32 | /> | |
| 33 | ||
| 34 | <!-- Secur ity listen er. Docume ntation at /docs/con fig/listen ers.html | |
| 35 | <Listene r classNam e="org.apa che.catali na.securit y.Security Listener" /> | |
| 36 | --> | |
| 37 | ||
| 38 | <!--APR li brary load er. Docume ntation at /docs/apr .html --> | |
| 39 | ||
| 40 | <Listener | |
| 41 | className= "org.apach e.catalina .core.AprL ifecycleLi stener" | |
| 42 | SSLEngine= "on" | |
| 43 | /> | |
| 44 | ||
| 45 | <!--Initia lize Jaspe r prior to webapps a re loaded. Documenta tion at /d ocs/jasper -howto.htm l --> | |
| 46 | ||
| 47 | <Listener | |
| 48 | className= "org.apach e.catalina .core.Jasp erListener " | |
| 49 | /> | |
| 50 | ||
| 51 | <!-- Preve nt memory leaks due to use of particular java/java x APIs--> | |
| 52 | ||
| 53 | <Listener | |
| 54 | className= "org.apach e.catalina .core.JreM emoryLeakP reventionL istener" | |
| 55 | /> | |
| 56 | ||
| 57 | <Listener | |
| 58 | className= "org.apach e.catalina .mbeans.Gl obalResour cesLifecyc leListener " | |
| 59 | /> | |
| 60 | ||
| 61 | <Listener | |
| 62 | className= "org.apach e.catalina .core.Thre adLocalLea kPreventio nListener" | |
| 63 | /> | |
| 64 | ||
| 65 | ||
| 66 | <!-- Globa l JNDI res ources | |
| 67 | Doc umentation at /docs/ jndi-resou rces-howto .html | |
| 68 | --> | |
| 69 | ||
| 70 | <GlobalNam ingResourc es> | |
| 71 | ||
| 72 | <!-- Edita ble user d atabase th at can als o be used by | |
| 73 | U serDatabas eRealm to authentica te users | |
| 74 | --> | |
| 75 | ||
| 76 | <Resource | |
| 77 | name="User Database" | |
| 78 | auth="Cont ainer" | |
| 79 | ||
| 80 | type="org. apache.cat alina.User Database" | |
| 81 | ||
| 82 | descriptio n="User da tabase tha t can be u pdated and saved" | |
| 83 | ||
| 84 | factory="o rg.apache. catalina.u sers.Memor yUserDatab aseFactory " | |
| 85 | ||
| 86 | pathname=" conf/tomca t-users.xm l" | |
| 87 | /> | |
| 88 | ||
| 89 | ||
| 90 | <Resource | |
| 91 | name="jdbc /liferaySh ared" | |
| 92 | auth="Cont ainer" | |
| 93 | type="java x.sql.Data Source" | |
| 94 | ||
| 95 | maxActive= "100" | |
| 96 | maxIdle="3 0" | |
| 97 | maxWait="1 0000" | |
| 98 | ||
| 99 | username=" A I
|
|
| 100 | password=" A I
|
|
| 101 | ||
| 102 | driverClas sName="ora cle.jdbc.x a.client.O racleXADat aSource" | |
| 103 | ||
| 104 | url="jdbc: oracle:thi n:@DB_INFO " | |
| 105 | /> | |
| 106 | ||
| 107 | ||
| 108 | ||
| 109 | </GlobalNa mingResour ces> | |
| 110 | ||
| 111 | ||
| 112 | <!-- A "Se rvice" is a collecti on of one or more "C onnectors" that shar e | |
| 113 | a s ingle "Con tainer" No te: A "Se rvice" is not itself a "Contai ner", | |
| 114 | so you may no t define s ubcomponen ts such as "Valves" at this le vel. | |
| 115 | Doc umentation at /docs/ config/ser vice.html | |
| 116 | --> | |
| 117 | ||
| 118 | <Service | |
| 119 | name="Cata lina" | |
| 120 | > | |
| 121 | ||
| 122 | ||
| 123 | <!--The co nnectors c an use a s hared exec utor, you can define one or mo re named t hread pool s--> | |
| 124 | ||
| 125 | <!-- | |
| 126 | <Execu tor name=" tomcatThre adPool" na mePrefix=" catalina-e xec-" | |
| 127 | ma xThreads=" 150" minSp areThreads ="4"/> | |
| 128 | --> | |
| 129 | ||
| 130 | ||
| 131 | ||
| 132 | <!-- A "Co nnector" r epresents an endpoin t by which requests are receiv ed | |
| 133 | a nd respons es are ret urned. Doc umentation at : | |
| 134 | J ava HTTP C onnector: /docs/conf ig/http.ht ml (blocki ng & non-b locking) | |
| 135 | J ava AJP C onnector: /docs/conf ig/ajp.htm l | |
| 136 | A PR (HTTP/A JP) Connec tor: /docs /apr.html | |
| 137 | D efine a no n-SSL HTTP /1.1 Conne ctor on po rt 8080 | |
| 138 | --> | |
| 139 | ||
| 140 | <Connector | |
| 141 | port=" PORT " | |
| 142 | protocol=" HTTP/1.1" | |
| 143 | ||
| 144 | connection Timeout="2 0000" | |
| 145 | ||
| 146 | redirectPo rt=" PORT " | |
| 147 | URIEncodin g="UTF-8" | |
| 148 | /> | |
| 149 | ||
| 150 | <!-- A "Co nnector" u sing the s hared thre ad pool--> | |
| 151 | ||
| 152 | <!-- | |
| 153 | <Conne ctor execu tor="tomca tThreadPoo l" | |
| 154 | port= "8080" pro tocol="HTT P/1.1" | |
| 155 | conne ctionTimeo ut="20000" | |
| 156 | redir ectPort="8 443" URIEn coding="UT F-8" /> | |
| 157 | --> | |
| 158 | ||
| 159 | <!-- Defin e a SSL HT TP/1.1 Con nector on port 8443 | |
| 160 | T his connec tor uses t he BIO imp lementatio n that req uires the JSSE | |
| 161 | s tyle confi guration. When using the APR/n ative impl ementation , the | |
| 162 | O penSSL sty le configu ration is required a s describe d in the A PR/native | |
| 163 | d ocumentati on --> | |
| 164 | ||
| 165 | <!-- | |
| 166 | <Conne ctor port= "8443" pro tocol="org .apache.co yote.http1 1.Http11Pr otocol" | |
| 167 | maxTh reads="150 " SSLEnabl ed="true" scheme="ht tps" secur e="true" | |
| 168 | clien tAuth="fal se" sslPro tocol="TLS " /> | |
| 169 | --> | |
| 170 | ||
| 171 | ||
| 172 | <!-- Defin e an AJP 1 .3 Connect or on port 8009 --> | |
| 173 | ||
| 174 | <Connector | |
| 175 | port=" PORT " | |
| 176 | protocol=" AJP/1.3" | |
| 177 | redirectPo rt="8443" | |
| 178 | URIEncodin g="UTF-8" | |
| 179 | /> | |
| 180 | ||
| 181 | ||
| 182 | ||
| 183 | <!-- An En gine repre sents the entry poin t (within Catalina) that proce sses | |
| 184 | e very reque st. The E ngine impl ementation for Tomca t stand al one | |
| 185 | a nalyzes th e HTTP hea ders inclu ded with t he request , and pass es them | |
| 186 | o n to the a ppropriate Host (vir tual host) . | |
| 187 | D ocumentati on at /doc s/config/e ngine.html --> | |
| 188 | ||
| 189 | ||
| 190 | <!-- You s hould set jvmRoute t o support load-balan cing via A JP ie : | |
| 191 | <Engin e name="Ca talina" de faultHost= "localhost " jvmRoute ="jvm1"> | |
| 192 | --> | |
| 193 | ||
| 194 | <Engine | |
| 195 | name="Cata lina" | |
| 196 | defaultHos t="localho st" | |
| 197 | > | |
| 198 | ||
| 199 | ||
| 200 | <!--For cl ustering, please tak e a look a t document ation at: | |
| 201 | /docs/clus ter-howto. html (sim ple how to ) | |
| 202 | /docs/conf ig/cluster .html (ref erence doc umentation ) --> | |
| 203 | ||
| 204 | <!-- | |
| 205 | <Clu ster class Name="org. apache.cat alina.ha.t cp.SimpleT cpCluster" /> | |
| 206 | --> | |
| 207 | ||
| 208 | ||
| 209 | <!-- Use t he LockOut Realm to p revent att empts to g uess user passwords | |
| 210 | via a bru te-force a ttack --> | |
| 211 | ||
| 212 | <Realm | |
| 213 | className= "org.apach e.catalina .realm.Loc kOutRealm" | |
| 214 | > | |
| 215 | ||
| 216 | <!-- This Realm uses the UserD atabase co nfigured i n the glob al JNDI | |
| 217 | resourc es under t he key "Us erDatabase ". Any ed its | |
| 218 | that ar e performe d against this UserD atabase ar e immediat ely | |
| 219 | availab le for use by the Re alm. --> | |
| 220 | ||
| 221 | <Realm | |
| 222 | className= "org.apach e.catalina .realm.Use rDatabaseR ealm" | |
| 223 | ||
| 224 | resourceNa me="UserDa tabase" | |
| 225 | /> | |
| 226 | ||
| 227 | </Realm> | |
| 228 | ||
| 229 | ||
| 230 | <Host | |
| 231 | name="loca lhost" | |
| 232 | appBase="w ebapps" | |
| 233 | ||
| 234 | unpackWARs ="true" | |
| 235 | autoDeploy ="true" | |
| 236 | > | |
| 237 | ||
| 238 | ||
| 239 | <!-- Singl eSignOn va lve, share authentic ation betw een web ap plications | |
| 240 | Documen tation at: /docs/con fig/valve. html --> | |
| 241 | ||
| 242 | <!-- | |
| 243 | <V alve class Name="org. apache.cat alina.auth enticator. SingleSign On" /> | |
| 244 | -- > | |
| 245 | ||
| 246 | ||
| 247 | <!-- Acces s log proc esses all example. | |
| 248 | Documen tation at: /docs/con fig/valve. html | |
| 249 | Note: T he pattern used is e quivalent to using p attern="co mmon" --> | |
| 250 | ||
| 251 | <Valve | |
| 252 | className= "org.apach e.catalina .valves.Ac cessLogVal ve" | |
| 253 | directory= "logs" | |
| 254 | ||
| 255 | prefix="lo calhost_ac cess_log." | |
| 256 | suffix=".t xt" | |
| 257 | ||
| 258 | pattern="% h %l %u %t "%r& quot; %s % b" | |
| 259 | /> | |
| 260 | ||
| 261 | ||
| 262 | </Host> | |
| 263 | ||
| 264 | </Engine> | |
| 265 | ||
| 266 | </Service> | |
| 267 | </Server> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.