Produced by Araxis Merge on 7/10/2017 1:01:48 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\IV-ehmp_cif\VixInstallerSolution2013.root\VixInstallerSolution2013\VixInstallerSetup\VixDistribution\30.170.10.1\common\Apache Tomcat | server.xml | Mon Sep 19 22:27:06 2016 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\VixInstallerSolution2013.root\VixInstallerSolution2013\VixInstallerSetup\VixDistribution\30.170.10.1\common\Apache Tomcat | server.xml | Mon Jul 10 17:12:22 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 10 | 884 |
| 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="8005 " | |
| 27 | shutdown=" SHUTDOWN" | |
| 28 | > | |
| 29 | ||
| 30 | ||
| 31 | <!--APR li brary load er. Docume ntation at /docs/apr .html --> | |
| 32 | ||
| 33 | <Listener | |
| 34 | className= "org.apach e.catalina .core.AprL ifecycleLi stener" | |
| 35 | SSLEngine= "on" | |
| 36 | /> | |
| 37 | ||
| 38 | <!--Initia lize Jaspe r prior to webapps a re loaded. Documenta tion at /d ocs/jasper -howto.htm l --> | |
| 39 | ||
| 40 | <Listener | |
| 41 | className= "org.apach e.catalina .core.Jasp erListener " | |
| 42 | /> | |
| 43 | ||
| 44 | <!-- JMX S upport for the Tomca t server. Documentat ion at /do cs/non-exi stent.html --> | |
| 45 | ||
| 46 | <Listener | |
| 47 | className= "org.apach e.catalina .mbeans.Se rverLifecy cleListene r" | |
| 48 | /> | |
| 49 | ||
| 50 | <Listener | |
| 51 | className= "org.apach e.catalina .mbeans.Gl obalResour cesLifecyc leListener " | |
| 52 | /> | |
| 53 | ||
| 54 | <Listener | |
| 55 | className= "gov.va.me d.server.t omcat.Tomc atLifecycl eAdapter" | |
| 56 | /> | |
| 57 | ||
| 58 | <!--<Liste ner classN ame="gov.v a.med.serv er.tomcat. TomcatClus terAdapter " />--> | |
| 59 | ||
| 60 | ||
| 61 | <!-- Globa l JNDI res ources | |
| 62 | Doc umentation at /docs/ jndi-resou rces-howto .html | |
| 63 | --> | |
| 64 | ||
| 65 | <GlobalNam ingResourc es> | |
| 66 | ||
| 67 | <!-- Edita ble user d atabase th at can als o be used by | |
| 68 | U serDatabas eRealm to authentica te users | |
| 69 | --> | |
| 70 | ||
| 71 | <Resource | |
| 72 | name="User Database" | |
| 73 | auth="Cont ainer" | |
| 74 | ||
| 75 | type="org. apache.cat alina.User Database" | |
| 76 | ||
| 77 | descriptio n="User da tabase tha t can be u pdated and saved" | |
| 78 | ||
| 79 | factory="o rg.apache. catalina.u sers.Memor yUserDatab aseFactory " | |
| 80 | ||
| 81 | pathname=" conf/tomca t-users.xm l" | |
| 82 | /> | |
| 83 | ||
| 84 | <Resource | |
| 85 | ||
| 86 | auth="Cont ainer" | |
| 87 | ||
| 88 | descriptio n="Core Vi x Applicat ion" | |
| 89 | ||
| 90 | name="Core Router" | |
| 91 | ||
| 92 | type="gov. va.med.ima ging.core. interfaces .Router" | |
| 93 | ||
| 94 | factory="g ov.va.med. server.Cor eRouterFac tory" | |
| 95 | /> | |
| 96 | ||
| 97 | <Resource | |
| 98 | ||
| 99 | auth="Cont ainer" | |
| 100 | ||
| 101 | descriptio n="Router Command Fa ctory" | |
| 102 | ||
| 103 | name="Comm andFactory " | |
| 104 | ||
| 105 | type="gov. va.med.ima ging.core. interfaces .router.Co mmandFacto ry" | |
| 106 | ||
| 107 | factory="g ov.va.med. server.Cor eRouterFac tory" | |
| 108 | /> | |
| 109 | ||
| 110 | <Resource | |
| 111 | ||
| 112 | auth="Cont ainer" | |
| 113 | ||
| 114 | descriptio n="Vix App lication C onfigurati on" | |
| 115 | ||
| 116 | name="AppC onfigurati on" | |
| 117 | ||
| 118 | type="gov. va.med.ima ging.core. interfaces .IAppConfi guration" | |
| 119 | ||
| 120 | factory="g ov.va.med. server.Cor eRouterFac tory" | |
| 121 | /> | |
| 122 | ||
| 123 | <Resource | |
| 124 | ||
| 125 | auth="Cont ainer" | |
| 126 | ||
| 127 | descriptio n="Imaging Cache" | |
| 128 | ||
| 129 | name="Imag ingCache" | |
| 130 | ||
| 131 | type="gov. va.med.ima ging.route r.cache.Im agingCache " | |
| 132 | ||
| 133 | factory="g ov.va.med. imaging.ro uter.cache .ImagingCa cheFactory " | |
| 134 | /> | |
| 135 | ||
| 136 | </GlobalNa mingResour ces> | |
| 137 | ||
| 138 | ||
| 139 | <!-- A "Se rvice" is a collecti on of one or more "C onnectors" that shar e | |
| 140 | a s ingle "Con tainer" No te: A "Se rvice" is not itself a "Contai ner", | |
| 141 | so you may no t define s ubcomponen ts such as "Valves" at this le vel. | |
| 142 | Doc umentation at /docs/ config/ser vice.html | |
| 143 | --> | |
| 144 | ||
| 145 | <Service | |
| 146 | name="Cata lina" | |
| 147 | > | |
| 148 | ||
| 149 | ||
| 150 | <!--The co nnectors c an use a s hared exec utor, you can define one or mo re named t hread pool s--> | |
| 151 | ||
| 152 | <!-- | |
| 153 | <Execu tor name=" tomcatThre adPool" na mePrefix=" catalina-e xec-" | |
| 154 | ma xThreads=" 150" minSp areThreads ="4"/> | |
| 155 | --> | |
| 156 | ||
| 157 | <!-- A "Co nnector" r epresents an endpoin t by which requests are receiv ed | |
| 158 | a nd respons es are ret urned. Doc umentation at : | |
| 159 | J ava HTTP C onnector: /docs/conf ig/http.ht ml (blocki ng & non-b locking) | |
| 160 | J ava AJP C onnector: /docs/conf ig/ajp.htm l | |
| 161 | A PR (HTTP/A JP) Connec tor: /docs /apr.html | |
| 162 | D efine a no n-SSL HTTP /1.1 Conne ctor on po rt 8080 | |
| 163 | --> | |
| 164 | ||
| 165 | <Connector | |
| 166 | ||
| 167 | port="8080 " | |
| 168 | ||
| 169 | protocol=" HTTP/1.1" | |
| 170 | ||
| 171 | maxHttpHea derSize="8 192" | |
| 172 | ||
| 173 | maxThreads ="150" | |
| 174 | ||
| 175 | connection Timeout="2 0000" | |
| 176 | ||
| 177 | disableUpl oadTimeout ="true" | |
| 178 | ||
| 179 | maxKeepAli veRequests ="1" | |
| 180 | ||
| 181 | enableLook ups="false " | |
| 182 | ||
| 183 | redirectPo rt="443" | |
| 184 | ||
| 185 | acceptCoun t="100" | |
| 186 | ||
| 187 | compressio n="on" | |
| 188 | /> | |
| 189 | ||
| 190 | <!-- A "Co nnector" u sing the s hared thre ad pool--> | |
| 191 | ||
| 192 | <!-- | |
| 193 | <Conne ctor execu tor="tomca tThreadPoo l" | |
| 194 | port= "8080" pro tocol="HTT P/1.1" | |
| 195 | conne ctionTimeo ut="20000" | |
| 196 | redirectPo rt=" PORT " /> | |
| 197 | --> | |
| 198 | ||
| 199 | <!-- Defin e a SSL HT TP/1.1 Con nector on port 443 t o view the VIX trans action log | |
| 200 | T his connec tor uses t he JSSE co nfiguratio n, when us ing APR, t he | |
| 201 | c onnector s hould be u sing the O penSSL sty le configu ration | |
| 202 | d escribed i n the APR documentat ion --> | |
| 203 | ||
| 204 | <Connector | |
| 205 | ||
| 206 | port="443" | |
| 207 | ||
| 208 | protocol=" org.apache .coyote.ht tp11.Http1 1NioProtoc ol" | |
| 209 | ||
| 210 | socket.rxB ufSize="25 6000" | |
| 211 | ||
| 212 | socket.txB ufSize="25 6000" | |
| 213 | ||
| 214 | socket.dir ectBuffer= "true" | |
| 215 | ||
| 216 | connection Timeout="2 0000" | |
| 217 | ||
| 218 | maxThreads ="150" | |
| 219 | ||
| 220 | clientAuth ="false" | |
| 221 | ||
| 222 | enableLook ups="true" | |
| 223 | ||
| 224 | disableUpl oadTimeout ="true" | |
| 225 | ||
| 226 | acceptCoun t="100" | |
| 227 | ||
| 228 | debug="11" | |
| 229 | ||
| 230 | secure="tr ue" | |
| 231 | ||
| 232 | sslProtoco l="TLS" | |
| 233 | ||
| 234 | SSLEnabled ="true" | |
| 235 | ||
| 236 | keystoreFi le="ccc" | |
| 237 | ||
| 238 | keystorePa ss="aaa" | |
| 239 | ||
| 240 | ciphers="n ull" | |
| 241 | /> | |
| 242 | ||
| 243 | <!-- Defin e a SSL HT TP/1.1 Con nector on port PORT | |
| 244 | T his connec tor uses t he JSSE co nfiguratio n, when us ing APR, t he | |
| 245 | c onnector s hould be u sing the O penSSL sty le configu ration | |
| 246 | d escribed i n the APR documentat ion --> | |
| 247 | ||
| 248 | <Connector | |
| 249 | ||
| 250 | port=" PORT " | |
| 251 | ||
| 252 | protocol=" org.apache .coyote.ht tp11.Http1 1Protocol" | |
| 253 | ||
| 254 | maxThreads ="150" | |
| 255 | ||
| 256 | clientAuth ="true" | |
| 257 | ||
| 258 | enableLook ups="true" | |
| 259 | ||
| 260 | disableUpl oadTimeout ="true" | |
| 261 | ||
| 262 | acceptCoun t="100" | |
| 263 | ||
| 264 | debug="11" | |
| 265 | ||
| 266 | secure="tr ue" | |
| 267 | ||
| 268 | sslProtoco l="TLS" | |
| 269 | ||
| 270 | SSLEnabled ="true" | |
| 271 | ||
| 272 | keystoreFi le="ccc" | |
| 273 | ||
| 274 | keystorePa ss="aaa" | |
| 275 | ||
| 276 | keyAlias=" vixfederat ion" | |
| 277 | ||
| 278 | truststore File="ddd" | |
| 279 | ||
| 280 | truststore Pass="bbb" | |
| 281 | ||
| 282 | ciphers="n ull" | |
| 283 | /> | |
| 284 | ||
| 285 | ||
| 286 | <!-- Defin e an AJP 1 .3 Connect or on port PORT --> | |
| 287 | ||
| 288 | <!--<Conne ctor port= " PORT " protocol ="AJP/1.3" redirectP ort=" PORT " />--> | |
| 289 | ||
| 290 | ||
| 291 | ||
| 292 | <!-- An En gine repre sents the entry poin t (within Catalina) that proce sses | |
| 293 | e very reque st. The E ngine impl ementation for Tomca t stand al one | |
| 294 | a nalyzes th e HTTP hea ders inclu ded with t he request , and pass es them | |
| 295 | o n to the a ppropriate Host (vir tual host) . | |
| 296 | D ocumentati on at /doc s/config/e ngine.html --> | |
| 297 | ||
| 298 | ||
| 299 | <!-- You s hould set jvmRoute t o support load-balan cing via A JP ie : | |
| 300 | <Engin e name="St andalone" defaultHos t="localho st" jvmRou te="jvm1"> | |
| 301 | --> | |
| 302 | ||
| 303 | <Engine | |
| 304 | defaultHos t="xxx.vix . URL " | |
| 305 | name="Cata lina" | |
| 306 | > | |
| 307 | ||
| 308 | ||
| 309 | <!--For cl ustering, please tak e a look a t document ation at: | |
| 310 | /docs/clus ter-howto. html (sim ple how to ) | |
| 311 | /docs/conf ig/cluster .html (ref erence doc umentation ) --> | |
| 312 | ||
| 313 | <!-- | |
| 314 | <Clu ster class Name="org. apache.cat alina.ha.t cp.SimpleT cpCluster" /> | |
| 315 | --> | |
| 316 | ||
| 317 | ||
| 318 | <!-- The r equest dum per valve dumps usef ul debuggi ng informa tion about | |
| 319 | the reque st and res ponse data received and sent b y Tomcat. | |
| 320 | Documenta tion at: / docs/confi g/valve.ht ml --> | |
| 321 | ||
| 322 | <!-- | |
| 323 | <Val ve classNa me="org.ap ache.catal ina.valves .RequestDu mperValve" /> | |
| 324 | --> | |
| 325 | ||
| 326 | ||
| 327 | <!-- This Realm uses the UserD atabase co nfigured i n the glob al JNDI | |
| 328 | resources under the key "User Database". Any edit s | |
| 329 | that are performed against th is UserDat abase are immediatel y | |
| 330 | available for use b y the Real m. --> | |
| 331 | ||
| 332 | <Realm | |
| 333 | className= "org.apach e.catalina .realm.Use rDatabaseR ealm" | |
| 334 | resourceNa me="UserDa tabase" | |
| 335 | /> | |
| 336 | ||
| 337 | ||
| 338 | <!-- Defin e the defa ult virtua l host | |
| 339 | Note: XML Schema va lidation w ill not wo rk with Xe rces 2.2. | |
| 340 | --> | |
| 341 | ||
| 342 | <Host | |
| 343 | appBase="w ebapps" | |
| 344 | name="xxx. URL " | |
| 345 | unpackWARs ="false" | |
| 346 | deployOnSt artup="tru e" | |
| 347 | autoDeploy ="false" | |
| 348 | > | |
| 349 | ||
| 350 | <Realm | |
| 351 | ||
| 352 | className= "gov.va.me d.imaging. tomcat.vis tarealm.Vi staAccessV erifyRealm " | |
| 353 | ||
| 354 | siteNumber ="xxx" | |
| 355 | ||
| 356 | siteAbbrev iation="yy y" | |
| 357 | ||
| 358 | siteName=" Metropolis " | |
| 359 | ||
| 360 | vistaServe r="localho st" | |
| 361 | ||
| 362 | vistaPort= "zzzz" | |
| 363 | ||
| 364 | usingPrinc ipalCache= "true" | |
| 365 | ||
| 366 | principalC acheLifesp an="60000" | |
| 367 | ||
| 368 | refreshPri ncipalCach eEntryOnUs e="true" | |
| 369 | ||
| 370 | vistaConne ctDelayKlu dge="1000" | |
| 371 | /> | |
| 372 | ||
| 373 | <Context | |
| 374 | docBase="s iteservice webapp" | |
| 375 | path="/Vis tAWebSvcs" | |
| 376 | /> | |
| 377 | ||
| 378 | <Context | |
| 379 | docBase="s iteservice webapp" | |
| 380 | path="/Vis taWebSvcs" | |
| 381 | /> | |
| 382 | ||
| 383 | <Context | |
| 384 | docBase="s iteservice webapp" | |
| 385 | path="/vis tawebsvcs" | |
| 386 | /> | |
| 387 | ||
| 388 | <Alias> | |
| 389 | localhost | |
| 390 | </Alias> | |
| 391 | ||
| 392 | </Host> | |
| 393 | ||
| 394 | </Engine> | |
| 395 | ||
| 396 | </Service> | |
| 397 | ||
| 398 | <Service | |
| 399 | ||
| 400 | name="Peri odicROICom mandServic e" | |
| 401 | ||
| 402 | className= "gov.va.me d.server.t omcat.Tomc atServiceA dapter" | |
| 403 | > | |
| 404 | ||
| 405 | <Engine | |
| 406 | ||
| 407 | name="Peri odicROICom mandEngine " | |
| 408 | ||
| 409 | defaultHos t="xxx.vix . URL " | |
| 410 | ||
| 411 | className= "gov.va.me d.server.t omcat.Tomc atEngineAd apter" | |
| 412 | ||
| 413 | serverAgno sticEngine ClassName= "gov.va.me d.imaging. roi.comman ds.periodi c.Periodic ROICommand EngineAdap ter" | |
| 414 | > | |
| 415 | ||
| 416 | <Realm | |
| 417 | ||
| 418 | className= "gov.va.me d.imaging. tomcat.vis tarealm.Vi staAccessV erifyRealm " | |
| 419 | ||
| 420 | siteNumber ="xxx" | |
| 421 | ||
| 422 | siteAbbrev iation="yy y" | |
| 423 | ||
| 424 | siteName=" Metropolis " | |
| 425 | ||
| 426 | vistaServe r="localho st" | |
| 427 | ||
| 428 | vistaPort= "zzzz" | |
| 429 | ||
| 430 | usingPrinc ipalCache= "true" | |
| 431 | ||
| 432 | principalC acheLifesp an="60000" | |
| 433 | ||
| 434 | refreshPri ncipalCach eEntryOnUs e="true" | |
| 435 | ||
| 436 | vistaConne ctDelayKlu dge="1000" | |
| 437 | /> | |
| 438 | ||
| 439 | <Host | |
| 440 | ||
| 441 | className= "gov.va.me d.server.t omcat.Tomc atHostAdap ter" | |
| 442 | ||
| 443 | appBase="p eriodiccom mands" | |
| 444 | ||
| 445 | name="660. URL " | |
| 446 | /> | |
| 447 | ||
| 448 | </Engine> | |
| 449 | ||
| 450 | </Service> | |
| 451 | </Server> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.