Produced by Araxis Merge on 4/23/2019 12:14:44 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\CCRS-BUSRULES-v6.3\CCRS-BUSRULES-v6.3\brengine\config\ci | server.xml | Wed Mar 27 19:38:08 2019 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\CCRS\CCRS-BUSRULES-v6.3\CCRS-BUSRULES-v6.3\brengine\config\ci | server.xml | Wed Apr 17 02:38:38 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 5 | 376 |
| Changed | 4 | 8 |
| 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 | <Server | |
| 6 | port=" PORT " | |
| 7 | shutdown=" SHUTDOWN" | |
| 8 | > | |
| 9 | ||
| 10 | <Listener | |
| 11 | className= "org.apach e.catalina .startup.V ersionLogg erListener " | |
| 12 | /> | |
| 13 | ||
| 14 | <!-- Secur ity listen er. Docume ntation at /docs/con fig/listen ers.html | |
| 15 | <Listene r classNam e="org.apa che.catali na.securit y.Security Listener" /> | |
| 16 | --> | |
| 17 | ||
| 18 | <!--APR li brary load er. Docume ntation at /docs/apr .html --> | |
| 19 | ||
| 20 | <Listener | |
| 21 | className= "org.apach e.catalina .core.AprL ifecycleLi stener" | |
| 22 | SSLEngine= "on" | |
| 23 | /> | |
| 24 | ||
| 25 | <!-- Preve nt memory leaks due to use of particular java/java x APIs--> | |
| 26 | ||
| 27 | <Listener | |
| 28 | className= "org.apach e.catalina .core.JreM emoryLeakP reventionL istener" | |
| 29 | /> | |
| 30 | ||
| 31 | <Listener | |
| 32 | className= "org.apach e.catalina .mbeans.Gl obalResour cesLifecyc leListener " | |
| 33 | /> | |
| 34 | ||
| 35 | <Listener | |
| 36 | className= "org.apach e.catalina .core.Thre adLocalLea kPreventio nListener" | |
| 37 | /> | |
| 38 | ||
| 39 | ||
| 40 | <GlobalNam ingResourc es> | |
| 41 | ||
| 42 | <!-- Edita ble user d atabase th at can als o be used by | |
| 43 | U serDatabas eRealm to authentica te users | |
| 44 | --> | |
| 45 | ||
| 46 | <Resource | |
| 47 | name="User Database" | |
| 48 | auth="Cont ainer" | |
| 49 | ||
| 50 | type="org. apache.cat alina.User Database" | |
| 51 | ||
| 52 | descriptio n="User da tabase tha t can be u pdated and saved" | |
| 53 | ||
| 54 | factory="o rg.apache. catalina.u sers.Memor yUserDatab aseFactory " | |
| 55 | ||
| 56 | pathname=" conf/tomca t-users.xm l" | |
| 57 | /> | |
| 58 | ||
| 59 | </GlobalNa mingResour ces> | |
| 60 | ||
| 61 | ||
| 62 | <Service | |
| 63 | name="Cata lina" | |
| 64 | > | |
| 65 | ||
| 66 | ||
| 67 | <!--The co nnectors c an use a s hared exec utor, you can define one or mo re named t hread pool s--> | |
| 68 | ||
| 69 | <!-- | |
| 70 | <Execu tor name=" tomcatThre adPool" na mePrefix=" catalina-e xec-" | |
| 71 | ma xThreads=" 150" minSp areThreads ="4"/> | |
| 72 | --> | |
| 73 | ||
| 74 | ||
| 75 | <Connector | |
| 76 | port=" PORT " | |
| 77 | protocol=" HTTP/1.1" | |
| 78 | ||
| 79 | connection Timeout="2 0000" | |
| 80 | /> | |
| 81 | ||
| 82 | ||
| 83 | <Connector | |
| 84 | port=" PORT " | |
| 85 | protocol=" org.apache .coyote.ht tp11.Http1 1NioProtoc ol" | |
| 86 | ||
| 87 | maxThreads ="150" | |
| 88 | SSLEnabled ="true" | |
| 89 | scheme="ht tps" | |
| 90 | secure="tr ue" | |
| 91 | ||
| 92 | clientAuth ="false" | |
| 93 | sslProtoco l="TLS" | |
| 94 | ||
| 95 | keystoreFi le="${cata lina.home} /conf/ccrs -dev.p12" | |
| 96 | keystorePa ss="ccrs-d ev-123" | |
| 97 | keyPass="c crs-dev-12 3" | |
| 98 | keyAlias=" brengine-d ev" | |
| 99 | /> | |
| 100 | ||
| 101 | <Connector | |
| 102 | port=" PORT " | |
| 103 | protocol=" AJP/1.3" | |
| 104 | /> | |
| 105 | ||
| 106 | ||
| 107 | ||
| 108 | <!-- An En gine repre sents the entry poin t (within Catalina) that proce sses | |
| 109 | e very reque st. The E ngine impl ementation for Tomca t stand al one | |
| 110 | a nalyzes th e HTTP hea ders inclu ded with t he request , and pass es them | |
| 111 | o n to the a ppropriate Host (vir tual host) . | |
| 112 | D ocumentati on at /doc s/config/e ngine.html --> | |
| 113 | ||
| 114 | ||
| 115 | <!-- You s hould set jvmRoute t o support load-balan cing via A JP ie : | |
| 116 | <Engin e name="Ca talina" de faultHost= "localhost " jvmRoute ="jvm1"> | |
| 117 | --> | |
| 118 | ||
| 119 | <Engine | |
| 120 | name="Cata lina" | |
| 121 | defaultHos t="localho st" | |
| 122 | > | |
| 123 | ||
| 124 | ||
| 125 | <!--For cl ustering, please tak e a look a t document ation at: | |
| 126 | /docs/clus ter-howto. html (sim ple how to ) | |
| 127 | /docs/conf ig/cluster .html (ref erence doc umentation ) --> | |
| 128 | ||
| 129 | <!-- | |
| 130 | <Clu ster class Name="org. apache.cat alina.ha.t cp.SimpleT cpCluster" /> | |
| 131 | --> | |
| 132 | ||
| 133 | ||
| 134 | <!-- Use t he LockOut Realm to p revent att empts to g uess user passwords | |
| 135 | via a bru te-force a ttack --> | |
| 136 | ||
| 137 | <Realm | |
| 138 | className= "org.apach e.catalina .realm.Loc kOutRealm" | |
| 139 | > | |
| 140 | ||
| 141 | <!-- This Realm uses the UserD atabase co nfigured i n the glob al JNDI | |
| 142 | resourc es under t he key "Us erDatabase ". Any ed its | |
| 143 | that ar e performe d against this UserD atabase ar e immediat ely | |
| 144 | availab le for use by the Re alm. --> | |
| 145 | ||
| 146 | <Realm | |
| 147 | className= "org.apach e.catalina .realm.Use rDatabaseR ealm" | |
| 148 | ||
| 149 | resourceNa me="UserDa tabase" | |
| 150 | /> | |
| 151 | ||
| 152 | </Realm> | |
| 153 | ||
| 154 | ||
| 155 | <Host | |
| 156 | name="loca lhost" | |
| 157 | appBase="w ebapps" | |
| 158 | ||
| 159 | unpackWARs ="true" | |
| 160 | autoDeploy ="true" | |
| 161 | > | |
| 162 | ||
| 163 | ||
| 164 | <!-- Singl eSignOn va lve, share authentic ation betw een web ap plications | |
| 165 | Documen tation at: /docs/con fig/valve. html --> | |
| 166 | ||
| 167 | <!-- | |
| 168 | <V alve class Name="org. apache.cat alina.auth enticator. SingleSign On" /> | |
| 169 | -- > | |
| 170 | ||
| 171 | ||
| 172 | <!-- Acces s log proc esses all example. | |
| 173 | Documen tation at: /docs/con fig/valve. html | |
| 174 | Note: T he pattern used is e quivalent to using p attern="co mmon" --> | |
| 175 | ||
| 176 | <Valve | |
| 177 | className= "org.apach e.catalina .valves.Ac cessLogVal ve" | |
| 178 | directory= "logs" | |
| 179 | ||
| 180 | prefix="lo calhost_ac cess_log" | |
| 181 | suffix=".t xt" | |
| 182 | ||
| 183 | pattern="% h %l %u %t "%r& quot; %s % b" | |
| 184 | /> | |
| 185 | ||
| 186 | ||
| 187 | </Host> | |
| 188 | ||
| 189 | </Engine> | |
| 190 | ||
| 191 | </Service> | |
| 192 | </Server> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.