Produced by Araxis Merge on 4/23/2019 12:15:00 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\CCRS\CCRS-PMPM-Rcvr-v6.3.0\CCRS-PMPM-Rcvr-v6.3.0\src\main\java\gov\va\ccrs\receiver | ReceiverApplication.java | Wed Mar 20 20:42:30 2019 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\CCRS\CCRS-PMPM-Rcvr-v6.3.0\CCRS-PMPM-Rcvr-v6.3.0\src\main\java\gov\va\ccrs\receiver | ReceiverApplication.java | Wed Apr 17 02:59:38 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 168 |
| 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.ccrs. receiver; | |
| 2 | ||
| 3 | import jav ax.naming. NamingExce ption; | |
| 4 | import jav ax.sql.Dat aSource; | |
| 5 | ||
| 6 | import org .apache.ca talina.Con text; | |
| 7 | import org .apache.ca talina.sta rtup.Tomca t; | |
| 8 | import org .apache.to mcat.util. descriptor .web.Conte xtResource ; | |
| 9 | ||
| 10 | ||
| 11 | ||
| 12 | ||
| 13 | ||
| 14 | import org .springfra mework.boo t.SpringAp plication; | |
| 15 | import org .springfra mework.boo t.autoconf igure.Spri ngBootAppl ication; | |
| 16 | import org .springfra mework.boo t.autoconf igure.doma in.EntityS can; | |
| 17 | import org .springfra mework.boo t.builder. SpringAppl icationBui lder; | |
| 18 | import org .springfra mework.boo t.web.serv let.suppor t.SpringBo otServletI nitializer ; | |
| 19 | import org .springfra mework.con text.annot ation.Comp onentScan; | |
| 20 | import org .springfra mework.con text.annot ation.Conf iguration; | |
| 21 | import org .springfra mework.dat a.jpa.repo sitory.con fig.Enable JpaReposit ories; | |
| 22 | //import o rg.springf ramework.c ontext.Con figurableA pplication Context; | |
| 23 | import org .springfra mework.sch eduling.an notation.E nableSched uling; | |
| 24 | ||
| 25 | import org .springfra mework.boo t.web.embe dded.tomca t.TomcatSe rvletWebSe rverFactor y; | |
| 26 | import org .springfra mework.boo t.web.embe dded.tomca t.TomcatWe bServer; | |
| 27 | import org .springfra mework.con text.Confi gurableApp licationCo ntext; | |
| 28 | import org .springfra mework.con text.annot ation.Bean ; | |
| 29 | import org .springfra mework.jnd i.JndiObje ctFactoryB ean; | |
| 30 | ||
| 31 | @SpringBoo tApplicati on | |
| 32 | @EnableSch eduling | |
| 33 | @Configura tion | |
| 34 | /* | |
| 35 | @Component Scan( base Packages = {"gov.va. ccrs.recei ver.config ", | |
| 36 | "gov .va.ccrs.r eceiver.co ntroller", | |
| 37 | "gov .va.ccrs.r eceiver.se rvice"} ) | |
| 38 | @EntitySca n( basePac kages = {" gov.va.ccr s.receiver .entity"} ) | |
| 39 | @EnableJpa Repositori es( basePa ckages = { "gov.va.cc rs.receive r.reposito ry"} ) | |
| 40 | */ | |
| 41 | public cla ss Receive rApplicati on extends SpringBoo tServletIn itializer { | |
| 42 | ||
| 43 | pr ivate stat ic Class<R eceiverApp lication> rcvrApp = ReceiverAp plication. class; | |
| 44 | // private st atic Confi gurableApp licationCo ntext conf AppCtx = n ull; | |
| 45 | ||
| 46 | pu blic stati c void mai n(String[] args) { | |
| 47 | ||
| 48 | //System .setProper ty("spring .devtools. restart.en abled", "f alse"); | |
| 49 | ||
| 50 | //co nfAppCtx = SpringApp lication.r un(rcvrApp , args); | |
| 51 | Spri ngApplicat ion.run(rc vrApp, arg s); | |
| 52 | } | |
| 53 | ||
| 54 | @O verride | |
| 55 | protec ted Spring Applicatio nBuilder c onfigure(S pringAppli cationBuil der builde r) { | |
| 56 | re turn build er.sources (rcvrApp); | |
| 57 | } | |
| 58 | ||
| 59 | /* | |
| 60 | @B ean | |
| 61 | pu blic Tomca tServletWe bServerFac tory tomc atFactory( ) { | |
| 62 | retu rn new Tom catServlet WebServerF actory() { | |
| 63 | ||
| 64 | @Overr ide | |
| 65 | protec ted void p ostProcess Context(Co ntext cont ext) { | |
| 66 | ContextR esource re source = n ew Context Resource() ; | |
| 67 | resource .setName(" jdbc/ccrsD s"); | |
| 68 | resource .setType(D ataSource. class.getN ame()); | |
| 69 | // Hikar i connecti on pool | |
| 70 | re source.set Property(" factory", "com.zaxxe r.hikari.H ikariJNDIF actory"); | |
| 71 | re source.set Property(" jdbcUrl", "jdbc:sqls erver://cc rsdevsql01 .favortech .local;dat abaseName= ccrsdb"); | |
| 72 | re source.set Property(" dataSource .user", "c crs_rw"); | |
| 73 | resource.s etProperty ("dataSour ce.passwor d", " PII "); | |
| 74 | re source.set Scope("Sha rable"); | |
| 75 | } | |
| 76 | ||
| 77 | @Overr ide | |
| 78 | protec ted Tomcat WebServer getTomcatW ebServer(T omcat tomc at) { | |
| 79 | tomcat.e nableNamin g(); | |
| 80 | return s uper.getTo mcatWebSer ver(tomcat ); | |
| 81 | } | |
| 82 | }; | |
| 83 | } | |
| 84 | */ | |
| 85 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.