Produced by Araxis Merge on 8/16/2018 1:18:59 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 | Thu Aug 16 18:18:59 2018 UTC | ||
| 2 | Caregivers_Tool_CareT_v1_Build 4.zip\core | build.username1.properties | Thu Aug 16 02:29:20 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 1 | 96 |
| 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 | ||||||
| 2 | ## Locatio n of the L iferay Por tal parent directory | |||||
| 3 | app.server .parent.di r=C:/Users /PII/works pace/porta l-6.2/life ray-portal -6.2-ee-sp 14 | |||||
| 4 | ||||||
| 5 | ||||||
| 6 | ### This i s using SP 11 with To mcat 7.0.4 2 | |||||
| 7 | app.se rver.tomca t.dir=${ap p.server.p arent.dir} /tomcat-7. 0.62 | |||||
| 8 | ||||||
| 9 | app.se rver.tomca t.lib.glob al.dir=${a pp.server. tomcat.dir }/lib/ext | |||||
| 10 | app.se rver.tomca t.deploy.d ir=${app.s erver.tomc at.dir}/we bapps | |||||
| 11 | app.se rver.tomca t.portal.d ir=${app.s erver.tomc at.dir}/we bapps/ROOT | |||||
| 12 | ||||||
| 13 | # | |||||
| 14 | # Spec ify the pa ths to a W ebLogic do main with Liferay in stalled. | |||||
| 15 | # | |||||
| 16 | #app.s erver.webl ogic.dir=$ {app.serve r.parent.d ir}/weblog ic-10.3.6 | |||||
| 17 | #app.s erver.webl ogic.deplo y.dir=${ap p.server.w eblogic.di r}/domains /liferay/a utodeploy | |||||
| 18 | #app.s erver.webl ogic.lib.g lobal.dir= ${app.serv er.weblogi c.dir}/dom ains/lifer ay/lib | |||||
| 19 | #app.s erver.webl ogic.porta l.dir=${ap p.server.w eblogic.di r}/domains /liferay/a utodeploy/ ROOT | |||||
| 20 | ||||||
| 21 | # | |||||
| 22 | # Plug ins will b e deployed to this d irectory. Make sure that Lifer ay is | |||||
| 23 | # also set to sc an this di rectory. | |||||
| 24 | # | |||||
| 25 | #auto. deploy.dir =${app.ser ver.parent .dir}/depl oy | |||||
| 26 | ||||||
| 27 | # | |||||
| 28 | # Set this to tr ue if depl oyed WARs are unpack ed. Set th is to fals e your | |||||
| 29 | # appl ication se rver has c oncurrency issues wi th deployi ng large W ARs. | |||||
| 30 | # | |||||
| 31 | # auto .deploy.un pack.war=f alse | |||||
| 32 | ||||||
| 33 | ||||||
| 34 | ||||||
| 35 | ## | |||||
| 36 | ## Compile r | |||||
| 37 | ## | |||||
| 38 | ||||||
| 39 | ant.bu ild.javac. source=1.7 | |||||
| 40 | ant.bu ild.javac. target=1.7 | |||||
| 41 | ||||||
| 42 | javac. compiler=m odern | |||||
| 43 | #javac .compiler= org.eclips e.jdt.core .JDTCompil erAdapter | |||||
| 44 | ||||||
| 45 | ## | |||||
| 46 | ## JRebel | |||||
| 47 | ## | |||||
| 48 | ||||||
| 49 | # | |||||
| 50 | # Set the direct ory that w ill be use d to gener ate a plug in's JRebe l | |||||
| 51 | # configurat on file. N ot specify ing a dire ctory mean s that the generated | |||||
| 52 | # JRebel con figuration file will be placed in a plug in's compi led classe s | |||||
| 53 | # output dir ectory. Th is is also the direc tory that JRebel wil l use to l ook | |||||
| 54 | # for update d classes. | |||||
| 55 | # | |||||
| 56 | #jrebe l.plugin.c lasses.dir = | |||||
| 57 | ||||||
| 58 | ## | |||||
| 59 | ## JUnit | |||||
| 60 | ## | |||||
| 61 | ||||||
| 62 | ## | |||||
| 63 | ## Librari es | |||||
| 64 | ## | |||||
| 65 | ||||||
| 66 | ## | |||||
| 67 | ## Operati ng Systems | |||||
| 68 | ## | |||||
| 69 | ||||||
| 70 | ## | |||||
| 71 | ## PGP | |||||
| 72 | ## | |||||
| 73 | ||||||
| 74 | ||||||
| 75 | ## | |||||
| 76 | ## Plugins | |||||
| 77 | ## | |||||
| 78 | ||||||
| 79 | ||||||
| 80 | # | |||||
| 81 | # Set the exclud es attribu tes to spe cify files that will be exclud ed from a | |||||
| 82 | # plug in WAR. | |||||
| 83 | # | |||||
| 84 | #plugi ns.war.exc ludes=**/W EB-INF/ser vice/**,** /WEB-INF/s rc/** | |||||
| 85 | ||||||
| 86 | ## | |||||
| 87 | ## Sonatyp e | |||||
| 88 | ## | |||||
| 89 | ||||||
| 90 | ||||||
| 91 | ||||||
| 92 | ## | |||||
| 93 | ## Version | |||||
| 94 | ## | |||||
| 95 | ||||||
| 96 |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.