Permalink
Browse files

compile fixes for Wicket 6

  • Loading branch information...
1 parent a0573ef commit da31889cf392126e70b145203321767daf04eae0 @papegaaij committed Jan 17, 2012
View
@@ -28,7 +28,7 @@
<module>wicket-cdi-examples</module>
</modules>
<properties>
- <wicket.version>1.5.3</wicket.version>
+ <wicket.version>6.0-SNAPSHOT</wicket.version>
<junit.version>4.8.1</junit.version>
<jetty.version>6.1.25</jetty.version>
<slf4j.version>1.6.2</slf4j.version>
@@ -96,13 +96,6 @@
<artifactId>wicket-core</artifactId>
<version>${wicket.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- <version>${wicket.version}</version>
- </dependency>
<dependency>
<groupId>junit</groupId>
View
@@ -66,12 +66,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
@@ -57,7 +57,7 @@ public ConversationExpiryChecker(CdiContainer container)
@Override
public void onBeforeRender(Component component)
{
- if (component instanceof Page || AjaxRequestTarget.get() != null)
+ if (component instanceof Page || RequestCycle.get().find(AjaxRequestTarget.class) != null)
{
Page page = component.getPage();
String cid = container.getConversationMarker(page);
@@ -24,15 +24,15 @@
import org.apache.wicket.Application;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.Page;
+import org.apache.wicket.core.request.handler.BufferedResponseRequestHandler;
+import org.apache.wicket.core.request.handler.IPageClassRequestHandler;
+import org.apache.wicket.core.request.handler.IPageRequestHandler;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestHandlerDelegate;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
import org.apache.wicket.request.cycle.IRequestCycleListener;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.handler.BufferedResponseRequestHandler;
-import org.apache.wicket.request.handler.IPageClassRequestHandler;
-import org.apache.wicket.request.handler.IPageRequestHandler;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.PackageResourceReference;

0 comments on commit da31889

Please sign in to comment.