Produced by Araxis Merge on 10/5/2018 9:05:54 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 | MHEDP3_VAOS_VATS_SM_Sept2018.zip\VAR 4.5.2\var-resources-4.5.2.zip\ResourceIntTest\src\resinttest\resources\META-INF\cocoon\spring\resinttest | applicationContext-JPA.xml | Wed Aug 15 03:28:53 2018 UTC |
| 2 | MHEDP3_VAOS_VATS_SM_Sept2018.zip\VAR 4.5.2\var-resources-4.5.2.zip\ResourceIntTest\src\resinttest\resources\META-INF\cocoon\spring\resinttest | applicationContext-JPA.xml | Fri Oct 5 20:34:24 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 6 | 244 |
| Changed | 5 | 10 |
| 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 | <beans | |
| 6 | xmlns="htt p://www.sp ringframew ork.org/sc hema/beans " | |
| 7 | xmlns:xsi= "http://ww w.w3.org/2 001/XMLSch ema-instan ce" | |
| 8 | xmlns:cont ext="http: //www.spri ngframewor k.org/sche ma/context " | |
| 9 | xmlns:aop= "http://ww w.springfr amework.or g/schema/a op" | |
| 10 | xmlns:tx=" http://www .springfra mework.org /schema/tx " | |
| 11 | xmlns:p="h ttp://www. springfram ework.org/ schema/p" | |
| 12 | xsi:schema Location=" http://www .springfra mework.org /schema/be ans http ://www.spr ingframewo rk.org/sch ema/beans/ spring-bea ns-3.0.xsd | |
| 13 | http ://www.spr ingframewo rk.org/sch ema/contex t http://w ww.springf ramework.o rg/schema/ context/sp ring-conte xt-3.0.xsd | |
| 14 | http ://www.spr ingframewo rk.org/sch ema/aop http://w ww.springf ramework.o rg/schema/ aop/spring -aop-3.0.x sd | |
| 15 | http ://www.spr ingframewo rk.org/sch ema/tx http://w ww.springf ramework.o rg/schema/ tx/spring- tx-3.0.xsd " | |
| 16 | > | |
| 17 | ||
| 18 | ||
| 19 | <context:a nnotation- config/> | |
| 20 | ||
| 21 | <context:c omponent-s can | |
| 22 | base-packa ge="com.ag ilex.healt hcare.vete ranappoint ment" | |
| 23 | /> | |
| 24 | ||
| 25 | ||
| 26 | <bean | |
| 27 | id="liquib ase" | |
| 28 | class="liq uibase.int egration.s pring.Spri ngLiquibas e" | |
| 29 | > | |
| 30 | ||
| 31 | <property | |
| 32 | name="data Source" | |
| 33 | ref="jndiD ataSource" | |
| 34 | /> | |
| 35 | ||
| 36 | <property | |
| 37 | name="chan geLog" | |
| 38 | value="cla sspath:/ME TA-INF/liq uibase/db. changelog- master.xml " | |
| 39 | /> | |
| 40 | ||
| 41 | </bean> | |
| 42 | ||
| 43 | ||
| 44 | <bean | |
| 45 | id="jndiDa taSource" | |
| 46 | class="org .springfra mework.jdb c.datasour ce.DriverM anagerData Source" | |
| 47 | > | |
| 48 | ||
| 49 | <property | |
| 50 | name="driv erClassNam e" | |
| 51 | value="net .sourcefor ge.jtds.jd bc.Driver" | |
| 52 | /> | |
| 53 | ||
| 54 | <property | |
| 55 | name="url" | |
| 56 | value="jdb c:oracle:t hin:@ IP :vamfdb" | |
| 57 | /> | |
| 58 | ||
| 59 | <property | |
| 60 | name="user name" | |
| 61 | value="VAR DB" | |
| 62 | /> | |
| 63 | ||
| 64 | <property | |
| 65 | name="pass word" | |
| 66 | value="Agi lexadmin99 $" | |
| 67 | /> | |
| 68 | ||
| 69 | </bean> | |
| 70 | ||
| 71 | ||
| 72 | <bean | |
| 73 | id="authJn diDataSour ce" | |
| 74 | class="org .springfra mework.jdb c.datasour ce.DriverM anagerData Source" | |
| 75 | > | |
| 76 | ||
| 77 | <property | |
| 78 | name="driv erClassNam e" | |
| 79 | value="net .sourcefor ge.jtds.jd bc.Driver" | |
| 80 | /> | |
| 81 | ||
| 82 | <property | |
| 83 | name="url" | |
| 84 | value="jdb c:oracle:t hin:@ IP :vamfdb" | |
| 85 | /> | |
| 86 | ||
| 87 | <property | |
| 88 | name="user name" | |
| 89 | value="aut hdb" | |
| 90 | /> | |
| 91 | ||
| 92 | <property | |
| 93 | name="pass word" | |
| 94 | value="Agi lexadmin99 $" | |
| 95 | /> | |
| 96 | ||
| 97 | </bean> | |
| 98 | ||
| 99 | ||
| 100 | <bean | |
| 101 | id="jndiCd wDataSourc e" | |
| 102 | class="org .springfra mework.jdb c.datasour ce.DriverM anagerData Source" | |
| 103 | > | |
| 104 | ||
| 105 | <property | |
| 106 | name="driv erClassNam e" | |
| 107 | value="net .sourcefor ge.jtds.jd bc.Driver" | |
| 108 | /> | |
| 109 | ||
| 110 | <property | |
| 111 | name="url" | |
| 112 | value="jdb c:jtds:sql server:// IP : PORT ;databaseN ame=OIA_Mo bileHealth ;useNTLMv2 =true;doma in=mobiled ev.local" | |
| 113 | /> | |
| 114 | ||
| 115 | <property | |
| 116 | name="user name" | |
| 117 | value="
|
|
| 118 | /> | |
| 119 | ||
| 120 | <property | |
| 121 | name="pass word" | |
| 122 | value="A I " | |
| 123 | /> | |
| 124 | ||
| 125 | </bean> | |
| 126 | ||
| 127 | </beans> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.