Produced by Araxis Merge on 6/9/2017 3:51:36 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 | Fri Jun 9 19:51:36 2017 UTC | ||
| 2 | eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\VAP_CIF_CODE0502.zip\VAP_CIF_CODE0502\VAP_CIF_CODE0502\nvap-web\src\main\webapp\WEB-INF\spring\gov\va\nvap\web\privacy | privacy-config.xml | Fri Apr 21 20:03:30 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 1 | 189 |
| 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:aop= "http://ww w.springfr amework.or g/schema/a op" | |||||
| 10 | ||||||
| 11 | xmlns:tx=" http://www .springfra mework.org /schema/tx " | |||||
| 12 | xmlns:jee= "http://ww w.springfr amework.or g/schema/j ee" | |||||
| 13 | ||||||
| 14 | xmlns:cont ext="http: //www.spri ngframewor k.org/sche ma/context " | |||||
| 15 | ||||||
| 16 | xsi:schema Location=" | |||||
| 17 | http ://www.spr ingframewo rk.org/sch ema/beans http://www .springfra mework.org /schema/be ans/spring -beans.xsd | |||||
| 18 | http ://www.spr ingframewo rk.org/sch ema/tx htt p://www.sp ringframew ork.org/sc hema/tx/sp ring-tx.xs d | |||||
| 19 | http ://www.spr ingframewo rk.org/sch ema/contex t | |||||
| 20 | http ://www.spr ingframewo rk.org/sch ema/contex t/spring-c ontext-2.5 .xsd | |||||
| 21 | http ://www.spr ingframewo rk.org/sch ema/jee ht tp://www.s pringframe work.org/s chema/jee/ spring-jee -2.5.xsd | |||||
| 22 | http ://www.spr ingframewo rk.org/sch ema/aop ht tp://www.s pringframe work.org/s chema/aop/ spring-aop .xsd" | |||||
| 23 | > | |||||
| 24 | ||||||
| 25 | ||||||
| 26 | ||||||
| 27 | <bean | |||||
| 28 | id="cmsHel per" | |||||
| 29 | class="gov .va.nvap.w eb.helper. privacy.Co nsentManag ementHelpe r" | |||||
| 30 | > | |||||
| 31 | ||||||
| 32 | <property | |||||
| 33 | name="cms" | |||||
| 34 | ref="cms" | |||||
| 35 | /> | |||||
| 36 | ||||||
| 37 | <property | |||||
| 38 | name="ecs" | |||||
| 39 | ref="ecs" | |||||
| 40 | /> | |||||
| 41 | ||||||
| 42 | <property | |||||
| 43 | name="home Community" | |||||
| 44 | ref="homeC ommunity" | |||||
| 45 | /> | |||||
| 46 | ||||||
| 47 | <property | |||||
| 48 | name="data ToConsentD irectiveDo cument" | |||||
| 49 | ref="patie ntConsentD irectiveDa taToDocume nt" | |||||
| 50 | /> | |||||
| 51 | ||||||
| 52 | <property | |||||
| 53 | name="upda teConsentD irectiveDo cumentStyl esheet" | |||||
| 54 | ||||||
| 55 | ref="updat eConsentDi rectiveDoc umentStyle sheet" | |||||
| 56 | /> | |||||
| 57 | ||||||
| 58 | <property | |||||
| 59 | name="data JaxbHelper " | |||||
| 60 | ref="conse ntDirectiv eDataJaxb2 Marshaller " | |||||
| 61 | /> | |||||
| 62 | ||||||
| 63 | <property | |||||
| 64 | name="xmlT oString" | |||||
| 65 | ref="xmlTo String" | |||||
| 66 | /> | |||||
| 67 | ||||||
| 68 | <property | |||||
| 69 | name="stri ngToXml" | |||||
| 70 | ref="strin gToXML" | |||||
| 71 | /> | |||||
| 72 | ||||||
| 73 | <property | |||||
| 74 | name="orga nizationEx clusionsAl lowed" | |||||
| 75 | value="${o rganizatio n.exclusio ns.enabled }" | |||||
| 76 | /> | |||||
| 77 | ||||||
| 78 | <property | |||||
| 79 | name="form UploadEnab led" | |||||
| 80 | value="${f orm.upload .enabled}" | |||||
| 81 | /> | |||||
| 82 | ||||||
| 83 | <property | |||||
| 84 | name="cons umerOnlyOr gOID" | |||||
| 85 | value="${s sa.homeCom munityOid} " | |||||
| 86 | /> | |||||
| 87 | ||||||
| 88 | </bean> | |||||
| 89 | ||||||
| 90 | ||||||
| 91 | <jee:jndi- lookup | |||||
| 92 | id="cms" | |||||
| 93 | ||||||
| 94 | jndi-name= "ConsentMa nagementSe rvice#gov. va.nvap.se rvice.priv acy.Consen tManagemen tService" | |||||
| 95 | ||||||
| 96 | cache="tru e" | |||||
| 97 | resource-r ef="true" | |||||
| 98 | lookup-on- startup="t rue" | |||||
| 99 | ||||||
| 100 | expected-t ype="gov.v a.nvap.ser vice.priva cy.Consent Management Service" | |||||
| 101 | ||||||
| 102 | proxy-inte rface="gov .va.nvap.s ervice.pri vacy.Conse ntManageme ntService" | |||||
| 103 | /> | |||||
| 104 | ||||||
| 105 | ||||||
| 106 | <jee:jndi- lookup | |||||
| 107 | id="ecs" | |||||
| 108 | ||||||
| 109 | jndi-name= "ExpiringC onsentServ ice#gov.va .nvap.serv ice.privac y.Expiring ConsentSer vice" | |||||
| 110 | ||||||
| 111 | cache="tru e" | |||||
| 112 | resource-r ef="true" | |||||
| 113 | lookup-on- startup="t rue" | |||||
| 114 | ||||||
| 115 | expected-t ype="gov.v a.nvap.ser vice.priva cy.Expirin gConsentSe rvice" | |||||
| 116 | ||||||
| 117 | proxy-inte rface="gov .va.nvap.s ervice.pri vacy.Expir ingConsent Service" | |||||
| 118 | /> | |||||
| 119 | ||||||
| 120 | ||||||
| 121 | <bean | |||||
| 122 | id="patien tConsentDi rectiveDat aToDocumen t" | |||||
| 123 | class="gov .va.nvap.c ommon.tran sformer.xs l.XMLtoXML " | |||||
| 124 | > | |||||
| 125 | ||||||
| 126 | <property | |||||
| 127 | name="tran sformerFac tory" | |||||
| 128 | ref="trans formerFact ory" | |||||
| 129 | /> | |||||
| 130 | ||||||
| 131 | <property | |||||
| 132 | name="reso urce" | |||||
| 133 | ||||||
| 134 | value="cla sspath:gov /va/nvap/p rivacy/dat a/xsl/Cons entDirecti veDataToDo cument.xsl " | |||||
| 135 | /> | |||||
| 136 | ||||||
| 137 | </bean> | |||||
| 138 | ||||||
| 139 | ||||||
| 140 | <bean | |||||
| 141 | id="update ConsentDir ectiveDocu mentStyles heet" | |||||
| 142 | ||||||
| 143 | class="gov .va.nvap.c ommon.tran sformer.xs l.DefaultX SLTransfor mer" | |||||
| 144 | > | |||||
| 145 | ||||||
| 146 | <property | |||||
| 147 | name="tran sformerFac tory" | |||||
| 148 | ref="trans formerFact ory" | |||||
| 149 | /> | |||||
| 150 | ||||||
| 151 | <property | |||||
| 152 | name="reso urce" | |||||
| 153 | ||||||
| 154 | value="cla sspath:gov /va/nvap/p rivacy/dat a/xsl/Upda teConsentD irectiveDo cumentAtta chment.xsl " | |||||
| 155 | /> | |||||
| 156 | ||||||
| 157 | </bean> | |||||
| 158 | ||||||
| 159 | ||||||
| 160 | <bean | |||||
| 161 | id="patien tConsentDi rectiveDoc umentToDat a" | |||||
| 162 | class="gov .va.nvap.c ommon.tran sformer.xs l.XMLtoXML " | |||||
| 163 | > | |||||
| 164 | ||||||
| 165 | <property | |||||
| 166 | name="tran sformerFac tory" | |||||
| 167 | ref="trans formerFact ory" | |||||
| 168 | /> | |||||
| 169 | ||||||
| 170 | <property | |||||
| 171 | name="reso urce" | |||||
| 172 | ||||||
| 173 | value="cla sspath:gov /va/nvap/p rivacy/dat a/xsl/Cons entDirecti veDocument ToData.xsl " | |||||
| 174 | /> | |||||
| 175 | ||||||
| 176 | </bean> | |||||
| 177 | ||||||
| 178 | ||||||
| 179 | <bean | |||||
| 180 | id="consen tDirective DataJaxb2M arshaller" | |||||
| 181 | class="gov .va.nvap.c ommon.jaxb .JaxbUtil" | |||||
| 182 | > | |||||
| 183 | ||||||
| 184 | <construct or-arg | |||||
| 185 | value="gov .va.nvap.p rivacy.dat a" | |||||
| 186 | /> | |||||
| 187 | ||||||
| 188 | </bean> | |||||
| 189 | </beans> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.