[seam-commits] Seam SVN: r13943 - in branches/community/Seam_2_2: src/wicket/org/jboss/seam/wicket and 1 other directory.

Author: cpopetz Date: 2010-12-13 16:51:07 -0500 (Mon, 13 Dec 2010) New Revision: 13943 Modified: branches/community/Seam_2_2/build/root.pom.xml branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/SeamEnforceConversationListener.java branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java Log: JBSEAM-4650 Modified: branches/community/Seam_2_2/build/root.pom.xml =================================================================== --- branches/community/Seam_2_2/build/root.pom.xml 2010-12-13 19:44:16 UTC (rev 13942) +++ branches/community/Seam_2_2/build/root.pom.xml 2010-12-13 21:51:07 UTC (rev 13943) @@ -13,7 +13,7 @@ <!-- Externalize some version numbers here --> <properties> <version.richfaces>3.3.3.Final</version.richfaces> - <version.wicket>1.3.5.jboss1</version.wicket> + <version.wicket>1.4.14</version.wicket> <version.drools>5.0.1</version.drools> <version.testng>5.9</version.testng> <version.resteasy>2.0-beta-2</version.resteasy> Modified: branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/SeamEnforceConversationListener.java =================================================================== --- branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/SeamEnforceConversationListener.java 2010-12-13 19:44:16 UTC (rev 13942) +++ branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/SeamEnforceConversationListener.java 2010-12-13 21:51:07 UTC (rev 13943) @@ -32,7 +32,7 @@ "org.jboss.seam.NoConversation", "The conversation ended or timed" ); - cycle.redirectTo(component.getPageFactory().newPage(noConversationPage)); + cycle.redirectTo(cycle.getSession().getPageFactory().newPage(noConversationPage)); throw new AbortException(); } } Modified: branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java =================================================================== --- branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java 2010-12-13 19:44:16 UTC (rev 13942) +++ branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java 2010-12-13 21:51:07 UTC (rev 13943) @@ -71,7 +71,7 @@ /** * This is the key we will use to to store the conversation metadata in the wicket page. */ - private static MetaDataKey CID = new MetaDataKey(String.class) { }; + private static MetaDataKey CID = new MetaDataKey<String>() { }; /** @@ -110,7 +110,7 @@ super.init(); inititializeSeamSecurity(); initializeSeamStatusMessages(); - addComponentOnBeforeRenderListener(new SeamEnforceConversationListener()); + addPreComponentOnBeforeRenderListener(new SeamEnforceConversationListener()); } /** @@ -130,7 +130,7 @@ */ protected void initializeSeamStatusMessages() { - addComponentOnBeforeRenderListener(new SeamStatusMessagesListener()); + addPreComponentOnBeforeRenderListener(new SeamStatusMessagesListener()); } protected abstract Class getLoginPage();