Commit Graph

2313 Commits

Author SHA1 Message Date
k0l0ssus 90cb002c40 BAEL-151 - adding JSTL support 2016-07-11 07:36:47 +02:00
k0l0ssus 493bae4ee2 BAEL-151 - implict EL object example 2016-07-11 07:36:24 +02:00
slavisa-baeldung 1347e1517c Merge remote-tracking branch 'origin/master' 2016-07-11 07:30:00 +02:00
Sergey Petunin d0e35e7022 Added test examples for the article "Hibernate: save, persist, update, merge, saveOrUpdate" (#487) 2016-07-10 22:28:34 +02:00
Alex Theedom afb2e977fb Update test to match code in the article 2016-07-10 16:41:03 +01:00
Alex Theedom 17ed679d5a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assertj/src/test/java/com/baeldung/assertj/introduction/AssertJGuavaTest.java
2016-07-10 16:39:45 +01:00
Alex Theedom 9cdb683e00 Update test to match code in the article 2016-07-10 16:36:05 +01:00
Alex Theedom fb35d6aac5 Merge pull request #486 from eugenp/assertj-guava
Fix MMap examples
2016-07-09 16:56:43 +01:00
Grzegorz Piwowarek 67eff7ce57 Add MMap examples 2016-07-09 15:08:33 +02:00
Alex Theedom cc6b6419a9 Change variable name to be consistence with article text 2016-07-09 10:45:13 +01:00
Alex Theedom c5411b6897 Merge pull request #485 from eugenp/assertj-guava
Additional Multimap examples for Assertj series
2016-07-09 09:22:31 +01:00
slavisa-baeldung ce4bbd03e4 Merge remote-tracking branch 'origin/master' 2016-07-09 08:11:05 +02:00
Grzegorz Piwowarek edc6a6e0ec Add MMap examples 2016-07-09 07:49:38 +02:00
DOHA 79ec294fd9 add systemPropertiesModeName example 2016-07-08 18:49:51 +02:00
tomjoebob ed3e1f4553 Merge pull request #484 from ivanp81/master
Add JSON Schema validation
2016-07-08 10:07:19 -06:00
Ivan Paolillo 1c26667182 Remove unneeded file 2016-07-08 18:02:31 +02:00
Ivan Paolillo d97a45447a Remove unneeded file 2016-07-08 17:57:19 +02:00
Zeger Hendrikse 7109aad7a5 Removed Eclipse files 2016-07-08 17:27:38 +02:00
Zeger Hendrikse 8a56b2ac24 Merge branch 'juliuskrah-master' 2016-07-08 13:50:18 +02:00
Zeger Hendrikse 97313afc6d Replaced tabs by spaces 2016-07-08 13:49:04 +02:00
Ivan Paolillo a31eaf73ec Add JSON Schema validation 2016-07-08 10:44:07 +02:00
Slavisa Baeldung e80bc6e238 Merge branch 'pr/470-alexB-logging' 2016-07-08 10:00:09 +02:00
slavisa-baeldung c9d51d3e60 Merge pull request #470 from aborkov/master
Added log4j project
2016-07-08 09:58:20 +02:00
Slavisa Baeldung 1a11364e57 BAEL-38 - Minor changes 2016-07-08 09:57:47 +02:00
Slavisa Baeldung 16295e6f7b Merge branch 'master' into pr/470-alexB-logging 2016-07-08 09:52:23 +02:00
Slavisa Baeldung 57ebe60697 Merge remote-tracking branch 'origin/pr/470' into pr/470-alexB-logging
Conflicts:
	log4j/pom.xml
	log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
	log4j/src/main/java/com/baeldung/logback/LogbackExample.java
	log4j/src/main/resources/log4j.xml
	log4j/src/main/resources/log4j2.xml
	log4j/src/main/resources/logback.xml
	pom.xml
2016-07-08 09:51:18 +02:00
Julius Krah 60930fc567 Added fix for error 'Unable to find a single main class from the following candidates [org.baeldung.boot.DemoApplication, org.baeldung.main.SpringBootApplication]' 2016-07-07 23:27:34 +00:00
Zeger Hendrikse 3d0ce36f45 Replaced tabs by spaces 2016-07-08 01:08:32 +02:00
Zeger Hendrikse 8066195a85 Merge branch 'master' of https://github.com/juliuskrah/tutorials into juliuskrah-master 2016-07-08 01:06:13 +02:00
Julius Krah c9865a0dd4 resolved conflicts 2016-07-07 21:49:14 +00:00
Julius Krah d8a8ad354f added source for 'A Guide to Spring Boot in Eclipse'
Added eclipse formatter

Added source for 'A Guide to Spring Boot in Eclipse' and added eclipse
formatter for Baeldung
2016-07-07 21:31:26 +00:00
Grzegorz Piwowarek 9257da4b44 Use interface instead of the implementation 2016-07-07 22:45:39 +02:00
Zeger Hendrikse 1ccdc8f56e Merge branch 'master' of https://github.com/juliuskrah/tutorials into juliuskrah-master 2016-07-07 17:55:07 +02:00
Ivan Paolillo ef7ec7e9a4 Add JSON Schema validation 2016-07-07 15:58:16 +02:00
Ivan Paolillo fd6848dddf Add JSON Schema validation 2016-07-07 15:57:39 +02:00
Slavisa Baeldung 30f00a34af BAEL-65 - moving from sout to logger 2016-07-07 15:43:53 +02:00
slavisa-baeldung 5733676887 Merge pull request #481 from GuenHamza/master
BAEL-63 - Add Stored Procedures with Hibernate Tests
2016-07-07 15:42:31 +02:00
GuenHamza 11bc145948 Update README.md - added link to stored procedure article 2016-07-07 03:38:09 +00:00
GuenHamza 7eb04b4ea5 Added Foo stored procedures tests 2016-07-07 03:32:37 +00:00
GuenHamza 95e6cb16d7 Added named queries to Foo Model 2016-07-07 03:30:06 +00:00
GuenHamza ff4b5d26b0 Removed SQL file, to move to resources folder 2016-07-07 03:28:12 +00:00
GuenHamza 2fff05a4b5 Added SQL file to insert stored procedures in the MySQL database 2016-07-07 03:27:03 +00:00
GuenHamza 551272306e Added SQL file to insert stored procedures in the MySQL database 2016-07-07 03:25:28 +00:00
Julius Krah fff769ed9d added source for 'A Guide to Spring Boot in Eclipse' 2016-07-06 16:09:24 +00:00
Slavisa Baeldung 3b9e4c7a56 BAEL-151 - Adding EL dependency 2016-07-06 13:24:52 +02:00
Slavisa Baeldung eb244dd0e6 Merge remote-tracking branch 'origin/master' 2016-07-06 13:15:47 +02:00
slavisa-baeldung e3b1d3a8dc Merge pull request #478 from k0l0ssus/master
JSF Page to demo EL intro
2016-07-06 11:48:21 +02:00
Grzegorz Piwowarek 10b5780576 Fix typo 2016-07-06 09:40:50 +02:00
Álvaro Fernández González 710182ff92 Code for JMockit 101 (#479)
* Add new module for mocks comparison.

* Add sources for testing.

* Changes on testCase.

* Enter some tests for mockito.

* More tests for Mockito.

* Even more tests.

* Add the rest of the mocking libraries.

* Javadoc on test.

* Test bare bones for EasyMock.

* Fist kind of test and setup.

* Add tests using EasyMock with a change on LoginService.

* Create LoginControllerTest.java

* Test setup

* [JMockit] No method called test.

* [JMockit] Two methods called test.

* [JMockit] One method called test.

* [JMockit] Exception mock test

* [JMockit] Mocked object to pass around test.

* [JMockit] Custom matcher test.

* [JMockit] Partial mocking test.

* [JMockit] Fix with IDE.

* Not stubs. Mocks. MOCKS!!!

* Remove unnecesary import.

* Use correct encoding. Was having problems with buildings.

* Remove failing module.

* Create new module mocks and move mock-comparisons there.

* Add jmockit module.

* Add model class.

* Add collaborator class.

* Add performer class.

* Add performer test.
2016-07-06 09:36:46 +02:00
Sergey Petunin 89373cd1eb Samples for the Intro to QueryDSL article, merged with existing querydsl module. Updated module dependencies. (#476) 2016-07-05 21:44:00 +02:00