Produced by Araxis Merge on 11/8/2016 5:24:59 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\rxrefill-resource-master.zip\ws\src\test\resources | dispatcher-servlet.xml | Mon Oct 17 19:31:28 2016 UTC |
| 2 | rxrefill-v2.0.0 P2.zip\rxrefill-resource-master.zip\ws\src\test\resources | dispatcher-servlet.xml | Mon Oct 31 15:15:17 2016 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 4 | 762 |
| Changed | 3 | 6 |
| 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 | ||
| 9 | xmlns:aop= "http://ww w.springfr amework.or g/schema/a op" | |
| 10 | ||
| 11 | xmlns:cont ext="http: //www.spri ngframewor k.org/sche ma/context " | |
| 12 | ||
| 13 | xmlns:mvc= "http://ww w.springfr amework.or g/schema/m vc" | |
| 14 | ||
| 15 | xmlns:mong o="http:// www.spring framework. org/schema /data/mong o" | |
| 16 | ||
| 17 | xsi:schema Location=" http://www .springfra mework.org /schema/be ans http:/ /www.sprin gframework .org/schem a/beans/sp ring-beans -3.0.xsd | |
| 18 | htt p://www.sp ringframew ork.org/sc hema/conte xt http:// www.spring framework. org/schema /context/s pring-cont ext-3.0.xs d | |
| 19 | htt p://www.sp ringframew ork.org/sc hema/data/ mongo http ://www.spr ingframewo rk.org/sch ema/data/m ongo/sprin g-mongo-1. 0.xsd | |
| 20 | htt p://www.sp ringframew ork.org/sc hema/mvc h ttp://www. springfram ework.org/ schema/mvc /spring-mv c-3.2.xsd | |
| 21 | htt p://www.sp ringframew ork.org/sc hema/aop h ttp://www. springfram ework.org/ schema/aop /spring-ao p-3.0.xsd" | |
| 22 | ||
| 23 | default-la zy-init="f alse" | |
| 24 | > | |
| 25 | ||
| 26 | ||
| 27 | ||
| 28 | <property- placeholde r | |
| 29 | location=" classpath: environmen t.properti es" | |
| 30 | ||
| 31 | xmlns="htt p://www.sp ringframew ork.org/sc hema/conte xt" | |
| 32 | /> | |
| 33 | ||
| 34 | ||
| 35 | <bean | |
| 36 | class="org .springfra mework.con text.suppo rt.Propert ySourcesPl aceholderC onfigurer" | |
| 37 | > | |
| 38 | ||
| 39 | <property | |
| 40 | name="loca tions" | |
| 41 | > | |
| 42 | ||
| 43 | <list> | |
| 44 | ||
| 45 | <value> | |
| 46 | classpath: environmen t.properti es | |
| 47 | </value> | |
| 48 | ||
| 49 | </list> | |
| 50 | ||
| 51 | </property > | |
| 52 | ||
| 53 | <property | |
| 54 | name="igno reUnresolv ablePlaceh olders" | |
| 55 | value="tru e" | |
| 56 | /> | |
| 57 | ||
| 58 | </bean> | |
| 59 | ||
| 60 | ||
| 61 | ||
| 62 | ||
| 63 | <!-- Start Entries f or Metrics capturing --> | |
| 64 | ||
| 65 | ||
| 66 | ||
| 67 | <aop:aspec tj-autopro xy /> | |
| 68 | ||
| 69 | <!-- Uncom ment the m etric aspe ct declara tion to tu rn on the metrics ca pture --> | |
| 70 | ||
| 71 | <bean | |
| 72 | id="rxrMet ricAspect" | |
| 73 | ||
| 74 | class="gov .va.mobile .vamf.rxr. aspect.Rxr ResourceMe tricsAspec t" | |
| 75 | /> | |
| 76 | ||
| 77 | ||
| 78 | <bean | |
| 79 | name="metr icMessageC onfigurati on" | |
| 80 | class="com .agilex.va mf.metrics .MessageCo nfiguratio n" | |
| 81 | > | |
| 82 | ||
| 83 | <construct or-arg | |
| 84 | name="host " | |
| 85 | value="${b eanstalk.h ost}" | |
| 86 | /> | |
| 87 | ||
| 88 | <construct or-arg | |
| 89 | name="port " | |
| 90 | value="${b eanstalk.p ort}" | |
| 91 | /> | |
| 92 | ||
| 93 | <construct or-arg | |
| 94 | name="enab led" | |
| 95 | type="bool ean" | |
| 96 | ||
| 97 | value="${m etrics.bea nstalk.ena bled}" | |
| 98 | /> | |
| 99 | ||
| 100 | <construct or-arg | |
| 101 | name="queu eName" | |
| 102 | value="${m etrics.que ue.name}" | |
| 103 | /> | |
| 104 | ||
| 105 | <construct or-arg | |
| 106 | name="prio rity" | |
| 107 | value="${m etrics.que ue.priorit y}" | |
| 108 | /> | |
| 109 | ||
| 110 | <construct or-arg | |
| 111 | name="dela ySecond" | |
| 112 | value="${m etrics.que ue.delaySe cond}" | |
| 113 | /> | |
| 114 | ||
| 115 | <construct or-arg | |
| 116 | name="proc essExpirat ionSecond" | |
| 117 | ||
| 118 | value="${m etrics.que ue.process Expiration Second}" | |
| 119 | /> | |
| 120 | ||
| 121 | <construct or-arg | |
| 122 | name="maxR etries" | |
| 123 | value="${m etrics.que ue.maxRetr ies}" | |
| 124 | /> | |
| 125 | ||
| 126 | <construct or-arg | |
| 127 | name="retr yDelaySeco nd" | |
| 128 | ||
| 129 | value="${m etrics.que ue.retryDe laySecond} " | |
| 130 | /> | |
| 131 | ||
| 132 | <construct or-arg | |
| 133 | name="repl yTimeoutSe cond" | |
| 134 | ||
| 135 | value="${m etrics.que ue.replyTi meoutSecon d}" | |
| 136 | /> | |
| 137 | ||
| 138 | </bean> | |
| 139 | ||
| 140 | ||
| 141 | <bean | |
| 142 | name="mess agePublish er" | |
| 143 | class="com .agilex.va mf.metrics .MetricMes sagePublis her" | |
| 144 | > | |
| 145 | ||
| 146 | <construct or-arg | |
| 147 | ref="metri cMessageCo nfiguratio n" | |
| 148 | /> | |
| 149 | ||
| 150 | </bean> | |
| 151 | ||
| 152 | ||
| 153 | ||
| 154 | <!-- End E ntries for Metrics c apturing - -> | |
| 155 | ||
| 156 | ||
| 157 | <!-- Star t entries for AuthSe rvices 44 migration --> | |
| 158 | ||
| 159 | <!-- Activ ates scann ing of @Au towired -- > | |
| 160 | ||
| 161 | <context:a nnotation- config/> | |
| 162 | ||
| 163 | ||
| 164 | ||
| 165 | <bean | |
| 166 | id="proper tyConfigur er" | |
| 167 | ||
| 168 | class="org .springfra mework.bea ns.factory .config.Pr opertyOver rideConfig urer" | |
| 169 | > | |
| 170 | ||
| 171 | <property | |
| 172 | name="loca tions" | |
| 173 | > | |
| 174 | ||
| 175 | <list> | |
| 176 | ||
| 177 | <value> | |
| 178 | classpath* :oauth.pro perties | |
| 179 | ||
| 180 | </value> | |
| 181 | ||
| 182 | </list> | |
| 183 | ||
| 184 | </property > | |
| 185 | ||
| 186 | <property | |
| 187 | name="igno reResource NotFound" | |
| 188 | value="tru e" | |
| 189 | /> | |
| 190 | ||
| 191 | </bean> | |
| 192 | ||
| 193 | ||
| 194 | <bean | |
| 195 | id="oauthD etails" | |
| 196 | class="gov .va.mobile .vamf.comm on.domain. OAuth2Clie ntDetailsS ecretIgnor ed" | |
| 197 | /> | |
| 198 | ||
| 199 | ||
| 200 | <bean | |
| 201 | id="oauthC ontroller" | |
| 202 | class="gov .va.vamf.l ib.oauth.c ontroller. OAuthToken Controller " | |
| 203 | > | |
| 204 | ||
| 205 | <construct or-arg | |
| 206 | name="clie ntDetails" | |
| 207 | ref="oauth Details" | |
| 208 | /> | |
| 209 | ||
| 210 | </bean> | |
| 211 | ||
| 212 | ||
| 213 | <!-- End entries fo r AuthServ ices 44 mi gration -- > | |
| 214 | ||
| 215 | ||
| 216 | <!-- Activ ates scann ing of @Re pository a nd @Servic e --> | |
| 217 | ||
| 218 | <context:c omponent-s can | |
| 219 | base-packa ge="gov.va .mobile.va mf.rxr,gov .va.mobile .vamf.comm on" | |
| 220 | /> | |
| 221 | ||
| 222 | ||
| 223 | <!-- Mong o configur ation --> | |
| 224 | ||
| 225 | <mongo:rep ositories | |
| 226 | base-packa ge="gov.va .mobile.va mf.rxr.dat alayer" | |
| 227 | /> | |
| 228 | ||
| 229 | ||
| 230 | <mongo:mon go | |
| 231 | host=" IP " | |
| 232 | port="2701 7" | |
| 233 | > | |
| 234 | ||
| 235 | <mongo:opt ions | |
| 236 | ||
| 237 | connection s-per-host ="${mongo. connection sPerHost}" | |
| 238 | ||
| 239 | threads-al lowed-to-b lock-for-c onnection- multiplier ="${mongo. threadsAll owedToBloc kForConnec tionMultip lier}" | |
| 240 | ||
| 241 | connect-ti meout="${m ongo.conne ctTimeout} " | |
| 242 | ||
| 243 | max-wait-t ime="${mon go.maxWait Time}" | |
| 244 | ||
| 245 | auto-conne ct-retry=" ${mongo.au toConnectR etry}" | |
| 246 | ||
| 247 | socket-kee p-alive="$ {mongo.soc ketKeepAli ve}" | |
| 248 | ||
| 249 | socket-tim eout="${mo ngo.socket Timeout}" | |
| 250 | ||
| 251 | slave-ok=" ${mongo.sl aveOk}" | |
| 252 | ||
| 253 | write-numb er="1" | |
| 254 | ||
| 255 | write-time out="0" | |
| 256 | ||
| 257 | write-fsyn c="true" | |
| 258 | /> | |
| 259 | ||
| 260 | </mongo:mo ngo> | |
| 261 | ||
| 262 | ||
| 263 | <mongo:db- factory | |
| 264 | mongo-ref= "mongo" | |
| 265 | id="mongoD bFactory" | |
| 266 | ||
| 267 | dbname="${ mongo.dbna me}" | |
| 268 | ||
| 269 | username=" AI " | |
| 270 | ||
| 271 | password=" AI " | |
| 272 | /> | |
| 273 | ||
| 274 | ||
| 275 | <bean | |
| 276 | id="mongoT emplate" | |
| 277 | class="org .springfra mework.dat a.mongodb. core.Mongo Template" | |
| 278 | > | |
| 279 | ||
| 280 | <construct or-arg | |
| 281 | name="mong oDbFactory " | |
| 282 | ref="mongo DbFactory" | |
| 283 | /> | |
| 284 | ||
| 285 | </bean> | |
| 286 | ||
| 287 | ||
| 288 | <bean | |
| 289 | id="log4jI nitializat ion" | |
| 290 | class="org .springfra mework.bea ns.factory .config.Me thodInvoki ngFactoryB ean" | |
| 291 | > | |
| 292 | ||
| 293 | <property | |
| 294 | name="targ etClass" | |
| 295 | value="org .springfra mework.uti l.Log4jCon figurer" | |
| 296 | /> | |
| 297 | ||
| 298 | <property | |
| 299 | name="targ etMethod" | |
| 300 | value="ini tLogging" | |
| 301 | /> | |
| 302 | ||
| 303 | <property | |
| 304 | name="argu ments" | |
| 305 | > | |
| 306 | ||
| 307 | <list> | |
| 308 | ||
| 309 | <value> | |
| 310 | classpath: log4j.xml | |
| 311 | </value> | |
| 312 | ||
| 313 | </list> | |
| 314 | ||
| 315 | </property > | |
| 316 | ||
| 317 | </bean> | |
| 318 | ||
| 319 | ||
| 320 | <bean | |
| 321 | id="messag eSource" | |
| 322 | class="org .springfra mework.con text.suppo rt.Resourc eBundleMes sageSource " | |
| 323 | > | |
| 324 | ||
| 325 | <property | |
| 326 | name="base name" | |
| 327 | value="App licationRe sources" | |
| 328 | /> | |
| 329 | ||
| 330 | <property | |
| 331 | name="useC odeAsDefau ltMessage" | |
| 332 | value="tru e" | |
| 333 | /> | |
| 334 | ||
| 335 | </bean> | |
| 336 | ||
| 337 | ||
| 338 | <!-- Confi gures the @Controlle r programm ing model --> | |
| 339 | ||
| 340 | <bean | |
| 341 | id="custom ObjectMapp er" | |
| 342 | ||
| 343 | class="gov .va.mobile .vamf.comm on.objectm appers.Cus tomDateFor matSupport ObjectMapp er" | |
| 344 | > | |
| 345 | ||
| 346 | <construct or-arg> | |
| 347 | ||
| 348 | <bean | |
| 349 | class="jav a.text.Sim pleDateFor mat" | |
| 350 | > | |
| 351 | ||
| 352 | <construct or-arg | |
| 353 | value="EEE , d MMM yy yy HH:mm:s s z" | |
| 354 | /> | |
| 355 | ||
| 356 | </bean> | |
| 357 | ||
| 358 | </construc tor-arg> | |
| 359 | ||
| 360 | </bean> | |
| 361 | ||
| 362 | ||
| 363 | <mvc:annot ation-driv en> | |
| 364 | ||
| 365 | <mvc:messa ge-convert ers> | |
| 366 | ||
| 367 | <bean | |
| 368 | ||
| 369 | class="org .springfra mework.htt p.converte r.json.Map pingJackso n2HttpMess ageConvert er" | |
| 370 | > | |
| 371 | ||
| 372 | <property | |
| 373 | name="obje ctMapper" | |
| 374 | ref="custo mObjectMap per" | |
| 375 | /> | |
| 376 | ||
| 377 | </bean> | |
| 378 | ||
| 379 | </mvc:mess age-conver ters> | |
| 380 | ||
| 381 | </mvc:anno tation-dri ven> | |
| 382 | ||
| 383 | ||
| 384 | </beans> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.