Commit Graph

4098 Commits

Author SHA1 Message Date
michal_aibin 3a83664f30 Fix error with html file for conversions 2016-11-14 12:48:07 +01:00
michal_aibin 6a98064795 X to PDF conversions 2016-11-14 12:32:51 +01:00
maibin 2d34971fcc Junit5 (latest two commits) (#825)
* PDF to X

* PDF to X

* Remove created doc

* Code fixes and cleanup for PDF module

* Fix web.xml in spring-mvc-web-vs-initializer project

* Rollback web.xml

* Fixes to PDF article

* Merge with main eugen branch

* Junit 5

* Fix name of test and modifier
2016-11-14 09:45:01 +01:00
Sandeep Kumar 9da09a5684 Merge branch 'master' of https://github.com/Sandeep4odesk/tutorials 2016-11-14 14:13:33 +05:30
Sandeep Kumar de16f26011 Making changes in Maven Profile for Test Case Failure 2016-11-14 14:12:50 +05:30
Diane Duan dd6946585f core-java Properties class demos 2016-11-14 14:53:12 +08:00
eugenp aeb8f7595c adding new module to the parent 2016-11-13 19:09:47 +02:00
Eugen 4981a39d53 Merge pull request #814 from danidemi/master
PR for "Improve Logging With Mapped Diagnostic Context"
2016-11-13 11:01:08 -06:00
mujah 046b23685e formatting changes 2016-11-13 23:40:17 +08:00
Jim Kerak 55e8a4fe65 Merge pull request #826 from khatwaniNikhil/patch-2
Added entry for BAEL-29 - Java String Conversions
2016-11-13 09:43:29 -05:00
michal_aibin e356d28325 Fix name of test and modifier 2016-11-13 09:57:45 +01:00
Nikhil Khatwani 87ed454d64 Added entry for BAEL-29 - Java String Conversions 2016-11-13 13:10:28 +05:30
michal_aibin 9b0aa76e7e Junit 5 2016-11-12 23:11:46 +01:00
michal_aibin 94bfcd3b26 Merge with main eugen branch 2016-11-12 22:15:57 +01:00
michal_aibin 52a66320cb Merge branch 'master' of https://github.com/eugenp/tutorials.git 2016-11-12 22:13:47 +01:00
Jim Kerak 106177b3e6 Merge pull request #823 from khatwaniNikhil/BAEL-29-StringConversions-UnitTest
BAEL-29 Refactored Code to comeup with Unit Test
2016-11-12 12:42:57 -05:00
tschiman 58e704a0b8 BAEL-89 Spring session breaking out the controller and changing the formatting to be in line with the baeldung standard. 2016-11-12 09:30:44 -07:00
tschiman ca01d230a6 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/JettyWebApplication.java
#	spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/SecurityConfig.java
#	spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/SessionConfig.java
#	spring-session/jetty-session-demo/src/main/resources/application.properties
#	spring-session/pom.xml
#	spring-session/tomcat-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/SecurityConfig.java
#	spring-session/tomcat-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/TomcatWebApplication.java
2016-11-12 09:20:18 -07:00
Nikhil Khatwani b58c2341da Refactoring Code - Naming corrections 2016-11-12 16:01:53 +05:30
Nikhil Khatwani 633162a04b Refactoring Code - short and simple 2016-11-12 15:03:07 +05:30
nguyenminhtuanfit@gmail.com 19eb8bd90d An introduction to JAXB 2016-11-12 15:53:40 +07:00
Nikhil Khatwani c30bd6caa7 BAEL-29 Refactored Code to comeup with Unit Test 2016-11-12 13:52:26 +05:30
mujah 8ccfd201e6 formatting 2016-11-12 12:35:55 +08:00
mujah 26864e2897 query changes 2016-11-12 12:32:30 +08:00
mujah de948bc4ab maven profile changes, model class change 2016-11-12 12:21:46 +08:00
Grzegorz Piwowarek 584ae4167f Refactor HttpsClientSSLLiveTest 2016-11-11 18:59:49 +01:00
Prashant Khanal c1411e9bee Merge pull request #542 from oreva/master
Spring MVC Email application added.
2016-11-11 09:28:00 -08:00
Grzegorz Piwowarek 3daf23ae22 Refactor OkHttp examples 2016-11-11 15:02:37 +01:00
oreva 5744df67a0 Merge remote-tracking branch 'upstream/master' 2016-11-11 14:45:16 +02:00
Shubham Aggarwal a18523a103 Merge branch 'master' of https://github.com/sbmaggarwal/tutorials 2016-11-11 14:24:36 +05:30
Shubham Aggarwal e425d8bf01 Added BeanFactory sample in spring-core 2016-11-11 14:24:09 +05:30
Shubham Aggarwal e29e33dbe6 Added BeanFactory sample in spring-core 2016-11-11 14:16:24 +05:30
Sandeep Kumar fcd6ff2891 Making changes in Maven Profile for Test Case Failure 2016-11-11 09:03:53 +05:30
Kevin Gilmore 6f0509d467 Merge remote-tracking branch 'upstream/master' 2016-11-10 20:58:05 -06:00
Nancy Bosecker ec132346c7 fixed imports for sslcontext for apache 4.4 (#815)
The new test passes, and the maven build succeeded.
2016-11-10 20:50:16 -06:00
Kevin Gilmore 0e89a172c7 Merge remote-tracking branch 'upstream/master' 2016-11-10 20:42:36 -06:00
Marek Lewandowski b384c48bd3 Fix link 2016-11-10 16:16:48 +01:00
Marek Lewandowski 63a47897f3 Added Java 9 New Features 2016-11-10 16:16:12 +01:00
Marek Lewandowski 3d5227adbb Added BAEL-387 2016-11-10 16:13:42 +01:00
Marek Lewandowski 9703ea7f1a Add BAEL-396 (Netflix Ribbon intro) to README.md 2016-11-10 16:11:53 +01:00
Jim Kerak 1884163ba3 Merge pull request #819 from jkerak/master
changing anonymous subclass to lambda
2016-11-10 09:03:18 -05:00
James Kerak 997b3cabbe changing anonymous subclass to lambda 2016-11-10 09:02:46 -05:00
Christian Rädel 6708feb70c BAEL-86: Added diagram picture and sources. 2016-11-10 07:31:39 +01:00
Eugen 40b582cb63 Merge pull request #786 from mujahid/master
spring-data-solr module for BAEL-346
2016-11-09 11:52:57 -06:00
mujah 1f0e30b81c pom changes + merge upstream 2016-11-09 22:26:18 +08:00
mujah e0abfb8e91 gerge branch 'master' of https://github.com/eugenp/tutorials 2016-11-09 22:21:58 +08:00
Christian Rädel 6d1fbd5603 BAEL-41: Fixed small formatting issues. 2016-11-09 15:21:23 +01:00
mujah f966f277c0 removed solr 2016-11-09 22:10:30 +08:00
Christian Rädel 1c0e0c6ec1 Merge remote-tracking branch 'upstream/master' into craedel-log4j2 2016-11-09 14:56:36 +01:00
Kevin Gilmore 8acbafdd2d Merge remote-tracking branch 'upstream/master' 2016-11-09 05:45:14 -06:00