[seam-commits] Seam SVN: r9354 - in trunk: src/wicket/org/jboss/seam/wicket and 1 other directory.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-10-16 12:57:11 -0400 (Thu, 16 Oct 2008)
New Revision: 9354

Modified:
   trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java
   trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java
   trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java
   trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java
   trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java
   trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java
   trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Template.java
   trunk/src/wicket/org/jboss/seam/wicket/WicketComponent.java
Log:
JBSEAM-3573

Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java	2008-10-16 16:55:33 UTC (rev 9353)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java	2008-10-16 16:57:11 UTC (rev 9354)
@@ -21,7 +21,7 @@
 import org.jboss.seam.example.wicket.action.HotelBooking;
 import org.jboss.seam.wicket.annotations.NoConversationPage;
 
- at Restrict
+ at Restrict("#{identity.loggedIn}")
 @NoConversationPage(Main.class)
 public class Book extends WebPage 
 {

Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java	2008-10-16 16:55:33 UTC (rev 9353)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java	2008-10-16 16:57:11 UTC (rev 9354)
@@ -12,12 +12,11 @@
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.RaiseEvent;
 import org.jboss.seam.annotations.security.Restrict;
-import org.jboss.seam.core.Conversation;
 import org.jboss.seam.example.wicket.action.Booking;
 import org.jboss.seam.example.wicket.action.HotelBooking;
 import org.jboss.seam.wicket.annotations.NoConversationPage;
 
- at Restrict
+ at Restrict("#{identity.loggedIn}")
 @NoConversationPage(Main.class)
 public class Confirm extends WebPage 
 {

Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java	2008-10-16 16:55:33 UTC (rev 9353)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java	2008-10-16 16:57:11 UTC (rev 9354)
@@ -10,7 +10,7 @@
 import org.jboss.seam.example.wicket.action.HotelBooking;
 import org.jboss.seam.wicket.annotations.NoConversationPage;
 
- at Restrict
+ at Restrict("#{identity.loggedIn}")
 @NoConversationPage(Main.class)
 public class Hotel extends WebPage 
 {

Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java	2008-10-16 16:55:33 UTC (rev 9353)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java	2008-10-16 16:57:11 UTC (rev 9354)
@@ -33,7 +33,6 @@
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
 import org.apache.wicket.markup.html.panel.FeedbackPanel;
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.markup.repeater.data.DataView;
@@ -49,7 +48,7 @@
 import org.jboss.seam.security.Identity;
 import org.jboss.seam.wicket.SeamPropertyModel;
 
- at Restrict
+ at Restrict("#{identity.loggedIn}")
 public class Main extends WebPage
 {
 

Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java	2008-10-16 16:55:33 UTC (rev 9353)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java	2008-10-16 16:57:11 UTC (rev 9354)
@@ -13,7 +13,7 @@
 import org.jboss.seam.example.wicket.action.ChangePassword;
 import org.jboss.seam.example.wicket.action.User;
 
- at Restrict
+ at Restrict("#{identity.loggedIn}")
 public class Password extends WebPage
 {
 	

Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java	2008-10-16 16:55:33 UTC (rev 9353)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java	2008-10-16 16:57:11 UTC (rev 9354)
@@ -8,7 +8,6 @@
 import org.apache.wicket.markup.html.form.validation.EqualPasswordInputValidator;
 import org.apache.wicket.markup.html.link.PageLink;
 import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
-import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;

Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Template.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Template.java	2008-10-16 16:55:33 UTC (rev 9353)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Template.java	2008-10-16 16:57:11 UTC (rev 9354)
@@ -2,10 +2,8 @@
 
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.border.Border;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.link.Link;
 import org.jboss.seam.annotations.In;
-import org.jboss.seam.core.Conversation;
 import org.jboss.seam.core.Manager;
 import org.jboss.seam.example.wicket.action.User;
 import org.jboss.seam.security.Identity;

Modified: trunk/src/wicket/org/jboss/seam/wicket/WicketComponent.java
===================================================================
--- trunk/src/wicket/org/jboss/seam/wicket/WicketComponent.java	2008-10-16 16:55:33 UTC (rev 9353)
+++ trunk/src/wicket/org/jboss/seam/wicket/WicketComponent.java	2008-10-16 16:57:11 UTC (rev 9354)
@@ -203,7 +203,7 @@
                
                if ( Strings.isEmpty(restrict.value()) )
                {
-                  throw new IllegalStateException("@Restrict on a Wicket component must specify an expression");
+                  throw new IllegalStateException("@Restrict on " + cls.getName() + " must specify an expression");
                }
                
                restrictions.add(restrict.value());