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\portal-admin | tomcat-context.xml | Thu Aug 23 21:39:14 2018 UTC |
| 2 | MHV_2018.4.0.0.zip\2018.4.0.0\national portal\mhv_source\mhv_devops\src\main\portal-admin | tomcat-context.xml | Sat Sep 15 20:17:02 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 118 |
| Changed | 2 | 6 |
| 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 | <!-- The c ontents of this file will be l oaded for each web a pplication --> | |
| 22 | <Context> | |
| 23 | ||
| 24 | ||
| 25 | <!-- Defau lt set of monitored resources --> | |
| 26 | ||
| 27 | <WatchedRe source> | |
| 28 | WEB-INF/we b.xml | |
| 29 | </WatchedR esource> | |
| 30 | ||
| 31 | ||
| 32 | <!-- Uncom ment this to disable session p ersistence across To mcat resta rts --> | |
| 33 | ||
| 34 | <!-- | |
| 35 | <Manag er pathnam e="" /> | |
| 36 | --> | |
| 37 | ||
| 38 | ||
| 39 | <!-- Uncom ment this to enable Comet conn ection tac king (prov ides event s | |
| 40 | o n session expiration as well a s webapp l ifecycle) --> | |
| 41 | ||
| 42 | <!-- | |
| 43 | <Valve className ="org.apac he.catalin a.valves.C ometConnec tionManage rValve" /> | |
| 44 | --> | |
| 45 | ||
| 46 | <Resource | |
| 47 | name="jdbc /liferay" | |
| 48 | auth="Cont ainer" | |
| 49 | type="java x.sql.Data Source" | |
| 50 | ||
| 51 | maxActive= "100" | |
| 52 | maxIdle="3 0" | |
| 53 | maxWait="1 0000" | |
| 54 | ||
| 55 | username=" AI " | |
| 56 | password=" AI " | |
| 57 | ||
| 58 | driverClas sName="ora cle.jdbc.x a.client.O racleXADat aSource" | |
| 59 | ||
| 60 | url="jdbc: oracle:thi n:@ IP : PORT :SID" | |
| 61 | /> | |
| 62 | </Context> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.