You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2021/07/25 23:30:40 UTC
[wicket] branch master updated: minor changes
This is an automated email from the ASF dual-hosted git repository.
svenmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new d6c1659 minor changes
d6c1659 is described below
commit d6c1659f59853b0d2d4ab4220748c0db5dd54889
Author: Sven Meier <sv...@apache.org>
AuthorDate: Mon Jul 26 01:19:27 2021 +0200
minor changes
removed duplicated test dependencies
corrected parent version for testing submodules
corrected threadtests
---
testing/wicket-arquillian/pom.xml | 7 +--
testing/wicket-common-tests/pom.xml | 5 --
testing/wicket-threadtest/pom.xml | 57 ++++++++++------------
.../apache/wicket/threadtest/apps/app1/Home.java | 3 +-
.../wicket/threadtest/apps/app1/TestApp1.java | 29 +++++------
.../wicket/threadtest/apps/app2/TestApp2.java | 29 +++++------
.../apache/wicket/threadtest/tester/Tester.java | 4 +-
wicket-bean-validation/pom.xml | 4 --
.../wicket-native-websocket-core/pom.xml | 4 --
.../wicket-native-websocket-javax/pom.xml | 5 --
10 files changed, 53 insertions(+), 94 deletions(-)
diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml
index 191d9db..b1ee2f7 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>9.0.0-M2-SNAPSHOT</version>
+ <version>10.0.0-M1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -110,11 +110,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-weld</artifactId>
<exclusions>
diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml
index d8bcefd..b4ed490 100644
--- a/testing/wicket-common-tests/pom.xml
+++ b/testing/wicket-common-tests/pom.xml
@@ -129,11 +129,6 @@
<artifactId>wicket-http2-undertow</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <artifactId>junit-jupiter-engine</artifactId>
- <groupId>org.junit.jupiter</groupId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/testing/wicket-threadtest/pom.xml b/testing/wicket-threadtest/pom.xml
index d8cb009..84598a3 100644
--- a/testing/wicket-threadtest/pom.xml
+++ b/testing/wicket-threadtest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>9.0.0-SNAPSHOT</version>
+ <version>10.0.0-M1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>wicket-threadtest</artifactId>
@@ -33,8 +33,28 @@
<japicmp.skip>true</japicmp.skip>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
@@ -44,48 +64,25 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.httpunit</groupId>
- <artifactId>httpunit</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>jakarta.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
+ <groupId>org.httpunit</groupId>
+ <artifactId>httpunit</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
index 64460e8..2f2d1d3 100644
--- a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
+++ b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
@@ -342,7 +342,6 @@ public class Home extends WebPage
*/
public Home()
{
-
add(new Link<Void>("link")
{
private static final long serialVersionUID = 1L;
@@ -356,7 +355,7 @@ public class Home extends WebPage
}
});
- add(new Label("selectedLabel", new PropertyModel<Contact>(this, "selectedContactLabel")));
+ add(new Label("selectedLabel", this::getSelectedContactLabel));
add(new DataView<Contact>("simple", new ContactDataProvider())
{
diff --git a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java
index a9c75a9..979ba07 100644
--- a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java
+++ b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java
@@ -21,13 +21,11 @@ import org.apache.wicket.DefaultPageManagerProvider;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
import org.apache.wicket.page.IPageManager;
-import org.apache.wicket.page.IPageManagerContext;
-import org.apache.wicket.page.PageStoreManager;
-import org.apache.wicket.pageStore.DefaultPageStore;
-import org.apache.wicket.pageStore.IDataStore;
+import org.apache.wicket.page.PageManager;
import org.apache.wicket.pageStore.IPageStore;
-import org.apache.wicket.pageStore.memory.HttpSessionDataStore;
-import org.apache.wicket.pageStore.memory.PageNumberEvictionStrategy;
+import org.apache.wicket.pageStore.InSessionPageStore;
+import org.apache.wicket.pageStore.RequestPageStore;
+import org.apache.wicket.pageStore.SerializingPageStore;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.serialize.java.JavaSerializer;
@@ -72,19 +70,14 @@ public class TestApp1 extends WebApplication
{
getSharedResources().add("cancelButton", new DefaultButtonImageResource("Cancel"));
- setPageManagerProvider(new DefaultPageManagerProvider(this)
- {
- @Override
- public IPageManager apply(IPageManagerContext pageManagerContext)
- {
- IDataStore dataStore = new HttpSessionDataStore(pageManagerContext,
- new PageNumberEvictionStrategy(500));
- IPageStore pageStore = new DefaultPageStore(
- new JavaSerializer(getApplicationKey()), dataStore,
- getStoreSettings().getInmemoryCacheSize());
- return new PageStoreManager(getName(), pageStore, pageManagerContext);
+ setPageManagerProvider(() -> {
+ IPageStore store = new InSessionPageStore(500);
+
+ store = new SerializingPageStore(store, getFrameworkSettings().getSerializer());
- }
+ store = new RequestPageStore(store);
+
+ return new PageManager(store);
});
}
diff --git a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java
index d702087..a10f85a 100644
--- a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java
+++ b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java
@@ -21,13 +21,11 @@ import org.apache.wicket.DefaultPageManagerProvider;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
import org.apache.wicket.page.IPageManager;
-import org.apache.wicket.page.IPageManagerContext;
-import org.apache.wicket.page.PageStoreManager;
-import org.apache.wicket.pageStore.DefaultPageStore;
-import org.apache.wicket.pageStore.IDataStore;
+import org.apache.wicket.page.PageManager;
import org.apache.wicket.pageStore.IPageStore;
-import org.apache.wicket.pageStore.memory.HttpSessionDataStore;
-import org.apache.wicket.pageStore.memory.PageNumberEvictionStrategy;
+import org.apache.wicket.pageStore.InSessionPageStore;
+import org.apache.wicket.pageStore.RequestPageStore;
+import org.apache.wicket.pageStore.SerializingPageStore;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.serialize.java.JavaSerializer;
@@ -60,19 +58,14 @@ public class TestApp2 extends WebApplication
{
getSharedResources().add("cancelButton", new DefaultButtonImageResource("Cancel"));
- setPageManagerProvider(new DefaultPageManagerProvider(this)
- {
- @Override
- public IPageManager apply(IPageManagerContext pageManagerContext)
- {
- IDataStore dataStore = new HttpSessionDataStore(pageManagerContext,
- new PageNumberEvictionStrategy(100));
- IPageStore pageStore = new DefaultPageStore(
- new JavaSerializer(getApplicationKey()), dataStore,
- getStoreSettings().getInmemoryCacheSize());
- return new PageStoreManager(getName(), pageStore, pageManagerContext);
+ setPageManagerProvider(() -> {
+ IPageStore store = new InSessionPageStore(100);
+
+ store = new SerializingPageStore(store, getFrameworkSettings().getSerializer());
+
+ store = new RequestPageStore(store);
- }
+ return new PageManager(store);
});
}
diff --git a/testing/wicket-threadtest/src/test/java/org/apache/wicket/threadtest/tester/Tester.java b/testing/wicket-threadtest/src/test/java/org/apache/wicket/threadtest/tester/Tester.java
index 382aaf8..bd011c6 100644
--- a/testing/wicket-threadtest/src/test/java/org/apache/wicket/threadtest/tester/Tester.java
+++ b/testing/wicket-threadtest/src/test/java/org/apache/wicket/threadtest/tester/Tester.java
@@ -18,6 +18,7 @@ package org.apache.wicket.threadtest.tester;
import static org.junit.Assert.fail;
+import java.time.Duration;
import java.util.Arrays;
import java.util.List;
@@ -27,7 +28,6 @@ import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.params.HttpClientParams;
import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
import org.apache.wicket.threadtest.tester.CommandRunner.CommandRunnerObserver;
-import org.apache.wicket.util.time.Duration;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.webapp.WebAppContext;
import org.slf4j.Logger;
@@ -271,7 +271,7 @@ public final class Tester implements CommandRunnerObserver
long end = System.currentTimeMillis();
long time = end - start;
- log.info("\n******** finished in " + Duration.milliseconds(time) + " (" + time +
+ log.info("\n******** finished in " + Duration.ofMillis(time) + " (" + time +
" milis)");
}
diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml
index 615c5f7..722b493 100644
--- a/wicket-bean-validation/pom.xml
+++ b/wicket-bean-validation/pom.xml
@@ -48,9 +48,5 @@
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/wicket-native-websocket/wicket-native-websocket-core/pom.xml b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
index ca3a578..40f8f59 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
@@ -35,9 +35,5 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
index 5635e2a..fe60a25 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
@@ -49,10 +49,5 @@
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jakarta-server</artifactId>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>