diff --git a/spring-webflow-reference/src/defining-flows.xml b/spring-webflow-reference/src/defining-flows.xml index a7fb0aac..e6221a70 100644 --- a/spring-webflow-reference/src/defining-flows.xml +++ b/spring-webflow-reference/src/defining-flows.xml @@ -196,7 +196,8 @@ If the expression returns a value that may need to be converted, specify the desired type using the result-type attribute: -<evaluate expression="bookingService.findHotels(searchCriteria)" result="flowScope.hotels" result-type="dataModel"/> +<evaluate expression="bookingService.findHotels(searchCriteria)" result="flowScope.hotels" + result-type="dataModel"/> @@ -214,7 +215,8 @@ <input name="hotelId" /> <on-start> - <evaluate expression="bookingService.createBooking(hotelId, currentUser.name)" result="flowScope.booking" /> + <evaluate expression="bookingService.createBooking(hotelId, currentUser.name)" + result="flowScope.booking" /> </on-start> <view-state id="enterBookingDetails"> @@ -339,7 +341,8 @@ public interface FlowOutcome { <input name="hotelId" /> <on-start> - <evaluate expression="bookingService.createBooking(hotelId, currentUser.name)" result="flowScope.booking" /> + <evaluate expression="bookingService.createBooking(hotelId, currentUser.name)" + result="flowScope.booking" /> </on-start> <view-state id="enterBookingDetails"> @@ -449,7 +452,8 @@ public interface FlowOutcome { <input name="hotelId" /> <on-start> - <evaluate expression="bookingService.createBooking(hotelId, currentUser.name)" result="flowScope.booking" /> + <evaluate expression="bookingService.createBooking(hotelId, currentUser.name)" + result="flowScope.booking" /> </on-start> <view-state id="enterBookingDetails"> diff --git a/spring-webflow-reference/src/el.xml b/spring-webflow-reference/src/el.xml index ce2e0db8..bb58fc0b 100644 --- a/spring-webflow-reference/src/el.xml +++ b/spring-webflow-reference/src/el.xml @@ -123,7 +123,8 @@ <on-render> - <evaluate expression="searchService.findHotels(searchCriteria)" result="viewScope.hotels" type="dataModel" /> + <evaluate expression="searchService.findHotels(searchCriteria)" result="viewScope.hotels" + type="dataModel" /> </on-render> @@ -182,7 +183,8 @@ Use currentUser to access the authenticated Principal: -<evaluate expression="bookingService.createBooking(hotelId, currentUser.name)" result="flowScope.booking" /> +<evaluate expression="bookingService.createBooking(hotelId, currentUser.name)" + result="flowScope.booking" /> @@ -222,7 +224,8 @@ See the ExternalContext API JavaDocs for more information. -<evaluate expression="searchService.suggestHotels(externalContext.sessionMap.userProfile)" result="viewScope.hotels" /> +<evaluate expression="searchService.suggestHotels(externalContext.sessionMap.userProfile)" + result="viewScope.hotels" /> diff --git a/spring-webflow-reference/src/flow-managed-persistence.xml b/spring-webflow-reference/src/flow-managed-persistence.xml index 7ba9942b..41a7535e 100644 --- a/spring-webflow-reference/src/flow-managed-persistence.xml +++ b/spring-webflow-reference/src/flow-managed-persistence.xml @@ -61,7 +61,8 @@ - + diff --git a/spring-webflow-reference/src/flow-security.xml b/spring-webflow-reference/src/flow-security.xml index 1b3033e0..76453967 100644 --- a/spring-webflow-reference/src/flow-security.xml +++ b/spring-webflow-reference/src/flow-security.xml @@ -138,10 +138,14 @@ <security:authentication-provider> <security:password-encoder hash="md5" /> <security:user-service> - <security:user name="keith" password="417c7382b16c395bc25b5da1398cf076" authorities="ROLE_USER,ROLE_SUPERVISOR" /> - <security:user name="erwin" password="12430911a8af075c6f41c6976af22b09" authorities="ROLE_USER,ROLE_SUPERVISOR" /> - <security:user name="jeremy" password="57c6cbff0d421449be820763f03139eb" authorities="ROLE_USER" /> - <security:user name="scott" password="942f2339bf50796de535a384f0d1af3e" authorities="ROLE_USER" /> + <security:user name="keith" password="417c7382b16c395bc25b5da1398cf076" + authorities="ROLE_USER,ROLE_SUPERVISOR" /> + <security:user name="erwin" password="12430911a8af075c6f41c6976af22b09" + authorities="ROLE_USER,ROLE_SUPERVISOR" /> + <security:user name="jeremy" password="57c6cbff0d421449be820763f03139eb" + authorities="ROLE_USER" /> + <security:user name="scott" password="942f2339bf50796de535a384f0d1af3e" + authorities="ROLE_USER" /> </security:user-service> </security:authentication-provider> diff --git a/spring-webflow-reference/src/portlet.xml b/spring-webflow-reference/src/portlet.xml index 5ee44c14..3167c6d8 100644 --- a/spring-webflow-reference/src/portlet.xml +++ b/spring-webflow-reference/src/portlet.xml @@ -108,7 +108,8 @@ public class ViewFlowHandler extends AbstractFlowHandler { Other modes can be added and point to the same flow as view mode, or any other flow. + @@ -126,7 +127,8 @@ public class ViewFlowHandler extends AbstractFlowHandler { The flow executor is required as a constructor argument. + ]]> diff --git a/spring-webflow-reference/src/spring-faces.xml b/spring-webflow-reference/src/spring-faces.xml index 5f1e9135..c166a408 100644 --- a/spring-webflow-reference/src/spring-faces.xml +++ b/spring-webflow-reference/src/spring-faces.xml @@ -241,7 +241,8 @@ component: 0}"> + Name #{booking.hotel.name} @@ -549,7 +550,8 @@ component: + ]]> diff --git a/spring-webflow-reference/src/upgrade-guide.xml b/spring-webflow-reference/src/upgrade-guide.xml index caf28ceb..16cfa8de 100644 --- a/spring-webflow-reference/src/upgrade-guide.xml +++ b/spring-webflow-reference/src/upgrade-guide.xml @@ -214,7 +214,8 @@ java org.springframework.webflow.engine.model.builder.xml.WebFlowUpgrader flowTo ... - + diff --git a/spring-webflow-reference/src/views.xml b/spring-webflow-reference/src/views.xml index 6afde366..e89f383b 100644 --- a/spring-webflow-reference/src/views.xml +++ b/spring-webflow-reference/src/views.xml @@ -98,7 +98,8 @@ <on-render> - <evaluate expression="bookingService.findHotels(searchCriteria)" result="viewScope.hotels" result-type="dataModel" /> + <evaluate expression="bookingService.findHotels(searchCriteria)" + result="viewScope.hotels" result-type="dataModel" /> </on-render> @@ -113,7 +114,8 @@ <view-state id="searchResults"> <on-render> - <evaluate expression="bookingService.findHotels(searchCriteria)" result="viewScope.hotels" result-type="dataModel" /> + <evaluate expression="bookingService.findHotels(searchCriteria)" + result="viewScope.hotels" result-type="dataModel" /> </on-render> <transition on="next"> <evaluate expression="searchCriteria.nextPage()" /> @@ -135,7 +137,8 @@ <on-render> - <evaluate expression="bookingService.findHotels(searchCriteria)" result="viewScope.hotels" result-type="dataModel" /> + <evaluate expression="bookingService.findHotels(searchCriteria)" + result="viewScope.hotels" result-type="dataModel" /> </on-render> @@ -300,9 +303,13 @@ public class BookingValidator { MessageContext context = ... MessageBuilder builder = new MessageBuilder(); -context.addMessage(builder.error().source("checkinDate").defaultText("Check in date must be a future date").build()); -context.addMessage(builder.warn().source("smoking").defaultText("Smoking is bad for your health").build()); -context.addMessage(builder.info().defaultText("We have processed your reservation - thank you and enjoy your stay").build()); +context.addMessage(builder.error().source("checkinDate") + .defaultText("Check in date must be a future date").build()); +context.addMessage(builder.warn().source("smoking") + .defaultText("Smoking is bad for your health").build()); +context.addMessage(builder.info() + .defaultText("We have processed your reservation - thank you and enjoy your stay") + .build()); @@ -310,9 +317,11 @@ context.addMessage(builder.info().defaultText("We have processed your reservatio MessageContext context = ... MessageBuilder builder = new MessageBuilder(); -context.addMessage(builder.error().source("checkinDate").code("checkinDate.notFuture").build()); -context.addMessage(builder.warn().source("smoking").code("notHealthy").resolvableArg("smoking").build()); -context.addMessage(builder.info().code("reservationConfirmation").build()); +context.addMessage(builder.error().source("checkinDate").code("checkinDate.notFuture") + .build()); +context.addMessage(builder.warn().source("smoking").code("notHealthy") + .resolvableArg("smoking").build()); +context.addMessage(builder.info().code("reservationConfirmation").build());