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 | AppConfig.java | Wed Mar 27 19:21:10 2019 UTC |
2 | C:\AraxisMergeCompare\Pri_re\ARS_Backend\ars_app\src\main\java\gov\va\med\ars\configuration | AppConfig.java | Thu Mar 28 17:50:38 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 222 |
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; | |
2 | ||
3 | import org .springfra mework.aop .aspectj.a nnotation. Annotation AwareAspec tJAutoProx yCreator; | |
4 | import org .springfra mework.cac he.CacheMa nager; | |
5 | import org .springfra mework.cac he.annotat ion.Enable Caching; | |
6 | import org .springfra mework.cac he.concurr ent.Concur rentMapCac heManager; | |
7 | import org .springfra mework.con text.annot ation.Bean ; | |
8 | import org .springfra mework.con text.annot ation.Comp onentScan; | |
9 | import org .springfra mework.con text.annot ation.Conf iguration; | |
10 | import org .springfra mework.con text.annot ation.Enab leAspectJA utoProxy; | |
11 | import org .springfra mework.con text.annot ation.Filt erType; | |
12 | import org .springfra mework.con text.annot ation.Prof ile; | |
13 | import org .springfra mework.con text.annot ation.Prop ertySource ; | |
14 | import org .springfra mework.con text.annot ation.Prop ertySource s; | |
15 | import org .springfra mework.con text.suppo rt.Propert ySourcesPl aceholderC onfigurer; | |
16 | ||
17 | /** | |
18 | * @author
|
|
19 | * | |
20 | */ | |
21 | ||
22 | @Configura tion | |
23 | public cla ss AppConf ig { | |
24 | ||
25 | // static fi nal String props = S ystem.getP roperty("p ropFileLoc ation"); | |
26 | @C onfigurati on | |
27 | @P rofile("de fault") | |
28 | @C omponentSc an(basePac kages = "g ov.va.med" , excludeF ilters = @ ComponentS can.Filter (type = Fi lterType.R EGEX, patt ern = "gov .va.med.ar s.configur ation.spri ng")) | |
29 | @P ropertySou rces({ @Pr opertySour ce("file:$ {arsPropFi leLocation }"), @Prop ertySource ("classpat h:oauth.pr operties") , | |
30 | @Prope rtySource( "classpath :Validatio nMessages. properties ") }) | |
31 | @E nableCachi ng | |
32 | @E nableAspec tJAutoProx y | |
33 | st atic class Defaults { | |
34 | ||
35 | } | |
36 | ||
37 | @C onfigurati on | |
38 | @P rofile("de v") | |
39 | @C omponentSc an(basePac kages = "g ov.va.med" , excludeF ilters = @ ComponentS can.Filter (type = Fi lterType.R EGEX, patt ern = "gov .va.med.ar s.configur ation.spri ng")) | |
40 | @P ropertySou rces({ @Pr opertySour ce("file:$ {arsPropFi leLocation }"), | |
41 | @Prope rtySource( "classpath :oauth.pro perties"), @Property Source("cl asspath:Va lidationMe ssages.pro perties"), | |
42 | @Prope rtySource( "classpath :port.prop erties") } ) | |
43 | @E nableCachi ng | |
44 | @E nableAspec tJAutoProx y(proxyTar getClass = true) | |
45 | st atic class Developme nt { | |
46 | ||
47 | } | |
48 | ||
49 | @C onfigurati on | |
50 | @P rofile("qa ") | |
51 | @C omponentSc an(basePac kages = "g ov.va.med" , excludeF ilters = @ ComponentS can.Filter (type = Fi lterType.R EGEX, patt ern = "gov .va.med.ar s.configur ation.spri ng")) | |
52 | @P ropertySou rces({ @Pr opertySour ce("file:$ {arsPropFi leLocation }"), @Prop ertySource ("classpat h:oauth.pr operties") , | |
53 | @Prope rtySource( "classpath :Validatio nMessages. properties "), @Prope rtySource( "classpath :port.prop erties") } ) | |
54 | @E nableCachi ng | |
55 | @E nableAspec tJAutoProx y(proxyTar getClass = true) | |
56 | st atic class Qa { | |
57 | ||
58 | } | |
59 | ||
60 | @C onfigurati on | |
61 | @P rofile("sq a") | |
62 | @C omponentSc an(basePac kages = "g ov.va.med" , excludeF ilters = @ ComponentS can.Filter (type = Fi lterType.R EGEX, patt ern = "gov .va.med.ar s.configur ation.spri ng")) | |
63 | @P ropertySou rces({ @Pr opertySour ce("file:$ {arsPropFi leLocation }"), @Prop ertySource ("classpat h:oauth.pr operties") , | |
64 | @Prope rtySource( "classpath :Validatio nMessages. properties "), @Prope rtySource( "classpath :port.prop erties") } ) | |
65 | @C omponentSc an(basePac kages = "g ov.va.med" ) | |
66 | @E nableCachi ng | |
67 | @E nableAspec tJAutoProx y(proxyTar getClass = true) | |
68 | st atic class Sqa { | |
69 | ||
70 | } | |
71 | ||
72 | @C onfigurati on | |
73 | @P rofile("de mo") | |
74 | @C omponentSc an(basePac kages = "g ov.va.med" , excludeF ilters = @ ComponentS can.Filter (type = Fi lterType.R EGEX, patt ern = "gov .va.med.ar s.configur ation.spri ng")) | |
75 | @P ropertySou rces({ @Pr opertySour ce("file:$ {arsPropFi leLocation }"), @Prop ertySource ("classpat h:oauth.pr operties") , | |
76 | @Prope rtySource( "classpath :Validatio nMessages. properties "), @Prope rtySource( "classpath :port.prop erties") } ) | |
77 | @E nableCachi ng | |
78 | @E nableAspec tJAutoProx y(proxyTar getClass = true) | |
79 | st atic class Demo { | |
80 | ||
81 | } | |
82 | ||
83 | @C onfigurati on | |
84 | @P rofile("pr oduction") | |
85 | @C omponentSc an(basePac kages = "g ov.va.med" , excludeF ilters = @ ComponentS can.Filter (type = Fi lterType.R EGEX, patt ern = "gov .va.med.ar s.configur ation.spri ng")) | |
86 | @P ropertySou rces({ @Pr opertySour ce("file:$ {arsPropFi leLocation }"), @Prop ertySource ("classpat h:oauth.pr operties") , | |
87 | @Prope rtySource( "classpath :Validatio nMessages. properties "), @Prope rtySource( "classpath :port.prop erties") } ) | |
88 | @E nableCachi ng | |
89 | @E nableAspec tJAutoProx y | |
90 | st atic class Productio n { | |
91 | ||
92 | } | |
93 | ||
94 | /* | |
95 | * @Autowire d private Environmen t env; | |
96 | * / | |
97 | ||
98 | @B ean | |
99 | pu blic stati c Property SourcesPla ceholderCo nfigurer p laceholder COnfigurer () { | |
100 | retu rn new Pro pertySourc esPlacehol derConfigu rer(); | |
101 | } | |
102 | ||
103 | @B ean | |
104 | pu blic Cache Manager ca cheManager () { | |
105 | retu rn new Con currentMap CacheManag er(); | |
106 | } | |
107 | ||
108 | @B ean | |
109 | pu blic Annot ationAware AspectJAut oProxyCrea tor annota tionAwareA spectJAuto Proxy() { | |
110 | retu rn new Ann otationAwa reAspectJA utoProxyCr eator(); | |
111 | } | |
112 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.