Produced by Araxis Merge on 4/2/2019 1:06: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 | C:\AraxisMergeCompare\Pri_un\ARS_Backend\ars_app\src\main\java\gov\va\med\ars\configuration\spring | SpringMvcConfig.java | Wed Mar 27 19:22:44 2019 UTC |
2 | C:\AraxisMergeCompare\Pri_re\ARS_Backend\ars_app\src\main\java\gov\va\med\ars\configuration\spring | SpringMvcConfig.java | Thu Mar 28 17:50:38 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 110 |
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 | package go v.va.med.a rs.configu ration.spr ing; | |
2 | ||
3 | import org .springfra mework.con text.annot ation.Bean ; | |
4 | import org .springfra mework.con text.annot ation.Comp onentScan; | |
5 | import org .springfra mework.con text.annot ation.Conf iguration; | |
6 | import org .springfra mework.con text.annot ation.Filt erType; | |
7 | import org .springfra mework.web .client.Re stTemplate ; | |
8 | import org .springfra mework.web .multipart .Multipart Resolver; | |
9 | import org .springfra mework.web .multipart .commons.C ommonsMult ipartResol ver; | |
10 | import org .springfra mework.web .servlet.c onfig.anno tation.Def aultServle tHandlerCo nfigurer; | |
11 | import org .springfra mework.web .servlet.c onfig.anno tation.Ena bleWebMvc; | |
12 | import org .springfra mework.web .servlet.c onfig.anno tation.Res ourceHandl erRegistry ; | |
13 | import org .springfra mework.web .servlet.c onfig.anno tation.Web MvcConfigu rerAdapter ; | |
14 | ||
15 | /*import g ov.va.med. fee.loggin g.LoggingH andler;*/ | |
16 | ||
17 | /** | |
18 | * @author
|
|
19 | * | |
20 | */ | |
21 | ||
22 | @Configura tion | |
23 | @Component Scan(baseP ackages = "gov.va.me d", exclud eFilters = { | |
24 | @Com ponentScan .Filter(ty pe = Filte rType.REGE X, pattern = "gov.va .med.ars.c onfigurati on.*"), | |
25 | @Com ponentScan .Filter(ty pe = Filte rType.REGE X, pattern = "gov.va .med.x277c a.*") }) | |
26 | @EnableWeb Mvc | |
27 | public cla ss SpringM vcConfig e xtends Web MvcConfigu rerAdapter { | |
28 | ||
29 | @O verride | |
30 | pu blic void configureD efaultServ letHandlin g(DefaultS ervletHand lerConfigu rer config urer) { | |
31 | conf igurer.ena ble(); | |
32 | } | |
33 | ||
34 | @O verride | |
35 | pu blic void addResourc eHandlers( ResourceHa ndlerRegis try regist ry) { | |
36 | regi stry.addRe sourceHand ler("/reso urces/**") .addResour ceLocation s("/resour ces/"); | |
37 | } | |
38 | ||
39 | @B ean | |
40 | pu blic RestT emplate te mplate() { | |
41 | retu rn new Res tTemplate( ); | |
42 | } | |
43 | ||
44 | @B ean | |
45 | pu blic Multi partResolv er multipa rtResolver () { | |
46 | Comm onsMultipa rtResolver commonsMu ltipartRes olver = ne w CommonsM ultipartRe solver(); | |
47 | comm onsMultipa rtResolver .setMaxUpl oadSize(26 8435456); | |
48 | retu rn commons MultipartR esolver; | |
49 | } | |
50 | ||
51 | /* | |
52 | * @Bean pub lic Loggin gHandler c ontrollerA spect(){ r eturn new | |
53 | * LoggingHa ndler(); } | |
54 | * / | |
55 | ||
56 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.