Commit Graph

75 Commits

Author SHA1 Message Date
Rossen Stoyanchev
5faa080646 Fix issue with embedded flow 2014-05-29 21:31:55 -04:00
Rossen Stoyanchev
bb265fbe5a Upgrade to Web Flow 2.4.0 2014-05-29 21:31:55 -04:00
Rossen Stoyanchev
bdd5bde4c8 Merge pull request #24 from dprotti/tomcat7frommaven
Maven should use 'tomcat7:run'
2014-05-21 17:25:41 -04:00
Duilio Protti
d86245ac22 Maven run should use 'tomcat7:run' 2014-04-08 15:57:26 -05:00
Rossen Stoyanchev
97f9a3f6ea Upgrade to Spring Web Flow 2.4 RC1 2014-04-02 13:23:09 -04:00
liang dong
9c1ac50a8c Fix dropdown list for 'Room Preference' in html page 2014-04-02 09:58:46 -04:00
Rossen Stoyanchev
b6586dc989 Merge pull request #20 from rstoyanchev/java-config
Replace XML with Java configuration in the booking-mvc and booking-faces samples
2014-03-07 10:24:12 -05:00
Rossen Stoyanchev
f311f2d833 Add reference to Spring Security issue w/ Java config 2014-03-07 10:09:10 -05:00
Rossen Stoyanchev
242b5908da Replace FacesServlet declaration w/ ConfigureListener 2014-02-26 22:41:32 -05:00
Rossen Stoyanchev
7d8a3ce8dd Autowire BookingService into the HotelLazyDataModel 2014-02-26 22:01:25 -05:00
Rossen Stoyanchev
addc213422 Update Thymeleaf version and enable CSRF protection 2014-02-26 17:32:19 -05:00
Rossen Stoyanchev
0b9fe7766c Update booking-faces to use Java config 2014-02-26 17:31:31 -05:00
Rossen Stoyanchev
e0ed2a6dc6 Replace web.xml with Java configuration in booking-mvc 2014-02-25 21:29:44 -05:00
Rossen Stoyanchev
fa3866854f Update booking-mvc to use Spring Java config 2014-02-25 21:13:55 -05:00
Rossen Stoyanchev
b948d1075f Use Spring Framework maven bom 2014-02-19 15:49:45 -05:00
Rossen Stoyanchev
1ccc67b79e Upgrade Spring Web Flow to version 2.3.3 2014-01-26 10:11:24 -05:00
Rossen Stoyanchev
2f28803ac5 Add lazy=true to primefaces table 2013-12-20 20:06:22 -05:00
Rossen Stoyanchev
15a3ac6cb2 Upgrade to Spring Framework 4.0 and Mojara 2.2.4 2013-12-20 14:57:41 -05:00
Rossen Stoyanchev
cd207c54d4 Fix formatting in ReferenceData.java 2013-06-20 15:23:43 -04:00
Bala Raman
fb2c88b49a Added missing import to Calendar 2013-06-13 00:19:52 -04:00
Bala Raman
8db3db7627 Credit card year bug, calculate automatically now. 2013-06-12 23:59:31 -04:00
Rossen Stoyanchev
ba6153d4af Merge pull request #15 from danielfernandez/master
Fixed parsing error on login error
2013-06-10 05:45:48 -07:00
Daniel Fernández
7325cb724e Fixed parsing error when hitting F5 on a login error page with expired session 2013-06-09 23:39:20 +02:00
Rossen Stoyanchev
1f5a98f9c0 Merge pull request #12 from olivergierke/uptodateify
* olivergierke-uptodateify:
  Polished dependency declaration.
  Added current Jetty plugin to enable mvn jetty:run.
  Upgraded dependency versions.
  Updated plugin dependencies in booking-mvc example.
