Author: pete.muir(a)jboss.org Date: 2010-01-29 13:37:40 -0500 (Fri, 29 Jan 2010) New Revision: 5665 Added: wicket/trunk/src/main/java/META-INF/ wicket/trunk/src/main/java/META-INF/MANIFEST.MF Modified: wicket/trunk/ wicket/trunk/pom.xml wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java Log: ignores Property changes on: wicket/trunk ___________________________________________________________________ Name: svn:ignore + target .settings .classpath .project Modified: wicket/trunk/pom.xml =================================================================== --- wicket/trunk/pom.xml 2010-01-29 18:36:58 UTC (rev 5664) +++ wicket/trunk/pom.xml 2010-01-29 18:37:40 UTC (rev 5665) @@ -28,7 +28,7 @@ <properties> <weld.api.version>1.0</weld.api.version> - <weld.core.version>1.0.0</weld.core.version> + <weld.core.version>1.0.1-SNAPSHOT</weld.core.version> <testng.version>5.10</testng.version> <wicket.version>1.4.1</wicket.version> </properties> Added: wicket/trunk/src/main/java/META-INF/MANIFEST.MF =================================================================== --- wicket/trunk/src/main/java/META-INF/MANIFEST.MF (rev 0) +++ wicket/trunk/src/main/java/META-INF/MANIFEST.MF 2010-01-29 18:37:40 UTC (rev 5665) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: wicket/trunk/src/main/java/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java =================================================================== --- wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java 2010-01-29 18:36:58 UTC (rev 5664) +++ wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java 2010-01-29 18:37:40 UTC (rev 5665) @@ -74,7 +74,7 @@ String specifiedCid = null; if (page != null) { - specifiedCid = (String) page.getMetaData(WeldMetaData.CID); + specifiedCid = page.getMetaData(WeldMetaData.CID); } else { @@ -118,7 +118,7 @@ } } - ConversationContext conversationContext = Container.instance().deploymentServices().get( + ConversationContext conversationContext = Container.instance().services().get( ContextLifecycle.class).getConversationContext(); // Now set up the conversational context if it isn't already if (!conversationContext.isActive()) @@ -153,7 +153,7 @@ public void detach() { super.detach(); - ConversationContext conversationContext = Container.instance().deploymentServices().get( + ConversationContext conversationContext = Container.instance().services().get( ContextLifecycle.class).getConversationContext(); // cleanup and deactivate the conversation context if (conversationContext.isActive())