From c92dad45f1c30de2db5c3e6810ac7f1ffd4bac27 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Thu, 12 Mar 2009 21:03:04 +0000
Subject: [PATCH] update artifact ids to be consistent with other spring maven
 central artifact ids and different than BRITS

---
 spring-binding/pom.xml                                 |  2 +-
 spring-faces/pom.xml                                   |  2 +-
 spring-js/pom.xml                                      |  2 +-
 .../webapp/WEB-INF/hotels/booking/booking-flow.xml     | 10 +++++++---
 spring-webflow/pom.xml                                 |  2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml
index 58dd362e..a283bdfd 100644
--- a/spring-binding/pom.xml
+++ b/spring-binding/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.webflow</groupId>
-	<artifactId>org.springframework.binding</artifactId>
+	<artifactId>spring-binding</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Binding</name>
 	<version>2.0.6.RELEASE</version>
diff --git a/spring-faces/pom.xml b/spring-faces/pom.xml
index 4a5d8549..44017768 100644
--- a/spring-faces/pom.xml
+++ b/spring-faces/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.webflow</groupId>
-	<artifactId>org.springframework.faces</artifactId>
+	<artifactId>spring-faces</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Faces</name>
 	<version>2.0.6.RELEASE</version>
diff --git a/spring-js/pom.xml b/spring-js/pom.xml
index 2d877cfe..9e98b84c 100644
--- a/spring-js/pom.xml
+++ b/spring-js/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.webflow</groupId>
-	<artifactId>org.springframework.js</artifactId>
+	<artifactId>spring-js</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring JavaScript</name>
 	<version>2.0.6.RELEASE</version>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml
index 29a93044..6a92ae02 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml
@@ -13,7 +13,8 @@
 		<evaluate expression="bookingService.createBooking(hotelId, currentUser.name)" result="flowScope.booking" />
 	</on-start>
 	
-	<view-state id="enterBookingDetails" model="booking">
+	<view-state id="enterBookingDetails" model="booking">
+		<secured attributes="ROLE_SUPERVISOR"/>	
 		<binder>
 			<binding property="checkinDate" converter="shortDate" required="true" />
 			<binding property="checkoutDate" converter="shortDate" required="true" />
@@ -26,7 +27,7 @@
 			<binding property="amenities" required="false" />
 		</binder>
 		<transition on="proceed" to="reviewBooking" />
-		<transition on="cancel" to="cancel" bind="false" />
+		<transition on="cancel" to="cancel" bind="false" />
 	</view-state>
 	
 	<view-state id="reviewBooking" model="booking">
@@ -38,5 +39,8 @@
 	<end-state id="bookingConfirmed" commit="true" view="externalRedirect:servletRelative:/hotels/index" />
 
 	<end-state id="cancel" />
-			
+
+	<global-transitions>
+		<transition on-exception="org.springframework.security.AccessDeniedException" to="cancel" /> 			
+	</global-transitions>	
 </flow>
\ No newline at end of file
diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml
index a1a618a5..fe8b71ea 100644
--- a/spring-webflow/pom.xml
+++ b/spring-webflow/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.webflow</groupId>
-	<artifactId>org.springframework.webflow</artifactId>
+	<artifactId>spring-webflow</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Web Flow</name>
 	<version>2.0.6.RELEASE</version>