2013-04-08 08:37:24 -04:00
Oliver Gierke
0495da665c Polished dependency declaration.
Explicitly declare spring-sop to avoid unnecessary exclusions. Excluded Commons Logging explicitly to make sure the Slf4j bridge kicks in.
2013-04-07 14:01:46 +02:00
Oliver Gierke
5782d44467 Added current Jetty plugin to enable mvn jetty:run. 2013-04-07 13:52:10 +02:00
Oliver Gierke
d76d897fb6 Upgraded dependency versions.
- Spring 3.2.1 -> 3.2.2
- Slf4j 1.6.1 -> 1.7.5
- Log4j 1.2.15 -> 1.2.16 (allows getting rid of exclusions)
- HSQLDB 1.8.0.10 -> 2.2.9
- Hibernate 3.5.0 -> 4.2.0
- JodaTime 1.6 -> 2.2
- JodaTime JPS Tags 1.0.2 -> 1.1.1
- Easymock 2.5.2 -> 3.1
- JUnit 3.8.2 -> 4.11
2013-04-07 13:47:10 +02:00
Oliver Gierke
43564883c8 Updated plugin dependencies in booking-mvc example.
- Compiler plugin 2.3.2 -> 3.0
- Tomcat plugin 2.0-SNAPSHOT -> 2.1
- Surefire plugin 2.12 -> 2.14
2013-04-07 13:40:56 +02:00
Rossen Stoyanchev
122ef274cf Fix repository in webflow-showcase 2013-04-03 12:56:32 -04:00
Rossen Stoyanchev
bdfddda511 Merge pull request #10 from fosorio/patch-1
changed web.xml version from 2.4 to 2.5.
2013-03-25 06:27:20 -07:00
fosorio
cc4d52763d changed web.xml version from 2.4 to 2.5. 2013-03-23 11:23:01 -03:00
Rossen Stoyanchev
32f1abef3b Merge pull request #9 from mayankk/master
Fix for issue #7
2013-02-19 07:50:48 -08:00
mayankk
b4940a3cef Fixed closing tags. Matched them to the starting div tag. 2013-02-19 20:51:35 +05:30
mayankk
afeeb1fc0e Fix for #7. Adding .idea to .gitignore. 2013-02-19 20:46:13 +05:30
Rossen Stoyanchev
0a11f18d91 Merge pull request #6 from danielfernandez/master
Minor fixes to the thymeleaf merge and explanatory texts.
2013-02-04 06:38:09 -08:00
Daniel Fernández
ed1ed18379 Replaced references to JSP with references to Thymeleaf. 2013-02-03 23:25:35 +01:00
Daniel Fernández
87d68bad0f Removed unneeded search.jsp file. 2013-02-03 23:24:42 +01:00
Rossen Stoyanchev
db165a7c77 Add README to booking-mvc 2013-02-01 17:27:29 -05:00
Rossen Stoyanchev
032120088f Fix issues with exclusions and repositories in poms 2013-02-01 17:06:44 -05:00
Rossen Stoyanchev
af960b63ff Merge pull request #5 from danielfernandez/thymeleaf
* danielfernandez-thymeleaf: (22 commits)
  Upgrade to SWF 2.4 M1 and fix git rebase issues
  Modified thymeleaf-extras-* dependencies to version 2.0.0
  Expanded tabs into spaces.
  Fixed unix line feeds.
  Deleted original JSP files.
  Fixed error reporting format.
  Added static content to search.html
  Added static prototyping structures to all templates.
  Small markup fixes.
  Converted booking flow to thymeleaf.
  Added list and show pages
  Added bookingsTable.html, reconfigured JSP layout for old pages.
  Thymeleaf-ied layout and several JSP pages.
  Added dependency to thymeleaf-extras-conditionalcomments
  Created Standard Layout in thymeleaf.
  Added thymeleaf versions of "login" and "logoutSuccess"
  Added first Thymeleaf template to application (intro.html)
  Added log configuration entry for thymeleaf.
  Applied Thymeleaf configuration
  Refactored Tiles version in pom.xml
  ...
2013-02-01 16:54:04 -05:00
Rossen Stoyanchev
2adb680e6a Upgrade to SWF 2.4 M1 and fix git rebase issues 2013-02-01 16:51:58 -05:00
Daniel Fernández
35fcc082a9 Modified thymeleaf-extras-* dependencies to version 2.0.0 2013-02-01 04:01:19 -05:00
Daniel Fernández
ef9d94c2a3 Expanded tabs into spaces. 2013-02-01 03:59:26 -05:00
Daniel Fernández
7aa70a437e Fixed unix line feeds. 2013-02-01 03:59:26 -05:00
Daniel Fernández
1bcfa72497 Deleted original JSP files. 2013-02-01 03:57:40 -05:00
Daniel Fernández
63170166fb Fixed error reporting format. 2013-02-01 03:57:09 -05:00
Daniel Fernández
f60181ad06 Added static content to search.html 2013-02-01 03:57:09 -05:00
Daniel Fernández
802a3e919a Added static prototyping structures to all templates. 2013-02-01 03:57:09 -05:00
Daniel Fernández
7ff65c47e3 Small markup fixes. 2013-02-01 03:57:09 -05:00
Daniel Fernández
880586585b Converted booking flow to thymeleaf. 2013-02-01 03:57:09 -05:00