iSharkFly-Open/Java-Tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,782 Commits 6 Branches 0 Tags
615ddc19bf46048740d1fccffb065a12c47ba319
Commit Graph
3782 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
eugenp 42946ddbac cleanup work 2016-11-18 13:41:33 +02:00
eugenp 205a84d834 major upgrades 2016-11-18 13:26:34 +02:00
tschiman 7f6130c566 BAEL-89 Adding test configuration and test classes to demonstrate the code 2016-11-17 22:19:49 -07:00
tschiman a88c500d8d BAEL-89 Adding test dependencies 2016-11-17 20:32:44 -07:00
tschiman c0e721b92e Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/jettyex/JettyWebApplication.java
#	spring-session/tomcat-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/TestController.java
 2016-11-17 20:32:05 -07:00
tschiman 63f7ffedf8 BAEL-89 spring session update to fork 2016-11-17 20:28:50 -07:00
Grzegorz Piwowarek 83615aadf0 Merge pull request #845 from sameira/master 
Updated the dependency versions as properties
 2016-11-17 22:06:27 +02:00
Sameera bc4fa86c23 Updated the dependency versions as properties 2016-11-17 20:48:06 +05:30
oreva 7e0bf584a1 Java-based configuration implemented. 2016-11-17 13:36:07 +02:00
Grzegorz Piwowarek 75a0274fe8 Refactor SeleniumExample 2016-11-17 07:46:38 +02:00
Marek Lewandowski be5ac17249 fix tests 2016-11-16 19:56:38 +01:00
Eugen e2c76098ab Merge pull request #822 from mujahid/master 
BAEL-346 - [PR -2]
 2016-11-16 11:48:41 -06:00
Grzegorz Piwowarek b14bae204d Remove PathTest 2016-11-16 17:27:15 +02:00
Grzegorz Piwowarek 024b3df483 Rename test 2016-11-16 17:26:39 +02:00
Grzegorz Piwowarek 697956e003 Remove duplicated file 2016-11-16 17:09:19 +02:00
Grzegorz Piwowarek 63bb0809f7 Add missing property 2016-11-16 15:30:30 +01:00
Grzegorz Piwowarek 3ed183ee6e Add missing README.md 2016-11-16 15:08:24 +01:00
mujah 082ae7b0da xml formatting 2016-11-16 21:39:13 +08:00
Grzegorz Piwowarek d1a12c2f6c Merge pull request #831 from maibin/master 
X to PDF conversions
 2016-11-16 10:29:13 +01:00
Grzegorz Piwowarek 4e1be85e12 Merge pull request #835 from ante003/master 
Intro to Apache Camel
 2016-11-16 10:27:08 +01:00
Grzegorz Piwowarek 506bfb9b21 closeOverlay refactor 2016-11-16 10:15:37 +01:00
Marek Lewandowski b74ce5914b Fix BAEL-454 and move test to actual tests 2016-11-16 09:55:16 +01:00