Produced by Araxis Merge on 11/8/2016 5:24:52 PM Eastern Standard 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 | rxrefill-v2.0.0 P2.zip\rxr-tomcat-master.zip\tomcat\src\main\assembly\tomcat | setenv.sh | Mon Feb 2 22:47:32 2015 UTC |
| 2 | rxrefill-v2.0.0 P2.zip\rxr-tomcat-master.zip\tomcat\src\main\assembly\tomcat | setenv.sh | Fri Oct 28 18:48:18 2016 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 42 |
| 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 | # Edit thi s file to CATALINA_B ASE/bin/se tenv.sh to set custo m options | |
| 2 | # Tomcat a ccepts two parameter s JAVA_OPT S and CATA LINA_OPTS | |
| 3 | # JAVA_OPT S are used during ST ART/STOP/R UN | |
| 4 | # CATALINA _OPTS are used durin g START/RU N | |
| 5 | ||
| 6 | # JVM memo ry setting s - genera l | |
| 7 | GENERAL_JV M_OPTS="-X ms${tomcat .heap.xms} m -Xmx${to mcat.heap. xmx}m -Xs s${tomcat. heap.xss}k " | |
| 8 | ||
| 9 | # JVM Sun specific s ettings | |
| 10 | # For a co mplete lis t http://b logs.sun.c om/watt/re source/jvm -options-l ist.html | |
| 11 | SUN_JVM_OP TS="-XX:Ma xPermSize= 256m \ | |
| 12 | -XX:Ma xGCPauseMi llis=500" | |
| 13 | ||
| 14 | # Set any custom app lication o ptions her e | |
| 15 | APPLICATIO N_OPTS="-D com.sun.ma nagement.j mxremote \ | |
| 16 | -Dcom.sun. management .jmxremote . PORT \ | |
| 17 | -Dcom. sun.manage ment.jmxre mote.ssl=f alse \ | |
| 18 | -Dcom. sun.manage ment.jmxre mote.authe nticate=fa lse" | |
| 19 | ||
| 20 | JVM_OPTS=" $GENERAL_J VM_OPTS $S UN_JVM_OPT S" | |
| 21 | ||
| 22 | CATALINA_O PTS="$JVM_ OPTS $APPL ICATION_OP TS" |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.