Produced by Araxis Merge on 11/8/2016 5:24:51 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\med-image-library-resource-master.zip\ws\src\test\resources | mil-dao-spring-beans-test.xml | Fri Aug 26 12:59:55 2016 UTC |
| 2 | rxrefill-v2.0.0 P2.zip\med-image-library-resource-master.zip\ws\src\test\resources | mil-dao-spring-beans-test.xml | Fri Oct 28 18:48:07 2016 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 226 |
| 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 | <?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 | ||
| 8 | xmlns:xsi= "http://ww w.w3.org/2 001/XMLSch ema-instan ce" | |
| 9 | xmlns:cont ext="http: //www.spri ngframewor k.org/sche ma/context " | |
| 10 | ||
| 11 | xmlns:mvc= "http://ww w.springfr amework.or g/schema/m vc" | |
| 12 | ||
| 13 | xmlns:tx=" http://www .springfra mework.org /schema/tx " | |
| 14 | xmlns:p="h ttp://www. springfram ework.org/ schema/p" | |
| 15 | ||
| 16 | xsi:schema Location=" http://www .springfra mework.org /schema/be ans | |
| 17 | http:/ /www.sprin gframework .org/schem a/beans/sp ring-beans -3.0.xsd | |
| 18 | http:/ /www.sprin gframework .org/schem a/mvc | |
| 19 | http:/ /www.sprin gframework .org/schem a/mvc/spri ng-mvc-3.0 .xsd | |
| 20 | http:/ /www.sprin gframework .org/schem a/context | |
| 21 | http:/ /www.sprin gframework .org/schem a/context/ spring-con text-3.0.x sd | |
| 22 | http:/ /www.sprin gframework .org/schem a/tx | |
| 23 | http:/ /www.sprin gframework .org/schem a/tx/sprin g-tx.xsd" | |
| 24 | > | |
| 25 | ||
| 26 | ||
| 27 | ||
| 28 | <context:c omponent-s can | |
| 29 | base-packa ge="gov.va .mobile.va mf.mil" | |
| 30 | /> | |
| 31 | ||
| 32 | ||
| 33 | <tx:annota tion-drive n /> | |
| 34 | ||
| 35 | ||
| 36 | <bean | |
| 37 | id="dataSo urce" | |
| 38 | class="org .springfra mework.jdb c.datasour ce.DriverM anagerData Source" | |
| 39 | > | |
| 40 | ||
| 41 | <property | |
| 42 | name="driv erClassNam e" | |
| 43 | > | |
| 44 | <value> | |
| 45 | net.source forge.jtds .jdbc.Driv er | |
| 46 | </value> | |
| 47 | </property > | |
| 48 | ||
| 49 | <property | |
| 50 | name="url" | |
| 51 | > | |
| 52 | <value> | |
| 53 | jdbc:jtds: sqlserver: // IP /BISL_Drug Info;domai n=ADMAE;in stance=Moc kCDW;useNT LMv2=true | |
| 54 | </value> | |
| 55 | </property > | |
| 56 | ||
| 57 | <property | |
| 58 | name="user name" | |
| 59 | > | |
| 60 | <value> | |
| 61 | milService RO | |
| 62 | </value> | |
| 63 | </property > | |
| 64 | ||
| 65 | <property | |
| 66 | name="pass word" | |
| 67 | > | |
| 68 | <value> | |
| 69 | HQs3;Yxd^U E:"]@ | |
| 70 | </value> | |
| 71 | </property > | |
| 72 | ||
| 73 | </bean> | |
| 74 | ||
| 75 | ||
| 76 | ||
| 77 | <bean | |
| 78 | id="entity ManagerFac tory" | |
| 79 | ||
| 80 | class="org .springfra mework.orm .jpa.Local ContainerE ntityManag erFactoryB ean" | |
| 81 | > | |
| 82 | ||
| 83 | <property | |
| 84 | name="pers istenceUni tName" | |
| 85 | value="mil PU" | |
| 86 | /> | |
| 87 | ||
| 88 | <property | |
| 89 | name="data Source" | |
| 90 | ref="dataS ource" | |
| 91 | /> | |
| 92 | ||
| 93 | </bean> | |
| 94 | ||
| 95 | ||
| 96 | <bean | |
| 97 | id="transa ctionManag er" | |
| 98 | class="org .springfra mework.orm .jpa.JpaTr ansactionM anager" | |
| 99 | > | |
| 100 | ||
| 101 | <property | |
| 102 | name="enti tyManagerF actory" | |
| 103 | ref="entit yManagerFa ctory" | |
| 104 | /> | |
| 105 | ||
| 106 | </bean> | |
| 107 | ||
| 108 | ||
| 109 | <!-- Confi gures the @Controlle r programm ing model --> | |
| 110 | ||
| 111 | <mvc:annot ation-driv en/> | |
| 112 | ||
| 113 | ||
| 114 | </beans> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.