Commit Graph

2153 Commits

Author SHA1 Message Date
slavisa-baeldung 70322e1a44 spring-mvc-matrix-variables - manually merging 2016-06-15 20:25:41 +02:00
slavisa-baeldung a5bde90d40 java-streams-8-api - adding slf4j fixing indentation 2016-06-15 06:57:43 +02:00
slavisa-baeldung f5ecf03890 Merge pull request #446 from alexVengrovsk/java8-stream
Code for the article "Java 8 Stream API Tutorial"
2016-06-15 05:48:14 +01:00
Alex Theedom 302df05e2f Merge pull request #451 from atheedom/master
Merge pull request #3 from eugenp/master
2016-06-15 01:30:18 +03:00
Alex Theedom e76f8e654a Merge pull request #3 from eugenp/master
Merging latest changes
2016-06-13 23:59:07 +03:00
Alex Theedom 4e01eb6a03 Merge pull request #443 from ccristian/master
jee7schedule
2016-06-13 23:57:33 +03:00
Eugen 73471f6ec9 Update README.md 2016-06-13 00:34:53 +03:00
eugenp 14cd93227b interesting httpclient digest auth example 2016-06-12 23:45:58 +03:00
eugenp 31eaa0e16d interesting httpclient digest auth example 2016-06-12 23:45:42 +03:00
Eugen 6123c319a8 Merge pull request #450 from MiguelGL/master
Rename lombok-intro to just lombok.
2016-06-12 21:38:41 +01:00
Miguel García Lpez 3c0a53ea04 Rename lombok-intro to just lombok. 2016-06-12 22:33:45 +02:00
Eugen 577beecb2e Merge pull request #449 from MiguelGL/master
Code and tests for the lombok introduction.
2016-06-12 21:05:53 +01:00
Miguel García Lpez 7ecd7ce02d Code and tests for the lombok introduction. 2016-06-12 21:28:49 +02:00
alexVengrovsk 9835081ad3 Code for the article "Java 8 Stream API Tutorial"
alextrentton@gmail.com

Signed-off-by: <alextrentton@gmail.com>
2016-06-10 23:12:04 +03:00
Alex Theedom f4ee749afc Merge pull request #445 from toubou91/master
Updates for @ModelAttribute example
2016-06-10 00:56:45 +03:00
Alex Theedom 60ae0515ba Merge pull request #434 from reymalahay/master
Code and related files for the dependency injection demos.
2016-06-10 00:56:29 +03:00
Alex Theedom de4899e30b Merge pull request #448 from atheedom/master
Some minor changes to code logic and style
2016-06-10 00:26:59 +03:00
Alex Theedom 8d6526c62e Some minor changes to code logic and style 2016-06-09 22:25:41 +01:00
Alex Theedom 11037174d3 Merge pull request #447 from atheedom/master
Merge pull request #2 from eugenp/master
2016-06-09 23:54:05 +03:00
reymalahay 7eabc6cd25 Code and related files for the dependency injection demos. 2016-06-08 16:57:09 -06:00
toubou91 815933447b Updates for @ModelAttribute example 2016-06-09 00:22:06 +02:00
Eugen 144397849d Merge pull request #444 from Asheara/master
Introduction to XPath
2016-06-08 22:31:29 +01:00
Raquel Garrido Crespo a156fa8590 Introduction to XPath 2016-06-08 23:13:45 +02:00
ccristian 2452e58c2e jee7schedule 2016-06-08 22:05:48 +02:00
Eugen 9be037e24f Merge pull request #442 from ivanp81/master
A Gatling load test demo
2016-06-08 17:10:05 +01:00
Ivan Paolillo 737848c9be Gatling load test demo 2016-06-08 16:49:16 +02:00
Ivan Paolillo 5c8961e7e8 Remove gatling load test demo 2016-06-08 16:47:36 +02:00
Grzegorz Piwowarek 632a1f613f Leverage Spring Boot's autoconfiguration (#441)
* Leverage Spring Boot's autoconfiguration

* Remove unnecessary @PropertySource
2016-06-08 08:33:36 +02:00
Grzegorz Piwowarek d8cd30d0fd Fix Application.java 2016-06-07 20:35:29 +02:00
Grzegorz Piwowarek 665afc028e Revert jOOQ Application.java 2016-06-07 18:56:18 +02:00
Grzegorz Piwowarek 27250c67b1 Refactor wiremock/cucumber examples 2016-06-07 18:20:50 +02:00
Grzegorz Piwowarek b7812b951e Refactor .gitignore 2016-06-07 18:09:51 +02:00
Grzegorz Piwowarek 34abb0eab7 Refactor jOOQ-Spring 2016-06-07 18:05:50 +02:00
Grzegorz Piwowarek eadbde5c2d Remove autogenerated jOOQ files 2016-06-07 17:49:15 +02:00
Grzegorz Piwowarek a297e492a9 Merge branch 'nguyennamthai-cucumber' 2016-06-07 17:45:06 +02:00
Grzegorz Piwowarek 4eca00c89e Merge branch 'cucumber' of git://github.com/nguyennamthai/tutorials into nguyennamthai-cucumber
# Conflicts:
#	rest-testing/pom.xml
2016-06-07 17:44:28 +02:00
nguyennamthai 04c942f5d0 Spring Boot Support for jOOQ (#438)
* initial commit

* revision of spring boot support for jooq

* initial commit for spring boot support for jooq
2016-06-07 17:21:06 +02:00
nguyennamthai aadaba0331 Introduction to WireMock (#437)
* initial commit for wiremock

* introduction to wiremock

* minor fixes

* adds the wire_mock.json file
2016-06-07 13:44:55 +02:00
Alex Theedom 42ce4d4020 Merge pull request #2 from eugenp/master
Merge upstream to local
2016-06-07 01:06:41 +03:00
Alex Theedom 49c9072564 Merge pull request #430 from sivabalachandran/java8DateTime
Java8 date time
2016-06-07 00:31:28 +03:00
Thai Nguyen c38e6c1876 initial commit for rest testing with cucumber 2016-06-07 00:22:22 +07:00
Thai Nguyen f53ac9d4a1 adds the wire_mock.json file 2016-06-06 23:19:05 +07:00
Thai Nguyen a6e31c6947 Merge branch 'master' into wiremock_intro 2016-06-06 23:11:00 +07:00
Slavisa Avramovic 36af7ed921 Merge remote-tracking branch 'origin/master' 2016-06-06 07:30:53 +02:00
Slavisa Avramovic b11f8ea821 spring-jsf-integration - adding maven-war-plugin 2016-06-06 07:29:44 +02:00
Eugen 4b4b09adc0 Merge pull request #413 from lor6/scopes-examples
scopes examples
2016-06-03 13:47:07 +01:00
Eugen cbecbab84b Merge pull request #435 from KevinGilmore/master
Spring Data Couchbase 2b
2016-06-03 13:44:28 +01:00
Kevin Gilmore 23e8b11e06 Merge remote-tracking branch 'upstream/master' 2016-06-03 07:28:26 -05:00
Kevin Gilmore 2e9efa16bc Spring Data Couchbase tutorial: multiple buckets and spatial queries 2016-06-03 07:26:42 -05:00
DOHA a75cad61f3 upgrade and add test 2016-06-01 19:59:28 +02:00