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 | 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 | server.xml | Wed Apr 17 19:20:53 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 30 | 318 |
| Changed | 29 | 192 |
| 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 | type="java x.sql.Data Source" | ||
| 76 | |||
| 77 | driverClas sName="com .microsoft .sqlserver .jdbc.SQLS erverDrive r" | ||
| 78 | |||
| 79 | url="jdbc: sqlserver: //ccrsdevs ql01;datab aseName=cc rsdb" | ||
| 80 | |||
| 81 | username= AI " | ||
| 82 | pass word=AI " | ||
| 83 | maxT otal="20" | ||
| 84 | maxI dle="10" | ||
| 85 | minI dle="5" | ||
| 86 | maxW aitMillis= "10000" | ||
| 87 | vali dationQuer y="select 1"/> | ||
| 88 | <Resou rce name=" UserDataba se" auth=" Container" | ||
| 89 | type=" org.apache .catalina. UserDataba se" | ||
| 90 | descri ption="Use r database that can be updated and saved " | ||
| 91 | factor y="org.apa che.catali na.users.M emoryUserD atabaseFac tory" | ||
| 92 | pathna me="conf/t omcat-user s.xml" /> | ||
| 93 | </GlobalNa mingResour ces> | ||
| 94 | |||
| 95 | |||
| 96 | |||
| 97 | <!-- A "Se rvice" is a collecti on of one or more "C onnectors" that shar e | ||
| 98 | a s ingle "Con tainer" No te: A "Se rvice" is not itself a "Contai ner", | ||
| 99 | so you may no t define s ubcomponen ts such as "Valves" at this le vel. | ||
| 100 | Doc umentation at /docs/ config/ser vice.html | ||
| 101 | --> | ||
| 102 | <Service name="Cata lina" > | ||
| 103 | |||
| 104 | <!--The co nnectors c an use a s hared exec utor, you can define one or mo re named t hread pool s--> | ||
| 105 | <!-- | ||
| 106 | <Execu tor name=" tomcatThre adPool" na mePrefix=" catalina-e xec-" | ||
| 107 | ma xThreads=" 150" minSp areThreads ="4"/> | ||
| 108 | --> | ||
| 109 | |||
| 110 | |||
| 111 | <!-- A "Co nnector" r epresents an endpoin t by which requests are receiv ed | ||
| 112 | a nd respons es are ret urned. Doc umentation at : | ||
| 113 | J ava HTTP C onnector: /docs/conf ig/http.ht ml | ||
| 114 | J ava AJP C onnector: /docs/conf ig/ajp.htm l | ||
| 115 | A PR (HTTP/A JP) Connec tor: /docs /apr.html | ||
| 116 | Define a n on-SSL/TLS HTTP/1.1 Connector on port PORT | ||
| 117 | --> | ||
| 118 | <Connector port="POR T" protocol=" HTTP/1.1" | ||
| 119 | connection Timeout="2 0000" | ||
| 120 | redirectpo rt="PORT" /> | ||
| 121 | <!-- A "Co nnector" u sing the s hared thre ad pool--> | ||
| 122 | <!-- | ||
| 123 | <Conne ctor execu tor="tomca tThreadPoo l" | ||
| 124 | port=" PORT " protocol ="HTTP/1.1 " | ||
| 125 | conne ctionTimeo ut="20000" | ||
| 126 | redirect p ort=" PORT " /> | ||
| 127 | --> | ||
| 128 | <!-- Defin e a SSL/TL S HTTP/1.1 Connector on port 8 443 | ||
| 129 | T his connec tor uses t he NIO imp lementatio n. The def ault | ||
| 130 | S SLImplemen tation wil l depend o n the pres ence of th e APR/nati ve | ||
| 131 | l ibrary and the useOp enSSL attr ibute of t he | ||
| 132 | A prLifecycl eListener. | ||
| 133 | E ither JSSE or OpenSS L style co nfiguratio n may be u sed regard less of | ||
| 134 | t he SSLImpl ementation selected. JSSE styl e configur ation is u sed below. | ||
| 135 | --> | ||
| 136 | <!-- | ||
| 137 | <Connector port=" PORT " protocol ="org.apac he.coyote. http11.Htt p11NioProt ocol" | ||
| 138 | maxTh reads="150 " SSLEnabl ed="true"> | ||
| 139 | <S SLHostConf ig> | ||
| 140 | <Certifi cate certi ficateKeys toreFile=" conf/local host-rsa.j ks" | ||
| 141 | type= "RSA" /> | ||
| 142 | </ SSLHostCon fig> | ||
| 143 | </Conn ector> | ||
| 144 | --> | ||
| 145 | <!-- Defin e a SSL/TL S HTTP/1.1 Connector on port 8 443 with H TTP/2 | ||
| 146 | T his connec tor uses t he APR/nat ive implem entation w hich alway s uses | ||
| 147 | O penSSL for TLS. | ||
| 148 | E ither JSSE or OpenSS L style co nfiguratio n may be u sed. OpenS SL style | ||
| 149 | c onfigurati on is used below. | ||
| 150 | --> | ||
| 151 | <!-- | ||
| 152 | <Connector port=" PORT " protocol ="org.apac he.coyote. http11.Htt p11AprProt ocol" | ||
| 153 | maxTh reads="150 " SSLEnabl ed="true" > | ||
| 154 | <U pgradeProt ocol class Name="org. apache.coy ote.http2. Http2Proto col" /> | ||
| 155 | <S SLHostConf ig> | ||
| 156 | <Certifi cate certi ficateKeyF ile="conf/ localhost- rsa-key.pe m" | ||
| 157 | certi ficateFile ="conf/loc alhost-rsa -cert.pem" | ||
| 158 | certi ficateChai nFile="con f/localhos t-rsa-chai n.pem" | ||
| 159 | type= "RSA" /> | ||
| 160 | </ SSLHostCon fig> | ||
| 161 | </Conn ector> | ||
| 162 | --> | ||
| 163 | |||
| 164 | <!-- Defin e an AJP 1 .3 Connect or on port 8009 --> | ||
| 165 | <Conne ctor port= "PORT" pro tocol="AJP /1.3" redi rectport=" PORT" /> | ||
| 166 | |||
| 167 | |||
| 168 | <!-- An En gine repre sents the entry poin t (within Catalina) that proce sses | ||
| 169 | e very reque st. The E ngine impl ementation for Tomca t stand al one | ||
| 170 | a nalyzes th e HTTP hea ders inclu ded with t he request , and pass es them | ||
| 171 | o n to the a ppropriate Host (vir tual host) . | ||
| 172 | D ocumentati on at /doc s/config/e ngine.html --> | ||
| 173 | |||
| 174 | <!-- You s hould set jvmRoute t o support load-balan cing via A JP ie : | ||
| 175 | <Engin e name="Ca talina" de faultHost= "localhost " jvmRoute ="jvm1"> | ||
| 176 | --> | ||
| 177 | <Engine na me="Catali na" defaultHos t="localho st" > | ||
| 178 | |||
| 179 | <!--For cl ustering, please tak e a look a t document ation at: | ||
| 180 | /docs/clus ter-howto. html (sim ple how to ) | ||
| 181 | /docs/conf ig/cluster .html (ref erence doc umentation ) --> | ||
| 182 | <!-- | ||
| 183 | <Clu ster class Name="org. apache.cat alina.ha.t cp.SimpleT cpCluster" /> | ||
| 184 | --> | ||
| 185 | |||
| 186 | <!-- Use t he LockOut Realm to p revent att empts to g uess user passwords | ||
| 187 | via a bru te-force a ttack --> | ||
| 188 | <Realm className= "org.apach e.catalina .realm.Loc kOutRealm" > | ||
| 189 | <!-- This Realm uses the UserD atabase co nfigured i n the glob al JNDI | ||
| 190 | resourc es under t he key "Us erDatabase ". Any ed its | ||
| 191 | that ar e performe d against this UserD atabase ar e immediat ely | ||
| 192 | availab le for use by the Re alm. --> | ||
| 193 | <Realm className= "org.apach e.catalina .realm.Use rDatabaseR ealm" | ||
| 194 | resourceNa me="UserDa tabase" /> | ||
| 195 | </Realm> | ||
| 196 | |||
| 197 | <Host name ="localhos t" appBase="w ebapps" | ||
| 198 | unpackWARs ="true" autoDeploy ="true" > | ||
| 199 | |||
| 200 | <!-- Singl eSignOn va lve, share authentic ation betw een web ap plications | ||
| 201 | Documen tation at: /docs/con fig/valve. html --> | ||
| 202 | <!-- | ||
| 203 | <V alve class Name="org. apache.cat alina.auth enticator. SingleSign On" /> | ||
| 204 | -- > | ||
| 205 | |||
| 206 | <!-- Acces s log proc esses all example. | ||
| 207 | Documen tation at: /docs/con fig/valve. html | ||
| 208 | Note: T he pattern used is e quivalent to using p attern="co mmon" --> | ||
| 209 | <Valve className= "org.apach e.catalina .valves.Ac cessLogVal ve" directory= "logs" | ||
| 210 | prefix="lo calhost_ac cess_log" suffix=".t xt" | ||
| 211 | pattern="% h %l %u %t "%r& quot; %s % b" /> | ||
| 212 | |||
| 213 | </Host> | ||
| 214 | </Engine> | ||
| 215 | </Service> | ||
| 216 | </Server> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.