Author: norman.richards(a)jboss.com Date: 2008-10-16 13:23:05 -0400 (Thu, 16 Oct 2008) New Revision: 9355 Modified: tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Template.java tags/JBoss_Seam_2_1_0_GA/seam21migration.txt tags/JBoss_Seam_2_1_0_GA/src/wicket/org/jboss/seam/wicket/WicketComponent.java Log: merge to 9354 Modified: tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java =================================================================== --- tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java 2008-10-16 16:57:11 UTC (rev 9354) +++ tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java 2008-10-16 17:23:05 UTC (rev 9355) @@ -21,7 +21,7 @@ import org.jboss.seam.example.wicket.action.HotelBooking; import org.jboss.seam.wicket.annotations.NoConversationPage; -@Restrict +(a)Restrict("#{identity.loggedIn}") @NoConversationPage(Main.class) public class Book extends WebPage { Modified: tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java =================================================================== --- tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java 2008-10-16 16:57:11 UTC (rev 9354) +++ tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java 2008-10-16 17:23:05 UTC (rev 9355) @@ -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; -@Restrict +(a)Restrict("#{identity.loggedIn}") @NoConversationPage(Main.class) public class Confirm extends WebPage { Modified: tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java =================================================================== --- tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java 2008-10-16 16:57:11 UTC (rev 9354) +++ tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java 2008-10-16 17:23:05 UTC (rev 9355) @@ -10,7 +10,7 @@ import org.jboss.seam.example.wicket.action.HotelBooking; import org.jboss.seam.wicket.annotations.NoConversationPage; -@Restrict +(a)Restrict("#{identity.loggedIn}") @NoConversationPage(Main.class) public class Hotel extends WebPage { Modified: tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java =================================================================== --- tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java 2008-10-16 16:57:11 UTC (rev 9354) +++ tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java 2008-10-16 17:23:05 UTC (rev 9355) @@ -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; -@Restrict +(a)Restrict("#{identity.loggedIn}") public class Main extends WebPage { Modified: tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java =================================================================== --- tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java 2008-10-16 16:57:11 UTC (rev 9354) +++ tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java 2008-10-16 17:23:05 UTC (rev 9355) @@ -13,7 +13,7 @@ import org.jboss.seam.example.wicket.action.ChangePassword; import org.jboss.seam.example.wicket.action.User; -@Restrict +(a)Restrict("#{identity.loggedIn}") public class Password extends WebPage { Modified: tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java =================================================================== --- tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java 2008-10-16 16:57:11 UTC (rev 9354) +++ tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java 2008-10-16 17:23:05 UTC (rev 9355) @@ -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: tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Template.java =================================================================== --- tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Template.java 2008-10-16 16:57:11 UTC (rev 9354) +++ tags/JBoss_Seam_2_1_0_GA/examples/wicket/src/web/org/jboss/seam/example/wicket/Template.java 2008-10-16 17:23:05 UTC (rev 9355) @@ -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: tags/JBoss_Seam_2_1_0_GA/seam21migration.txt =================================================================== --- tags/JBoss_Seam_2_1_0_GA/seam21migration.txt 2008-10-16 16:57:11 UTC (rev 9354) +++ tags/JBoss_Seam_2_1_0_GA/seam21migration.txt 2008-10-16 17:23:05 UTC (rev 9355) @@ -181,4 +181,16 @@ -------------------------- The "provided" platform is now JBoss AS 4.2.3, therefore javasisst:javassist and -dom4j:dom4j are now marked as provided. \ No newline at end of file +dom4j:dom4j are now marked as provided. + + +Seam Application Framework Changes +---------------------------------- + +Seam now expects value expressions for a number of properties +(entityHome.createdMessage, entityHome.updatedMessage, entityHome.deletedMessage +and entityQuery.restrictions); if you are using components.xml to configure your +objects, you don't need to make any changes. If you are extending the objects in +Java, you just need to create a value expression; for example: + +public ValueExpression getCreatedMessage() { return createValueExpression("New person #{person.firstName} #{person.lastName} created"); } Modified: tags/JBoss_Seam_2_1_0_GA/src/wicket/org/jboss/seam/wicket/WicketComponent.java =================================================================== --- tags/JBoss_Seam_2_1_0_GA/src/wicket/org/jboss/seam/wicket/WicketComponent.java 2008-10-16 16:57:11 UTC (rev 9354) +++ tags/JBoss_Seam_2_1_0_GA/src/wicket/org/jboss/seam/wicket/WicketComponent.java 2008-10-16 17:23:05 UTC (rev 9355) @@ -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());