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\liferay | tomcat-setenvWithJRebel.sh | Thu Aug 23 21:39:16 2018 UTC |
| 2 | MHV_2018.4.0.0.zip\2018.4.0.0\national portal\mhv_source\mhv_devops\src\main\liferay | tomcat-setenvWithJRebel.sh | Sat Sep 15 20:02:36 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 8 |
| Changed | 1 | 2 |
| 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 | CATALINA_O PTS="$CATA LINA_OPTS -Dfile.enc oding=UTF8 -Djava.ne t.preferIP v4Stack=tr ue -Dorg. apache.cat alina.load er.WebappC lassLoader .ENABLE_CL EAR_REFERE NCES=false -Duser.ti mezone=Ame rica/New_Y ork -Xmx10 24m -DMHV_ ENV_PROPER TY=local - XX:+UsePar NewGC -XX: SurvivorRa tio=8 -XX: TargetSurv ivorRatio= 90 -XX:Max TenuringTh reshold=0 -XX:+UseTL AB -XX:+Us eConcMarkS weepGC" | |
| 2 | #REBEL_HOM E="${LIFER AY_TOMCAT_ HOME/lib}/ jrebel" | |
| 3 | #JAVA_OPTS ="${JAVA_O PTS} -java agent:${LI FERAY_TOMC AT_HOME}/l ib/jrebel/ jrebel.jar -Drebel.r emoting_pl ugin=true" | |
| 4 | CATALINA_O PTS="$CATA LINA_OPTS -Dcom.sun. management .jmxremote -Dcom.sun .managemen t.jmxremot e.port= PORT -Dcom.sun .managemen t.jmxremot e.ssl=fals e -Dcom.su n.manageme nt.jmxremo te.authent icate=fals e" | |
| 5 | CATALINA_O PTS="$CATA LINA_OPTS -Djavax.ne t.ssl.trus tStore=/op t/share/ke ystore/mhv -trust.jks -Djavax.n et.ssl.tru stStorePas sword=chan geit -Djav ax.net.ssl .trustStor eType=JKS -Djavax.ne t.debug=ss l,handshak e" |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.