iSharkFly-Open/Java-Tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,804 Commits 6 Branches 0 Tags
c0eef5d4b5a41dc199fcb96cdc8f636fd4d4ec00
Commit Graph
3804 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Kerak 8e92dd7e07 Merge pull request #853 from eugenp/ivanp81-master 
fixing incorrect merge
 2016-11-21 09:12:53 -05:00
James Kerak c1f94aab92 fixing incorrect merge 2016-11-21 09:12:30 -05:00
DianeDuan e84957c768 change expect exception in ut 2016-11-21 21:51:20 +08:00
Jim Kerak 2f0768153a Merge pull request #852 from eugenp/ivanp81-master 
Ivanp81 master
 2016-11-21 08:11:20 -05:00
James Kerak 7e5bea3330 resolving merge conflict 2016-11-21 08:10:29 -05:00
Ivan Paolillo 4d4afa6ca4 Code improvement 2016-11-21 13:53:37 +01:00
DianeDuan 77240dc024 delete extra comments and variable assignments, use guava precondition for check 2016-11-21 20:41:33 +08:00
michal_aibin 652dcd2804 URIComponentsBuilder 2016-11-21 12:39:44 +01:00
Ivan Paolillo e66e9d445f Code improvement 2016-11-21 11:43:32 +01:00
Ivan Paolillo 540075ca39 Add method init for common logic 2016-11-21 11:42:13 +01:00
slavisa-baeldung 2186f64126 BAEL-376 - java generics code 2016-11-20 22:35:17 +01:00
slavisa-baeldung 1f0065299f Merge branch 'master' into pr/850-yasser-generics 2016-11-20 22:10:22 +01:00
Yasser Afifi 6835625602 added generics example method and tests 2016-11-20 20:20:52 +00:00
Alex Theedom b846bcc35e Merge pull request #841 from pritambanerjee999/master 
BAEL 317: Setup EJB
 2016-11-20 19:35:51 +00:00
Marek Lewandowski 73bbab4ae6 Update README.md 2016-11-20 19:01:42 +01:00
Grzegorz Piwowarek a7e2e2d6b2 Fix JavaFileUnitTest 2016-11-20 17:39:28 +02:00
eugenp 9bf925cfdf cleanup work 2016-11-20 12:09:40 +02:00
Grzegorz Piwowarek a8fb4e11cb Fix FileTest 2016-11-20 11:57:27 +02:00
DianeDuan d13f7b9ed8 delete last topic code 2016-11-20 11:22:42 +08:00
DianeDuan 42fc383518 FactoryBean example code 2016-11-20 10:52:09 +08:00
oreva 858d14baf3 Reorganized classes according to the last pull request's comments. 2016-11-19 21:14:40 +02:00
slavisa-baeldung 5f99e5aedd BAEL-89 - Adding surefire, fixing formatting 2016-11-19 09:47:17 +01:00
slavisa-baeldung 0bc2aad035 Merge branch 'master' into pr/846-tim-session 2016-11-19 09:33:13 +01:00
DianeDuan 95425deb3c Merge remote-tracking branch 'upstream/master' 2016-11-19 15:15:12 +08:00
Grzegorz Piwowarek da66ba8955 Remove unnecessary comments 2016-11-19 08:30:42 +02:00
Parth Joshi 224a3a8a42 GeoIp Article PR (#789) 
* GEO Ip Article first commit.

* Changes in controller and flow as per review by Kevin.

* Removed this file from spring-mvc-java as I had worked on spring-mvc-xml
and this was commited by mistake.

* Some fix in service usage as i was initializing service, intializing the
db in the each requests.

* Changes for Integration Testing Config. Renaming the test file for the
same purpose.

* Removed integration profile.
 2016-11-18 16:02:52 -06:00
Prashant Khanal a46208fc4f Merge pull request #847 from pkhanal/master 
@Qualifier annotation removed
 2016-11-18 11:16:32 -08:00
Prashant Khanal 6d8a11f0a6 @Qualifier annotation removed 2016-11-18 11:15:38 -08:00
eugenp 12de46529d cleanup work 2016-11-18 14:10:21 +02:00
eugenp 30171ef89b upgrades 2016-11-18 14:01:31 +02:00