Produced by Araxis Merge on 4/23/2019 12:15:51 PM Central 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 | C:\AraxisMergeCompare\Pri_un\CCRS\interfaces-6.3.0\interfaces-6.3.0\ci\HikariCP | server.xml | Tue Mar 26 18:47:06 2019 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\CCRS\interfaces-6.3.0\interfaces-6.3.0\ci\HikariCP | server.xml | Wed Apr 17 05:08:40 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 10 | 570 |
| Changed | 9 | 18 |
| 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 | <!-- Preve nt memory leaks due to use of particular java/java x APIs--> | |
| 46 | ||
| 47 | <Listener | |
| 48 | className= "org.apach e.catalina .core.JreM emoryLeakP reventionL istener" | |
| 49 | /> | |
| 50 | ||
| 51 | <Listener | |
| 52 | className= "org.apach e.catalina .mbeans.Gl obalResour cesLifecyc leListener " | |
| 53 | /> | |
| 54 | ||
| 55 | <Listener | |
| 56 | className= "org.apach e.catalina .core.Thre adLocalLea kPreventio nListener" | |
| 57 | /> | |
| 58 | ||
| 59 | ||
| 60 | <!-- Globa l JNDI res ources | |
| 61 | Doc umentation at /docs/ jndi-resou rces-howto .html | |
| 62 | --> | |
| 63 | ||
| 64 | <GlobalNam ingResourc es> | |
| 65 | ||
| 66 | <!-- Edita ble user d atabase th at can als o be used by | |
| 67 | U serDatabas eRealm to authentica te users | |
| 68 | --> | |
| 69 | ||
| 70 | <Resource | |
| 71 | name="jdbc /ccrsDs" | |
| 72 | ||
| 73 | auth="Cont ainer" | |
| 74 | ||
| 75 | factory="c om.zaxxer. hikari.Hik ariJNDIFac tory" | |
| 76 | ||
| 77 | type="java x.sql.Data Source" | |
| 78 | ||
| 79 | driverClas sName="com .microsoft .sqlserver .jdbc.SQLS erverDrive r" | |
| 80 | ||
| 81 | jdbcUrl="j dbc:sqlser ver://ccrs devsql01;d atabaseNam e=ccrsdb" | |
| 82 | ||
| 83 | dataSource .user="ibm ccrsdev" | |
| 84 | ||
| 85 | dataSource .password= "CC@RS$193 4--" | |
| 86 | ||
| 87 | dataSource .implicitC achingEnab led="true" | |
| 88 | ||
| 89 | maximumPoo lSize="20" | |
| 90 | ||
| 91 | maxIdle="1 0" | |
| 92 | ||
| 93 | minimumIdl e="5" | |
| 94 | /> | |
| 95 | ||
| 96 | <Resource | |
| 97 | name="User Database" | |
| 98 | auth="Cont ainer" | |
| 99 | ||
| 100 | type="org. apache.cat alina.User Database" | |
| 101 | ||
| 102 | descriptio n="User da tabase tha t can be u pdated and saved" | |
| 103 | ||
| 104 | factory="o rg.apache. catalina.u sers.Memor yUserDatab aseFactory " | |
| 105 | ||
| 106 | pathname=" conf/tomca t-users.xm l" | |
| 107 | /> | |
| 108 | ||
| 109 | </GlobalNa mingResour ces> | |
| 110 | ||
| 111 | ||
| 112 | ||
| 113 | ||
| 114 | <!-- A "Se rvice" is a collecti on of one or more "C onnectors" that shar e | |
| 115 | a s ingle "Con tainer" No te: A "Se rvice" is not itself a "Contai ner", | |
| 116 | so you may no t define s ubcomponen ts such as "Valves" at this le vel. | |
| 117 | Doc umentation at /docs/ config/ser vice.html | |
| 118 | --> | |
| 119 | ||
| 120 | <Service | |
| 121 | name="Cata lina" | |
| 122 | > | |
| 123 | ||
| 124 | ||
| 125 | <!--The co nnectors c an use a s hared exec utor, you can define one or mo re named t hread pool s--> | |
| 126 | ||
| 127 | <!-- | |
| 128 | <Execu tor name=" tomcatThre adPool" na mePrefix=" catalina-e xec-" | |
| 129 | ma xThreads=" 150" minSp areThreads ="4"/> | |
| 130 | --> | |
| 131 | ||
| 132 | ||
| 133 | ||
| 134 | <!-- A "Co nnector" r epresents an endpoin t by which requests are receiv ed | |
| 135 | a nd respons es are ret urned. Doc umentation at : | |
| 136 | J ava HTTP C onnector: /docs/conf ig/http.ht ml | |
| 137 | J ava AJP C onnector: /docs/conf ig/ajp.htm l | |
| 138 | A PR (HTTP/A JP) Connec tor: /docs /apr.html | |
| 139 | D efine a no n-SSL/TLS HTTP/1.1 C onnector o n port 808 0 | |
| 140 | --> | |
| 141 | ||
| 142 | <Connector | |
| 143 | port=" PORT " | |
| 144 | protocol=" HTTP/1.1" | |
| 145 | ||
| 146 | connection Timeout="2 0000" | |
| 147 | ||
| 148 | redirect p ort=" PORT " | |
| 149 | /> | |
| 150 | ||
| 151 | <!-- A "Co nnector" u sing the s hared thre ad pool--> | |
| 152 | ||
| 153 | <!-- | |
| 154 | <Conne ctor execu tor="tomca tThreadPoo l" | |
| 155 | port=" PORT " protocol ="HTTP/1.1 " | |
| 156 | conne ctionTimeo ut="20000" | |
| 157 | redirect p ort=" PORT " /> | |
| 158 | --> | |
| 159 | ||
| 160 | <!-- Defin e a SSL/TL S HTTP/1.1 Connector on port 8 443 | |
| 161 | T his connec tor uses t he NIO imp lementatio n. The def ault | |
| 162 | S SLImplemen tation wil l depend o n the pres ence of th e APR/nati ve | |
| 163 | l ibrary and the useOp enSSL attr ibute of t he | |
| 164 | A prLifecycl eListener. | |
| 165 | E ither JSSE or OpenSS L style co nfiguratio n may be u sed regard less of | |
| 166 | t he SSLImpl ementation selected. JSSE styl e configur ation is u sed below. | |
| 167 | --> | |
| 168 | ||
| 169 | <!-- | |
| 170 | <Connector port=" PORT " protocol ="org.apac he.coyote. http11.Htt p11NioProt ocol" | |
| 171 | maxTh reads="150 " SSLEnabl ed="true"> | |
| 172 | <S SLHostConf ig> | |
| 173 | <Certifi cate certi ficateKeys toreFile=" conf/local host-rsa.j ks" | |
| 174 | type= "RSA" /> | |
| 175 | </ SSLHostCon fig> | |
| 176 | </Conn ector> | |
| 177 | --> | |
| 178 | ||
| 179 | <!-- Defin e a SSL/TL S HTTP/1.1 Connector on port 8 443 with H TTP/2 | |
| 180 | T his connec tor uses t he APR/nat ive implem entation w hich alway s uses | |
| 181 | O penSSL for TLS. | |
| 182 | E ither JSSE or OpenSS L style co nfiguratio n may be u sed. OpenS SL style | |
| 183 | c onfigurati on is used below. | |
| 184 | --> | |
| 185 | ||
| 186 | <!-- | |
| 187 | <Connector port=" PORT " protocol ="org.apac he.coyote. http11.Htt p11AprProt ocol" | |
| 188 | maxTh reads="150 " SSLEnabl ed="true" > | |
| 189 | <U pgradeProt ocol class Name="org. apache.coy ote.http2. Http2Proto col" /> | |
| 190 | <S SLHostConf ig> | |
| 191 | <Certifi cate certi ficateKeyF ile="conf/ localhost- rsa-key.pe m" | |
| 192 | certi ficateFile ="conf/loc alhost-rsa -cert.pem" | |
| 193 | certi ficateChai nFile="con f/localhos t-rsa-chai n.pem" | |
| 194 | type= "RSA" /> | |
| 195 | </ SSLHostCon fig> | |
| 196 | </Conn ector> | |
| 197 | --> | |
| 198 | ||
| 199 | ||
| 200 | <!-- Defin e an AJP 1 .3 Connect or on port 8009 --> | |
| 201 | ||
| 202 | <Connector | |
| 203 | port=" PORT " | |
| 204 | protocol=" AJP/1.3" | |
| 205 | redirect p ort=" PORT " | |
| 206 | /> | |
| 207 | ||
| 208 | ||
| 209 | ||
| 210 | <!-- An En gine repre sents the entry poin t (within Catalina) that proce sses | |
| 211 | e very reque st. The E ngine impl ementation for Tomca t stand al one | |
| 212 | a nalyzes th e HTTP hea ders inclu ded with t he request , and pass es them | |
| 213 | o n to the a ppropriate Host (vir tual host) . | |
| 214 | D ocumentati on at /doc s/config/e ngine.html --> | |
| 215 | ||
| 216 | ||
| 217 | <!-- You s hould set jvmRoute t o support load-balan cing via A JP ie : | |
| 218 | <Engin e name="Ca talina" de faultHost= "localhost " jvmRoute ="jvm1"> | |
| 219 | --> | |
| 220 | ||
| 221 | <Engine | |
| 222 | name="Cata lina" | |
| 223 | defaultHos t="localho st" | |
| 224 | > | |
| 225 | ||
| 226 | ||
| 227 | <!--For cl ustering, please tak e a look a t document ation at: | |
| 228 | /docs/clus ter-howto. html (sim ple how to ) | |
| 229 | /docs/conf ig/cluster .html (ref erence doc umentation ) --> | |
| 230 | ||
| 231 | <!-- | |
| 232 | <Clu ster class Name="org. apache.cat alina.ha.t cp.SimpleT cpCluster" /> | |
| 233 | --> | |
| 234 | ||
| 235 | ||
| 236 | <!-- Use t he LockOut Realm to p revent att empts to g uess user passwords | |
| 237 | via a bru te-force a ttack --> | |
| 238 | ||
| 239 | <Realm | |
| 240 | className= "org.apach e.catalina .realm.Loc kOutRealm" | |
| 241 | > | |
| 242 | ||
| 243 | <!-- This Realm uses the UserD atabase co nfigured i n the glob al JNDI | |
| 244 | resourc es under t he key "Us erDatabase ". Any ed its | |
| 245 | that ar e performe d against this UserD atabase ar e immediat ely | |
| 246 | availab le for use by the Re alm. --> | |
| 247 | ||
| 248 | <Realm | |
| 249 | className= "org.apach e.catalina .realm.Use rDatabaseR ealm" | |
| 250 | ||
| 251 | resourceNa me="UserDa tabase" | |
| 252 | /> | |
| 253 | ||
| 254 | </Realm> | |
| 255 | ||
| 256 | ||
| 257 | <Host | |
| 258 | name="loca lhost" | |
| 259 | appBase="w ebapps" | |
| 260 | ||
| 261 | unpackWARs ="true" | |
| 262 | autoDeploy ="true" | |
| 263 | > | |
| 264 | ||
| 265 | ||
| 266 | <!-- Singl eSignOn va lve, share authentic ation betw een web ap plications | |
| 267 | Documen tation at: /docs/con fig/valve. html --> | |
| 268 | ||
| 269 | <!-- | |
| 270 | <V alve class Name="org. apache.cat alina.auth enticator. SingleSign On" /> | |
| 271 | -- > | |
| 272 | ||
| 273 | ||
| 274 | <!-- Acces s log proc esses all example. | |
| 275 | Documen tation at: /docs/con fig/valve. html | |
| 276 | Note: T he pattern used is e quivalent to using p attern="co mmon" --> | |
| 277 | ||
| 278 | <Valve | |
| 279 | className= "org.apach e.catalina .valves.Ac cessLogVal ve" | |
| 280 | directory= "logs" | |
| 281 | ||
| 282 | prefix="lo calhost_ac cess_log" | |
| 283 | suffix=".t xt" | |
| 284 | ||
| 285 | pattern="% h %l %u %t "%r& quot; %s % b" | |
| 286 | /> | |
| 287 | ||
| 288 | ||
| 289 | </Host> | |
| 290 | ||
| 291 | </Engine> | |
| 292 | ||
| 293 | </Service> | |
| 294 | </Server> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.