Produced by Araxis Merge on 4/18/2017 3:49:13 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 | Genisis2Client-master.zip\Genisis2Services-master\src\main\resources | spring-config.xml | Tue Mar 28 12:53:02 2017 UTC |
| 2 | Genisis2Client-master.zip\Genisis2Services-master\src\main\resources | spring-config.xml | Tue Apr 18 19:48:23 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 256 |
| Changed | 2 | 8 |
| 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:p="h ttp://www. springfram ework.org/ schema/p" | |
| 10 | ||
| 11 | xmlns:aop= "http://ww w.springfr amework.or g/schema/a op" | |
| 12 | xmlns:cont ext="http: //www.spri ngframewor k.org/sche ma/context " | |
| 13 | ||
| 14 | xmlns:jee= "http://ww w.springfr amework.or g/schema/j ee" | |
| 15 | xmlns:tx=" http://www .springfra mework.org /schema/tx " | |
| 16 | ||
| 17 | xmlns:task ="http://w ww.springf ramework.o rg/schema/ task" | |
| 18 | ||
| 19 | xsi:schema Location=" http://www .springfra mework.org /schema/ao p http://w ww.springf ramework.o rg/schema/ aop/spring -aop-4.1.x sd http:// www.spring framework. org/schema /beans htt p://www.sp ringframew ork.org/sc hema/beans /spring-be ans-4.1.xs d http://w ww.springf ramework.o rg/schema/ context ht tp://www.s pringframe work.org/s chema/cont ext/spring -context-4 .1.xsd htt p://www.sp ringframew ork.org/sc hema/jee h ttp://www. springfram ework.org/ schema/jee /spring-je e-4.1.xsd http://www .springfra mework.org /schema/tx http://ww w.springfr amework.or g/schema/t x/spring-t x-4.1.xsd http://www .springfra mework.org /schema/ta sk http:// www.spring framework. org/schema /task/spri ng-task-4. 1.xsd" | |
| 20 | > | |
| 21 | ||
| 22 | ||
| 23 | <!-- suppo rt spring annotation --> | |
| 24 | ||
| 25 | <context:a nnotation- config /> | |
| 26 | ||
| 27 | <!-- suppo rt annotat ion transa ction --> | |
| 28 | ||
| 29 | <tx:annota tion-drive n /> | |
| 30 | ||
| 31 | ||
| 32 | ||
| 33 | <!-- decla re datasou rce --> | |
| 34 | ||
| 35 | <bean | |
| 36 | id="dataSo urce" | |
| 37 | ||
| 38 | class="org .springfra mework.jdb c.datasour ce.DriverM anagerData Source" | |
| 39 | > | |
| 40 | ||
| 41 | <property | |
| 42 | name="driv erClassNam e" | |
| 43 | value="net .sourcefor ge.jtds.jd bc.Driver" | |
| 44 | /> | |
| 45 | ||
| 46 | <!-- <property name="url" value=" DNS :// IP /genisisdb " /> --> | |
| 47 | ||
| 48 | <!-- <property name="url" value=" DNS /genisisdb " /> | |
| 49 | <property name="user name" valu e=" AI " /> | |
| 50 | <property name="pass word" valu e=" AI " /> --> | |
| 51 | ||
| 52 | ||
| 53 | <property | |
| 54 | name="url" | |
| 55 | value="${s ervices.db .url}" | |
| 56 | /> | |
| 57 | ||
| 58 | <property | |
| 59 | name="user name" | |
| 60 | value="${s ervices.db .username} " | |
| 61 | /> | |
| 62 | ||
| 63 | <property | |
| 64 | name="pass word" | |
| 65 | value="${s ervices.db .password} " | |
| 66 | /> | |
| 67 | ||
| 68 | </bean> | |
| 69 | ||
| 70 | ||
| 71 | ||
| 72 | ||
| 73 | <!--Hibern ate sessio n factory configurat ion --> | |
| 74 | ||
| 75 | <bean | |
| 76 | id="sessio nFactory" | |
| 77 | class="org .springfra mework.orm .hibernate 5.LocalSes sionFactor yBean" | |
| 78 | > | |
| 79 | ||
| 80 | <property | |
| 81 | name="data Source" | |
| 82 | ref="dataS ource" | |
| 83 | /> | |
| 84 | ||
| 85 | <!-- load hibernate configurat ion file - -> | |
| 86 | ||
| 87 | <property | |
| 88 | name="conf igLocation " | |
| 89 | value="cla sspath:hib ernate.cfg .xml" | |
| 90 | /> | |
| 91 | ||
| 92 | <!-- where to find t he ORM cla sses --> | |
| 93 | ||
| 94 | <property | |
| 95 | name="pack agesToScan " | |
| 96 | value="gov .va.genisi s2.model" | |
| 97 | /> | |
| 98 | ||
| 99 | </bean> | |
| 100 | ||
| 101 | ||
| 102 | <!-- Trans action man ager --> | |
| 103 | ||
| 104 | <bean | |
| 105 | id="transa ctionManag er" | |
| 106 | ||
| 107 | class="org .springfra mework.orm .hibernate 5.Hibernat eTransacti onManager" | |
| 108 | > | |
| 109 | ||
| 110 | <property | |
| 111 | name="sess ionFactory " | |
| 112 | ref="sessi onFactory" | |
| 113 | > | |
| 114 | </property > | |
| 115 | ||
| 116 | </bean> | |
| 117 | ||
| 118 | ||
| 119 | <bean | |
| 120 | id="hibern ateTemplat e" | |
| 121 | class="org .springfra mework.orm .hibernate 5.Hibernat eTemplate" | |
| 122 | > | |
| 123 | ||
| 124 | <property | |
| 125 | name="sess ionFactory " | |
| 126 | ref="sessi onFactory" | |
| 127 | /> | |
| 128 | ||
| 129 | </bean> | |
| 130 | ||
| 131 | ||
| 132 | </beans> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.