[jira] [Updated] (WICKET-6607) NoSuchMethodError when using Spring-Beans with constructor injection in an AjaxLink#onClick
[
https://issues.apache.org/jira/browse/WICKET-6607?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Lukas Korten updated WICKET-6607:
-
Priority: Blocker (was: Major)
> NoSuchMethodError when using Spring-Beans with constructor injection in an
> AjaxLink#onClick
> ---
>
> Key: WICKET-6607
> URL: https://issues.apache.org/jira/browse/WICKET-6607
> Project: Wicket
> Issue Type: Bug
> Components: wicket-core, wicket-spring
>Affects Versions: 8.1.0
>Reporter: Lukas Korten
>Priority: Blocker
> Attachments: wicket-di.zip
>
>
> We are currently building a SpringBoot application with Wicket 8.1.0 and
> using Constructor injection in the service layer. If a service that follows
> this approach is injected into a Wicket component, the already known issue,
> [reported on
> stackoverflow|https://stackoverflow.com/questions/35260608/wicket-springbean-and-spring-autowired-with-injection-via-constructor],
> occurs:
> {code:java}
> java.lang.IllegalArgumentException: Superclass has no null constructors but
> no arguments were given at
> net.sf.cglib.proxy.Enhancer.emitConstructors(Enhancer.java:931)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.generateClass(Enhancer.java:631)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.DefaultGeneratorStrategy.generate(DefaultGeneratorStrategy.java:25)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator.generate(AbstractClassGenerator.java:329)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.generate(Enhancer.java:492) ~[cglib-3.2.6.jar:na]
> at
> net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:93)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:91)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.internal.LoadingCache$2.call(LoadingCache.java:54)
> ~[cglib-3.2.6.jar:na] at
> java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_131] at
> net.sf.cglib.core.internal.LoadingCache.createEntry(LoadingCache.java:61)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.internal.LoadingCache.get(LoadingCache.java:34)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData.get(AbstractClassGenerator.java:116)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:291)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.createHelper(Enhancer.java:480)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.create(Enhancer.java:305) ~[cglib-3.2.6.jar:na]
> at
> org.apache.wicket.proxy.LazyInitProxyFactory.createProxy(LazyInitProxyFactory.java:192)
> ~[wicket-ioc-8.1.0.jar:8.1.0] at
> org.apache.wicket.spring.injection.annot.AnnotProxyFieldValueFactory.getFieldValue(AnnotProxyFieldValueFactory.java:166)
> ~[wicket-spring-8.1.0.jar:8.1.0] at
> org.apache.wicket.injection.Injector.inject(Injector.java:111)
> ~[wicket-ioc-8.1.0.jar:8.1.0]
> {code}
> The workaround for that issue is to use Objenesis.
> But now another error occurs as soon as the spring-bean is used in a
> listener, e.g. in an onClick method of an AjaxLink.
> {code:java}
> Exception in thread "Wicket-AsyncPageStore-PageSavingThread"
> java.lang.NoSuchMethodError:
> de.korten.wicket.examples.helloworld.FooBarService.writeReplace()Ljava/lang/Object;
> at
> de.korten.wicket.examples.helloworld.Wicket_Proxy_FooBarService$$EnhancerByCGLIB$$5b8fb826.writeReplace()
> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
> at java.lang.reflect.Method.invoke(Method.java:498)
> at java.io.ObjectStreamClass.invokeWriteReplace(ObjectStreamClass.java:1118)
> at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1136)
> at
> java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1548)
> at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1509)
> at
> java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1432)
> at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1178)
> at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:348)
> at
> org.apache.wicket.serialize.java.JavaSerializer$SerializationCheckerObjectOutputStream.writeObjectOverride(JavaSerializer.java:368)
> at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:344)
> at
> org.apache.wicket.serialize.java.JavaSerializer.serialize(JavaSerializer.java:82)
> at
> org.apache.wicket.pageStore.AbstractPageStore.serializePage(AbstractPageStore.java:133
[jira] [Updated] (WICKET-6607) NoSuchMethodError when using Spring-Beans with constructor injection in an AjaxLink#onClick
[
https://issues.apache.org/jira/browse/WICKET-6607?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Lukas Korten updated WICKET-6607:
-
Component/s: (was: wicket-cdi)
wicket-spring
> NoSuchMethodError when using Spring-Beans with constructor injection in an
> AjaxLink#onClick
> ---
>
> Key: WICKET-6607
> URL: https://issues.apache.org/jira/browse/WICKET-6607
> Project: Wicket
> Issue Type: Bug
> Components: wicket-core, wicket-spring
>Affects Versions: 8.1.0
>Reporter: Lukas Korten
>Priority: Blocker
> Attachments: wicket-di.zip
>
>
> We are currently building a SpringBoot application with Wicket 8.1.0 and
> using Constructor injection in the service layer. If a service that follows
> this approach is injected into a Wicket component, the already known issue,
> [reported on
> stackoverflow|https://stackoverflow.com/questions/35260608/wicket-springbean-and-spring-autowired-with-injection-via-constructor],
> occurs:
> {code:java}
> java.lang.IllegalArgumentException: Superclass has no null constructors but
> no arguments were given at
> net.sf.cglib.proxy.Enhancer.emitConstructors(Enhancer.java:931)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.generateClass(Enhancer.java:631)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.DefaultGeneratorStrategy.generate(DefaultGeneratorStrategy.java:25)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator.generate(AbstractClassGenerator.java:329)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.generate(Enhancer.java:492) ~[cglib-3.2.6.jar:na]
> at
> net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:93)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:91)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.internal.LoadingCache$2.call(LoadingCache.java:54)
> ~[cglib-3.2.6.jar:na] at
> java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_131] at
> net.sf.cglib.core.internal.LoadingCache.createEntry(LoadingCache.java:61)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.internal.LoadingCache.get(LoadingCache.java:34)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData.get(AbstractClassGenerator.java:116)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:291)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.createHelper(Enhancer.java:480)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.create(Enhancer.java:305) ~[cglib-3.2.6.jar:na]
> at
> org.apache.wicket.proxy.LazyInitProxyFactory.createProxy(LazyInitProxyFactory.java:192)
> ~[wicket-ioc-8.1.0.jar:8.1.0] at
> org.apache.wicket.spring.injection.annot.AnnotProxyFieldValueFactory.getFieldValue(AnnotProxyFieldValueFactory.java:166)
> ~[wicket-spring-8.1.0.jar:8.1.0] at
> org.apache.wicket.injection.Injector.inject(Injector.java:111)
> ~[wicket-ioc-8.1.0.jar:8.1.0]
> {code}
> The workaround for that issue is to use Objenesis.
> But now another error occurs as soon as the spring-bean is used in a
> listener, e.g. in an onClick method of an AjaxLink.
> {code:java}
> Exception in thread "Wicket-AsyncPageStore-PageSavingThread"
> java.lang.NoSuchMethodError:
> de.korten.wicket.examples.helloworld.FooBarService.writeReplace()Ljava/lang/Object;
> at
> de.korten.wicket.examples.helloworld.Wicket_Proxy_FooBarService$$EnhancerByCGLIB$$5b8fb826.writeReplace()
> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
> at java.lang.reflect.Method.invoke(Method.java:498)
> at java.io.ObjectStreamClass.invokeWriteReplace(ObjectStreamClass.java:1118)
> at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1136)
> at
> java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1548)
> at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1509)
> at
> java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1432)
> at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1178)
> at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:348)
> at
> org.apache.wicket.serialize.java.JavaSerializer$SerializationCheckerObjectOutputStream.writeObjectOverride(JavaSerializer.java:368)
> at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:344)
> at
> org.apache.wicket.serialize.java.JavaSerializer.serialize(JavaSerializer.java:82)
> at
> org.apache.wicket.pageStore.AbstractPageStore.serial
[jira] [Updated] (WICKET-6607) NoSuchMethodError when using Spring-Beans with constructor injection in an AjaxLink#onClick
[
https://issues.apache.org/jira/browse/WICKET-6607?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Lukas Korten updated WICKET-6607:
-
Description:
We are currently building a SpringBoot application with Wicket 8.1.0 and using
Constructor injection in the service layer. If a service that follows this
approach is injected into a Wicket component, the already known issue,
[reported on
stackoverflow|https://stackoverflow.com/questions/35260608/wicket-springbean-and-spring-autowired-with-injection-via-constructor],
occurs:
{code:java}
java.lang.IllegalArgumentException: Superclass has no null constructors but no
arguments were given at
net.sf.cglib.proxy.Enhancer.emitConstructors(Enhancer.java:931)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.proxy.Enhancer.generateClass(Enhancer.java:631)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.DefaultGeneratorStrategy.generate(DefaultGeneratorStrategy.java:25)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator.generate(AbstractClassGenerator.java:329)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.proxy.Enhancer.generate(Enhancer.java:492) ~[cglib-3.2.6.jar:na]
at
net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:93)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:91)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.internal.LoadingCache$2.call(LoadingCache.java:54)
~[cglib-3.2.6.jar:na] at
java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_131] at
net.sf.cglib.core.internal.LoadingCache.createEntry(LoadingCache.java:61)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.internal.LoadingCache.get(LoadingCache.java:34)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData.get(AbstractClassGenerator.java:116)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:291)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.proxy.Enhancer.createHelper(Enhancer.java:480)
~[cglib-3.2.6.jar:na] at net.sf.cglib.proxy.Enhancer.create(Enhancer.java:305)
~[cglib-3.2.6.jar:na] at
org.apache.wicket.proxy.LazyInitProxyFactory.createProxy(LazyInitProxyFactory.java:192)
~[wicket-ioc-8.1.0.jar:8.1.0] at
org.apache.wicket.spring.injection.annot.AnnotProxyFieldValueFactory.getFieldValue(AnnotProxyFieldValueFactory.java:166)
~[wicket-spring-8.1.0.jar:8.1.0] at
org.apache.wicket.injection.Injector.inject(Injector.java:111)
~[wicket-ioc-8.1.0.jar:8.1.0]
{code}
The workaround for that issue is to use Objenesis.
But now another error occurs as soon as the spring-bean is used in a listener,
e.g. in an onClick method of an AjaxLink.
{code:java}
Exception in thread "Wicket-AsyncPageStore-PageSavingThread"
java.lang.NoSuchMethodError:
de.korten.wicket.examples.helloworld.FooBarService.writeReplace()Ljava/lang/Object;
at
de.korten.wicket.examples.helloworld.Wicket_Proxy_FooBarService$$EnhancerByCGLIB$$5b8fb826.writeReplace()
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at java.io.ObjectStreamClass.invokeWriteReplace(ObjectStreamClass.java:1118)
at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1136)
at java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1548)
at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1509)
at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1432)
at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1178)
at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:348)
at
org.apache.wicket.serialize.java.JavaSerializer$SerializationCheckerObjectOutputStream.writeObjectOverride(JavaSerializer.java:368)
at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:344)
at
org.apache.wicket.serialize.java.JavaSerializer.serialize(JavaSerializer.java:82)
at
org.apache.wicket.pageStore.AbstractPageStore.serializePage(AbstractPageStore.java:133)
at
org.apache.wicket.pageStore.DefaultPageStore.createSerializedPage(DefaultPageStore.java:281)
at
org.apache.wicket.pageStore.DefaultPageStore.storePage(DefaultPageStore.java:61)
at
org.apache.wicket.pageStore.AsynchronousPageStore$PageSavingRunnable.run(AsynchronousPageStore.java:225)
at java.lang.Thread.run(Thread.java:748)
{code}
The Spring-Bean itself can be resolved in the onClick, but not its
dependencies, these are then null.
I have attached a simple example project to reproduce the problem.
The attached application can be started with the command "gradlew bootrun".
After that the HomePage can be reached under localhost:8080. This page contains
a single link in whose onClick method the d
buildbot success in on wicket-branch-8.x
The Buildbot has detected a restored build on builder wicket-branch-8.x while building wicket. Full details are available at: https://ci.apache.org/builders/wicket-branch-8.x/builds/49 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_slave1_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-wicket-branch-8.x-commit' triggered this build Build Source Stamp: [branch wicket-8.x] 457a0a5b8388d131e4ce883125382f5a457ff350 Blamelist: Sven Meier Build succeeded! Sincerely, -The Buildbot
buildbot failure in on wicket-master
The Buildbot has detected a new failure on builder wicket-master while building wicket. Full details are available at: https://ci.apache.org/builders/wicket-master/builds/1021 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_slave1_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-wicket-master-commit' triggered this build Build Source Stamp: [branch master] 8fc2eab45577eceed732b252ee7190ab7db55387 Blamelist: Sven Meier BUILD FAILED: failed compile Sincerely, -The Buildbot
[jira] [Resolved] (WICKET-6606) data-wicket-placeholder is invalid XHTML
[ https://issues.apache.org/jira/browse/WICKET-6606?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sven Meier resolved WICKET-6606. Resolution: Fixed Assignee: Sven Meier Fix Version/s: 9.0.0 8.2.0 Thanks for the heads up! The new attribute has an empty value now. > data-wicket-placeholder is invalid XHTML > > > Key: WICKET-6606 > URL: https://issues.apache.org/jira/browse/WICKET-6606 > Project: Wicket > Issue Type: Bug > Components: wicket-core >Affects Versions: 8.1.0 >Reporter: Gert-Jan Schouten >Assignee: Sven Meier >Priority: Major > Fix For: 8.2.0, 9.0.0 > > > Because of WICKET-6575, Wicket now sometimes adds a data-wicket-placeholder > attribute. However, when you serve your pages with MIME-type > application/xhtml+xml, the browser expects valid XML. The > data-wicket-placeholder attribute results in a browser parse error, because > it does not have a value. This makes 8.1.0 currently unusable to us, since we > serve pure XHTML. I suggest giving the attribute an empty value: > data-wicket-placeholder="" or a dummy value: data-wicket-placeholder="true". -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (WICKET-6606) data-wicket-placeholder is invalid XHTML
[ https://issues.apache.org/jira/browse/WICKET-6606?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16669356#comment-16669356 ] ASF subversion and git services commented on WICKET-6606: - Commit 457a0a5b8388d131e4ce883125382f5a457ff350 in wicket's branch refs/heads/wicket-8.x from [~svenmeier] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=457a0a5 ] WICKET-6606 data-wicket-placeholder xhtml conform > data-wicket-placeholder is invalid XHTML > > > Key: WICKET-6606 > URL: https://issues.apache.org/jira/browse/WICKET-6606 > Project: Wicket > Issue Type: Bug > Components: wicket-core >Affects Versions: 8.1.0 >Reporter: Gert-Jan Schouten >Priority: Major > > Because of WICKET-6575, Wicket now sometimes adds a data-wicket-placeholder > attribute. However, when you serve your pages with MIME-type > application/xhtml+xml, the browser expects valid XML. The > data-wicket-placeholder attribute results in a browser parse error, because > it does not have a value. This makes 8.1.0 currently unusable to us, since we > serve pure XHTML. I suggest giving the attribute an empty value: > data-wicket-placeholder="" or a dummy value: data-wicket-placeholder="true". -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (WICKET-6606) data-wicket-placeholder is invalid XHTML
[ https://issues.apache.org/jira/browse/WICKET-6606?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16669355#comment-16669355 ] ASF subversion and git services commented on WICKET-6606: - Commit 8fc2eab45577eceed732b252ee7190ab7db55387 in wicket's branch refs/heads/master from [~svenmeier] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=8fc2eab ] WICKET-6606 data-wicket-placeholder xhtml conform > data-wicket-placeholder is invalid XHTML > > > Key: WICKET-6606 > URL: https://issues.apache.org/jira/browse/WICKET-6606 > Project: Wicket > Issue Type: Bug > Components: wicket-core >Affects Versions: 8.1.0 >Reporter: Gert-Jan Schouten >Priority: Major > > Because of WICKET-6575, Wicket now sometimes adds a data-wicket-placeholder > attribute. However, when you serve your pages with MIME-type > application/xhtml+xml, the browser expects valid XML. The > data-wicket-placeholder attribute results in a browser parse error, because > it does not have a value. This makes 8.1.0 currently unusable to us, since we > serve pure XHTML. I suggest giving the attribute an empty value: > data-wicket-placeholder="" or a dummy value: data-wicket-placeholder="true". -- This message was sent by Atlassian JIRA (v7.6.3#76005)
wicket git commit: WICKET-6606 data-wicket-placeholder xhtml conform
Repository: wicket
Updated Branches:
refs/heads/wicket-8.x f4dc540f8 -> 457a0a5b8
WICKET-6606 data-wicket-placeholder xhtml conform
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/457a0a5b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/457a0a5b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/457a0a5b
Branch: refs/heads/wicket-8.x
Commit: 457a0a5b8388d131e4ce883125382f5a457ff350
Parents: f4dc540
Author: Sven Meier
Authored: Tue Oct 30 22:13:47 2018 +0100
Committer: Sven Meier
Committed: Tue Oct 30 22:13:47 2018 +0100
--
wicket-core/src/main/java/org/apache/wicket/Component.java | 2 +-
.../src/test/java/org/apache/wicket/PlaceholderTagIdTest.java | 2 +-
.../org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java | 2 +-
.../markup/html/internal/InlineEnclosurePageExpectedResult_1.html | 2 +-
.../InlineEnclosureWithWicketMessagePage_invisible_expected.html | 2 +-
.../org/apache/wicket/markup/html/internal/TogglePageTest.java | 2 +-
.../wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html | 2 +-
.../java/org/apache/wicket/queueing/ComponentQueueingTest.java | 2 +-
wicket-core/src/test/js/all.html | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/457a0a5b/wicket-core/src/main/java/org/apache/wicket/Component.java
--
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java
b/wicket-core/src/main/java/org/apache/wicket/Component.java
index d408dae..4968843 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -2358,7 +2358,7 @@ public abstract class Component
response.write(name);
response.write(" id=\"");
response.write(getAjaxRegionMarkupId());
- response.write("\" style=\"display:none\"
data-wicket-placeholder>");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/457a0a5b/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
--
diff --git
a/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
b/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
index 5eb072c..8f422ef 100644
--- a/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
@@ -42,7 +42,7 @@ public class PlaceholderTagIdTest extends WicketTestCase
{
tester.startPage(TestPage.class);
- tester.assertContains("");
+ tester.assertContains("");
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/457a0a5b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
--
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
index e12329b..281d0b9 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
@@ -40,7 +40,7 @@ public class AjaxEnclosureTest extends WicketTestCase
{
private final String inlineEnclosureIdPrefix =
"wicket__InlineEnclosure_";
private final String inlineEnclosureHiddenPattern = "";
+ "\\w+\" style=\"display:none\"
data-wicket-placeholder=\"\">";
private final String inlineEnclosureVisiblePattern = "";
http://git-wip-us.apache.org/repos/asf/wicket/blob/457a0a5b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
--
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
index ff86786..4bc7e17 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
@@ -11,7 +11,7 @@
-
+
http://git-wip-us.apache.org/repos/asf/wicket/blob/457a0a5b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisib
wicket git commit: WICKET-6606 data-wicket-placeholder xhtml conform
Repository: wicket
Updated Branches:
refs/heads/master a6d73f46b -> 8fc2eab45
WICKET-6606 data-wicket-placeholder xhtml conform
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8fc2eab4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8fc2eab4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8fc2eab4
Branch: refs/heads/master
Commit: 8fc2eab45577eceed732b252ee7190ab7db55387
Parents: a6d73f4
Author: Sven Meier
Authored: Tue Oct 30 22:13:47 2018 +0100
Committer: Sven Meier
Committed: Tue Oct 30 22:25:47 2018 +0100
--
wicket-core/src/main/java/org/apache/wicket/Component.java | 2 +-
.../src/test/java/org/apache/wicket/PlaceholderTagIdTest.java | 2 +-
.../org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java | 2 +-
.../markup/html/internal/InlineEnclosurePageExpectedResult_1.html | 2 +-
.../InlineEnclosureWithWicketMessagePage_invisible_expected.html | 2 +-
.../org/apache/wicket/markup/html/internal/TogglePageTest.java | 2 +-
.../wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html | 2 +-
.../java/org/apache/wicket/queueing/ComponentQueueingTest.java | 2 +-
wicket-core/src/test/js/all.html | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/8fc2eab4/wicket-core/src/main/java/org/apache/wicket/Component.java
--
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java
b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 0f5fc7d..0a90016 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -2360,7 +2360,7 @@ public abstract class Component
response.write(name);
response.write(" id=\"");
response.write(getAjaxRegionMarkupId());
- response.write("\" style=\"display:none\"
data-wicket-placeholder>");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8fc2eab4/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
--
diff --git
a/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
b/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
index 3988176..5b98156 100644
--- a/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
@@ -42,7 +42,7 @@ class PlaceholderTagIdTest extends WicketTestCase
{
tester.startPage(TestPage.class);
- tester.assertContains("");
+ tester.assertContains("");
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/8fc2eab4/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
--
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
index 162e343..8a16f20 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
@@ -42,7 +42,7 @@ class AjaxEnclosureTest extends WicketTestCase
{
private final String inlineEnclosureIdPrefix =
"wicket__InlineEnclosure_";
private final String inlineEnclosureHiddenPattern = "";
+ "\\w+\" style=\"display:none\"
data-wicket-placeholder=\"\">";
private final String inlineEnclosureVisiblePattern = "";
http://git-wip-us.apache.org/repos/asf/wicket/blob/8fc2eab4/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
--
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
index ff86786..4bc7e17 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
@@ -11,7 +11,7 @@
-
+
http://git-wip-us.apache.org/repos/asf/wicket/blob/8fc2eab4/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html
-
[jira] [Updated] (WICKET-6607) NoSuchMethodError when using Spring-Beans with constructor injection in an AjaxLink#onClick
[
https://issues.apache.org/jira/browse/WICKET-6607?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Lukas Korten updated WICKET-6607:
-
Summary: NoSuchMethodError when using Spring-Beans with constructor
injection in an AjaxLink#onClick (was: NoSuchMethodError when using Spring
Beans with constructor injection in an AjaxLink#onClick)
> NoSuchMethodError when using Spring-Beans with constructor injection in an
> AjaxLink#onClick
> ---
>
> Key: WICKET-6607
> URL: https://issues.apache.org/jira/browse/WICKET-6607
> Project: Wicket
> Issue Type: Bug
> Components: wicket-cdi, wicket-core
>Affects Versions: 8.1.0
>Reporter: Lukas Korten
>Priority: Major
> Attachments: wicket-di.zip
>
>
> We are currently building a SpringBoot application with Wicket 8.1.0 and
> using Constructor injection in the service layer. If a service that follows
> this approach is injected into a Wicket component, the already known issue,
> [reported on
> stackoverflow|https://stackoverflow.com/questions/35260608/wicket-springbean-and-spring-autowired-with-injection-via-constructor],
> occurs:
> {code:java}
> java.lang.IllegalArgumentException: Superclass has no null constructors but
> no arguments were given at
> net.sf.cglib.proxy.Enhancer.emitConstructors(Enhancer.java:931)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.generateClass(Enhancer.java:631)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.DefaultGeneratorStrategy.generate(DefaultGeneratorStrategy.java:25)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator.generate(AbstractClassGenerator.java:329)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.generate(Enhancer.java:492) ~[cglib-3.2.6.jar:na]
> at
> net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:93)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:91)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.internal.LoadingCache$2.call(LoadingCache.java:54)
> ~[cglib-3.2.6.jar:na] at
> java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_131] at
> net.sf.cglib.core.internal.LoadingCache.createEntry(LoadingCache.java:61)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.internal.LoadingCache.get(LoadingCache.java:34)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData.get(AbstractClassGenerator.java:116)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:291)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.createHelper(Enhancer.java:480)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.create(Enhancer.java:305) ~[cglib-3.2.6.jar:na]
> at
> org.apache.wicket.proxy.LazyInitProxyFactory.createProxy(LazyInitProxyFactory.java:192)
> ~[wicket-ioc-8.1.0.jar:8.1.0] at
> org.apache.wicket.spring.injection.annot.AnnotProxyFieldValueFactory.getFieldValue(AnnotProxyFieldValueFactory.java:166)
> ~[wicket-spring-8.1.0.jar:8.1.0] at
> org.apache.wicket.injection.Injector.inject(Injector.java:111)
> ~[wicket-ioc-8.1.0.jar:8.1.0]
> {code}
> The workaround for that issue is to use Objenesis.
> But now another error occurs as soon as the spring-bean is used in a
> listener, e.g. in an onClick method of an AjaxLink.
> {code:java}
> Exception in thread "Wicket-AsyncPageStore-PageSavingThread"
> java.lang.NoSuchMethodError:
> de.korten.wicket.examples.helloworld.FooBarService.writeReplace()Ljava/lang/Object;
> at
> de.korten.wicket.examples.helloworld.Wicket_Proxy_FooBarService$$EnhancerByCGLIB$$5b8fb826.writeReplace()
> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
> at java.lang.reflect.Method.invoke(Method.java:498)
> at java.io.ObjectStreamClass.invokeWriteReplace(ObjectStreamClass.java:1118)
> at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1136)
> at
> java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1548)
> at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1509)
> at
> java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1432)
> at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1178)
> at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:348)
> at
> org.apache.wicket.serialize.java.JavaSerializer$SerializationCheckerObjectOutputStream.writeObjectOverride(JavaSerializer.java:368)
> at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:344)
> at
> org.apache.
[jira] [Updated] (WICKET-6607) NoSuchMethodError when using Spring Beans with constructor injection in an AjaxLink#onClick
[
https://issues.apache.org/jira/browse/WICKET-6607?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Lukas Korten updated WICKET-6607:
-
Summary: NoSuchMethodError when using Spring Beans with constructor
injection in an AjaxLink#onClick (was: Spring Beans with constructor injection
used in an AjaxLink#onClick)
> NoSuchMethodError when using Spring Beans with constructor injection in an
> AjaxLink#onClick
> ---
>
> Key: WICKET-6607
> URL: https://issues.apache.org/jira/browse/WICKET-6607
> Project: Wicket
> Issue Type: Bug
> Components: wicket-cdi, wicket-core
>Affects Versions: 8.1.0
>Reporter: Lukas Korten
>Priority: Major
> Attachments: wicket-di.zip
>
>
> We are currently building a SpringBoot application with Wicket 8.1.0 and
> using Constructor injection in the service layer. If a service that follows
> this approach is injected into a Wicket component, the already known issue,
> [reported on
> stackoverflow|https://stackoverflow.com/questions/35260608/wicket-springbean-and-spring-autowired-with-injection-via-constructor],
> occurs:
> {code:java}
> java.lang.IllegalArgumentException: Superclass has no null constructors but
> no arguments were given at
> net.sf.cglib.proxy.Enhancer.emitConstructors(Enhancer.java:931)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.generateClass(Enhancer.java:631)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.DefaultGeneratorStrategy.generate(DefaultGeneratorStrategy.java:25)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator.generate(AbstractClassGenerator.java:329)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.generate(Enhancer.java:492) ~[cglib-3.2.6.jar:na]
> at
> net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:93)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:91)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.internal.LoadingCache$2.call(LoadingCache.java:54)
> ~[cglib-3.2.6.jar:na] at
> java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_131] at
> net.sf.cglib.core.internal.LoadingCache.createEntry(LoadingCache.java:61)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.internal.LoadingCache.get(LoadingCache.java:34)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData.get(AbstractClassGenerator.java:116)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:291)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.createHelper(Enhancer.java:480)
> ~[cglib-3.2.6.jar:na] at
> net.sf.cglib.proxy.Enhancer.create(Enhancer.java:305) ~[cglib-3.2.6.jar:na]
> at
> org.apache.wicket.proxy.LazyInitProxyFactory.createProxy(LazyInitProxyFactory.java:192)
> ~[wicket-ioc-8.1.0.jar:8.1.0] at
> org.apache.wicket.spring.injection.annot.AnnotProxyFieldValueFactory.getFieldValue(AnnotProxyFieldValueFactory.java:166)
> ~[wicket-spring-8.1.0.jar:8.1.0] at
> org.apache.wicket.injection.Injector.inject(Injector.java:111)
> ~[wicket-ioc-8.1.0.jar:8.1.0]
> {code}
> The workaround for that issue is to use Objenesis.
> But now another error occurs as soon as the spring-bean is used in a
> listener, e.g. in an onClick method of an AjaxLink.
> {code:java}
> Exception in thread "Wicket-AsyncPageStore-PageSavingThread"
> java.lang.NoSuchMethodError:
> de.korten.wicket.examples.helloworld.FooBarService.writeReplace()Ljava/lang/Object;
> at
> de.korten.wicket.examples.helloworld.Wicket_Proxy_FooBarService$$EnhancerByCGLIB$$5b8fb826.writeReplace()
> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
> at java.lang.reflect.Method.invoke(Method.java:498)
> at java.io.ObjectStreamClass.invokeWriteReplace(ObjectStreamClass.java:1118)
> at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1136)
> at
> java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1548)
> at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1509)
> at
> java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1432)
> at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1178)
> at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:348)
> at
> org.apache.wicket.serialize.java.JavaSerializer$SerializationCheckerObjectOutputStream.writeObjectOverride(JavaSerializer.java:368)
> at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:344)
> at
> org.apache.wicket.serialize.java.Ja
[jira] [Updated] (WICKET-6607) Spring Beans with constructor injection used in an AjaxLink#onClick
[
https://issues.apache.org/jira/browse/WICKET-6607?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Lukas Korten updated WICKET-6607:
-
Description:
We are currently building a SpringBoot application with Wicket 8.1.0 and using
Constructor injection in the service layer. If a service that follows this
approach is injected into a Wicket component, the already known issue,
[reported on
stackoverflow|https://stackoverflow.com/questions/35260608/wicket-springbean-and-spring-autowired-with-injection-via-constructor],
occurs:
{code:java}
java.lang.IllegalArgumentException: Superclass has no null constructors but no
arguments were given at
net.sf.cglib.proxy.Enhancer.emitConstructors(Enhancer.java:931)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.proxy.Enhancer.generateClass(Enhancer.java:631)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.DefaultGeneratorStrategy.generate(DefaultGeneratorStrategy.java:25)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator.generate(AbstractClassGenerator.java:329)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.proxy.Enhancer.generate(Enhancer.java:492) ~[cglib-3.2.6.jar:na]
at
net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:93)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:91)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.internal.LoadingCache$2.call(LoadingCache.java:54)
~[cglib-3.2.6.jar:na] at
java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_131] at
net.sf.cglib.core.internal.LoadingCache.createEntry(LoadingCache.java:61)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.internal.LoadingCache.get(LoadingCache.java:34)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData.get(AbstractClassGenerator.java:116)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:291)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.proxy.Enhancer.createHelper(Enhancer.java:480)
~[cglib-3.2.6.jar:na] at net.sf.cglib.proxy.Enhancer.create(Enhancer.java:305)
~[cglib-3.2.6.jar:na] at
org.apache.wicket.proxy.LazyInitProxyFactory.createProxy(LazyInitProxyFactory.java:192)
~[wicket-ioc-8.1.0.jar:8.1.0] at
org.apache.wicket.spring.injection.annot.AnnotProxyFieldValueFactory.getFieldValue(AnnotProxyFieldValueFactory.java:166)
~[wicket-spring-8.1.0.jar:8.1.0] at
org.apache.wicket.injection.Injector.inject(Injector.java:111)
~[wicket-ioc-8.1.0.jar:8.1.0]
{code}
The workaround for that issue is to use Objenesis.
But now another error occurs as soon as the spring-bean is used in a listener,
e.g. in an onClick method of an AjaxLink.
{code:java}
Exception in thread "Wicket-AsyncPageStore-PageSavingThread"
java.lang.NoSuchMethodError:
de.korten.wicket.examples.helloworld.FooBarService.writeReplace()Ljava/lang/Object;
at
de.korten.wicket.examples.helloworld.Wicket_Proxy_FooBarService$$EnhancerByCGLIB$$5b8fb826.writeReplace()
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at java.io.ObjectStreamClass.invokeWriteReplace(ObjectStreamClass.java:1118)
at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1136)
at java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1548)
at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1509)
at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1432)
at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1178)
at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:348)
at
org.apache.wicket.serialize.java.JavaSerializer$SerializationCheckerObjectOutputStream.writeObjectOverride(JavaSerializer.java:368)
at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:344)
at
org.apache.wicket.serialize.java.JavaSerializer.serialize(JavaSerializer.java:82)
at
org.apache.wicket.pageStore.AbstractPageStore.serializePage(AbstractPageStore.java:133)
at
org.apache.wicket.pageStore.DefaultPageStore.createSerializedPage(DefaultPageStore.java:281)
at
org.apache.wicket.pageStore.DefaultPageStore.storePage(DefaultPageStore.java:61)
at
org.apache.wicket.pageStore.AsynchronousPageStore$PageSavingRunnable.run(AsynchronousPageStore.java:225)
at java.lang.Thread.run(Thread.java:748)
{code}
The Spring-Bean itself can be resolved in the onClick, but not its
dependencies, these are then null.
I have attached a simple example project to reproduce the problem.
The attached application can be started with the command "gradlew bootrun".
After that the HomePage can be reached under localhost:8080. This page contains
a single link in whose onClick method the d
[jira] [Updated] (WICKET-6607) Spring Beans with constructor injection used in an AjaxLink#onClick
[
https://issues.apache.org/jira/browse/WICKET-6607?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Lukas Korten updated WICKET-6607:
-
Description:
We are currently building a SpringBoot application with Wicket 8.1.0 and using
Constructor injection in the service layer. If a service that follows this
approach is injected into a Wicket component, the already known issue,
[reported on
stackoverflow|https://stackoverflow.com/questions/35260608/wicket-springbean-and-spring-autowired-with-injection-via-constructor],
occurs:
{code:java}
java.lang.IllegalArgumentException: Superclass has no null constructors but no
arguments were given at
net.sf.cglib.proxy.Enhancer.emitConstructors(Enhancer.java:931)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.proxy.Enhancer.generateClass(Enhancer.java:631)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.DefaultGeneratorStrategy.generate(DefaultGeneratorStrategy.java:25)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator.generate(AbstractClassGenerator.java:329)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.proxy.Enhancer.generate(Enhancer.java:492) ~[cglib-3.2.6.jar:na]
at
net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:93)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:91)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.internal.LoadingCache$2.call(LoadingCache.java:54)
~[cglib-3.2.6.jar:na] at
java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_131] at
net.sf.cglib.core.internal.LoadingCache.createEntry(LoadingCache.java:61)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.internal.LoadingCache.get(LoadingCache.java:34)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData.get(AbstractClassGenerator.java:116)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:291)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.proxy.Enhancer.createHelper(Enhancer.java:480)
~[cglib-3.2.6.jar:na] at net.sf.cglib.proxy.Enhancer.create(Enhancer.java:305)
~[cglib-3.2.6.jar:na] at
org.apache.wicket.proxy.LazyInitProxyFactory.createProxy(LazyInitProxyFactory.java:192)
~[wicket-ioc-8.1.0.jar:8.1.0] at
org.apache.wicket.spring.injection.annot.AnnotProxyFieldValueFactory.getFieldValue(AnnotProxyFieldValueFactory.java:166)
~[wicket-spring-8.1.0.jar:8.1.0] at
org.apache.wicket.injection.Injector.inject(Injector.java:111)
~[wicket-ioc-8.1.0.jar:8.1.0]
{code}
The workaround for that issue is to use Objenesis.
But now another error occurs as soon as the spring-bean is used in a listener,
e.g. in an onClick method of an AjaxLink. The Spring-Bean itself can be
resolved in the onClick, but not its dependencies, these are then null.
I have attached a simple example project to reproduce the problem.
The attached application can be started with the command "gradlew bootrun".
After that the HomePage can be reached under localhost:8080. This page contains
a single link in whose onClick method the described Spring-Bean is used. When
you click on this link, a NullpointerException flies. This depends on the point
that the dependencies of the bean can no longer be resolved and are therefore
null.
was:
We are currently building a SpringBoot application with Wicket 8.1.0 and using
Constructor injection in the service layer. If a service that follows this
approach is injected into a Wicket component, the already known issue,
[reported on
stackoverflow|https://stackoverflow.com/questions/35260608/wicket-springbean-and-spring-autowired-with-injection-via-constructor],
occurs:
{code:java}
java.lang.IllegalArgumentException: Superclass has no null constructors but no
arguments were given at
net.sf.cglib.proxy.Enhancer.emitConstructors(Enhancer.java:931)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.proxy.Enhancer.generateClass(Enhancer.java:631)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.DefaultGeneratorStrategy.generate(DefaultGeneratorStrategy.java:25)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator.generate(AbstractClassGenerator.java:329)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.proxy.Enhancer.generate(Enhancer.java:492) ~[cglib-3.2.6.jar:na]
at
net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:93)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:91)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.internal.LoadingCache$2.call(LoadingCache.java:54)
~[cglib-3.2.6.jar:na] at
java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_131] at
net.sf.cglib.core.internal.LoadingCache.createEntry(LoadingCache.java:61)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.internal.LoadingCache.get(LoadingCache.java:34)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator$ClassLoa
[jira] [Created] (WICKET-6607) Spring Beans with constructor injection used in an AjaxLink#onClick
Lukas Korten created WICKET-6607:
Summary: Spring Beans with constructor injection used in an
AjaxLink#onClick
Key: WICKET-6607
URL: https://issues.apache.org/jira/browse/WICKET-6607
Project: Wicket
Issue Type: Bug
Components: wicket-cdi, wicket-core
Affects Versions: 8.1.0
Reporter: Lukas Korten
Attachments: wicket-di.zip
We are currently building a SpringBoot application with Wicket 8.1.0 and using
Constructor injection in the service layer. If a service that follows this
approach is injected into a Wicket component, the already known issue,
[reported on
stackoverflow|https://stackoverflow.com/questions/35260608/wicket-springbean-and-spring-autowired-with-injection-via-constructor],
occurs:
{code:java}
java.lang.IllegalArgumentException: Superclass has no null constructors but no
arguments were given at
net.sf.cglib.proxy.Enhancer.emitConstructors(Enhancer.java:931)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.proxy.Enhancer.generateClass(Enhancer.java:631)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.DefaultGeneratorStrategy.generate(DefaultGeneratorStrategy.java:25)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator.generate(AbstractClassGenerator.java:329)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.proxy.Enhancer.generate(Enhancer.java:492) ~[cglib-3.2.6.jar:na]
at
net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:93)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData$3.apply(AbstractClassGenerator.java:91)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.internal.LoadingCache$2.call(LoadingCache.java:54)
~[cglib-3.2.6.jar:na] at
java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_131] at
net.sf.cglib.core.internal.LoadingCache.createEntry(LoadingCache.java:61)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.internal.LoadingCache.get(LoadingCache.java:34)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator$ClassLoaderData.get(AbstractClassGenerator.java:116)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:291)
~[cglib-3.2.6.jar:na] at
net.sf.cglib.proxy.Enhancer.createHelper(Enhancer.java:480)
~[cglib-3.2.6.jar:na] at net.sf.cglib.proxy.Enhancer.create(Enhancer.java:305)
~[cglib-3.2.6.jar:na] at
org.apache.wicket.proxy.LazyInitProxyFactory.createProxy(LazyInitProxyFactory.java:192)
~[wicket-ioc-8.1.0.jar:8.1.0] at
org.apache.wicket.spring.injection.annot.AnnotProxyFieldValueFactory.getFieldValue(AnnotProxyFieldValueFactory.java:166)
~[wicket-spring-8.1.0.jar:8.1.0] at
org.apache.wicket.injection.Injector.inject(Injector.java:111)
~[wicket-ioc-8.1.0.jar:8.1.0]
{code}
The workaround for that issue is to use Objenesis.
But now another error occurs as soon as the spring-bean is used in a listener,
e.g. in an onClick method of an AjaxLink. The Spring-Bean itself can be
resolved in the onClick, but not its dependencies, these are then null.
I have attached a simple example project to reproduce the problem.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (WICKET-6604) Ajax repaint is not correctly handled when component being repainted has an enclosure associated with it and is not a child of the enclosure
[
https://issues.apache.org/jira/browse/WICKET-6604?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16668883#comment-16668883
]
Igor Vaynberg commented on WICKET-6604:
---
forgot, its there now.
> Ajax repaint is not correctly handled when component being repainted has an
> enclosure associated with it and is not a child of the enclosure
>
>
> Key: WICKET-6604
> URL: https://issues.apache.org/jira/browse/WICKET-6604
> Project: Wicket
> Issue Type: Bug
>Affects Versions: 7.10.0, 8.1.0
>Reporter: Igor Vaynberg
>Assignee: Igor Vaynberg
>Priority: Minor
> Labels: ajax
> Fix For: 7.11.0, 8.2.0
>
>
> When a component is repainted with ajax we first check if that component is a
> controlling component of the enclosure and if it is we repaint the enclosure
> instead of the component. However, we make the assumption that the
> controlling component of the enclosure is always contained within the
> enclosure, which may not always be true with inline enclosures.
> For example:
> {code:java}
> Name
> {code}
> In this case the inline enclosure will only encompass the label. So if we
> repaint the textfield by adding it to the ajax request handler we will get a
> strange result where any header contributions associated with the name
> component will get rendered, but the markup for the name component will not -
> because we make the assumption that since it is controlling an enclosure it
> is also inside it so there is no point in repainting it directly.
>
> One may argue that controlling components have to be inside the enclosure and
> we should throw an error if they are not, but I prefer this more flexible
> approach which allows the controller to be outside.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Resolved] (WICKET-6604) Ajax repaint is not correctly handled when component being repainted has an enclosure associated with it and is not a child of the enclosure
[
https://issues.apache.org/jira/browse/WICKET-6604?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Igor Vaynberg resolved WICKET-6604.
---
Resolution: Fixed
> Ajax repaint is not correctly handled when component being repainted has an
> enclosure associated with it and is not a child of the enclosure
>
>
> Key: WICKET-6604
> URL: https://issues.apache.org/jira/browse/WICKET-6604
> Project: Wicket
> Issue Type: Bug
>Affects Versions: 7.10.0, 8.1.0
>Reporter: Igor Vaynberg
>Assignee: Igor Vaynberg
>Priority: Minor
> Labels: ajax
> Fix For: 7.11.0, 8.2.0
>
>
> When a component is repainted with ajax we first check if that component is a
> controlling component of the enclosure and if it is we repaint the enclosure
> instead of the component. However, we make the assumption that the
> controlling component of the enclosure is always contained within the
> enclosure, which may not always be true with inline enclosures.
> For example:
> {code:java}
> Name
> {code}
> In this case the inline enclosure will only encompass the label. So if we
> repaint the textfield by adding it to the ajax request handler we will get a
> strange result where any header contributions associated with the name
> component will get rendered, but the markup for the name component will not -
> because we make the assumption that since it is controlling an enclosure it
> is also inside it so there is no point in repainting it directly.
>
> One may argue that controlling components have to be inside the enclosure and
> we should throw an error if they are not, but I prefer this more flexible
> approach which allows the controller to be outside.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (WICKET-6604) Ajax repaint is not correctly handled when component being repainted has an enclosure associated with it and is not a child of the enclosure
[
https://issues.apache.org/jira/browse/WICKET-6604?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16668878#comment-16668878
]
ASF subversion and git services commented on WICKET-6604:
-
Commit a6d73f46b30e0846701bc8fdf3039895520eea1d in wicket's branch
refs/heads/master from [~ivaynberg]
[ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=a6d73f4 ]
WICKET-6604 fixed bug where controllers of enclosures were not correctly
repainted in ajax if they were outside enclosures
> Ajax repaint is not correctly handled when component being repainted has an
> enclosure associated with it and is not a child of the enclosure
>
>
> Key: WICKET-6604
> URL: https://issues.apache.org/jira/browse/WICKET-6604
> Project: Wicket
> Issue Type: Bug
>Affects Versions: 7.10.0, 8.1.0
>Reporter: Igor Vaynberg
>Assignee: Igor Vaynberg
>Priority: Minor
> Labels: ajax
> Fix For: 7.11.0, 8.2.0
>
>
> When a component is repainted with ajax we first check if that component is a
> controlling component of the enclosure and if it is we repaint the enclosure
> instead of the component. However, we make the assumption that the
> controlling component of the enclosure is always contained within the
> enclosure, which may not always be true with inline enclosures.
> For example:
> {code:java}
> Name
> {code}
> In this case the inline enclosure will only encompass the label. So if we
> repaint the textfield by adding it to the ajax request handler we will get a
> strange result where any header contributions associated with the name
> component will get rendered, but the markup for the name component will not -
> because we make the assumption that since it is controlling an enclosure it
> is also inside it so there is no point in repainting it directly.
>
> One may argue that controlling components have to be inside the enclosure and
> we should throw an error if they are not, but I prefer this more flexible
> approach which allows the controller to be outside.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
wicket git commit: WICKET-6604 fixed bug where controllers of enclosures were not correctly repainted in ajax if they were outside enclosures
Repository: wicket
Updated Branches:
refs/heads/master 08f6a531a -> a6d73f46b
WICKET-6604 fixed bug where controllers of enclosures were not correctly
repainted in ajax if they were outside enclosures
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a6d73f46
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a6d73f46
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a6d73f46
Branch: refs/heads/master
Commit: a6d73f46b30e0846701bc8fdf3039895520eea1d
Parents: 08f6a53
Author: Igor Vaynberg
Authored: Fri Oct 26 12:11:41 2018 -0700
Committer: Igor Vaynberg
Committed: Tue Oct 30 08:29:07 2018 -0700
--
.../protocol/http/AjaxEnclosureListener.java| 13 +++-
.../html/internal/AjaxEnclosurePage_4.html | 11 +++
.../html/internal/AjaxEnclosurePage_4.java | 75
.../markup/html/internal/AjaxEnclosureTest.java | 8 +++
4 files changed, 105 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/a6d73f46/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
index b966580..351d549 100644
---
a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
+++
b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AjaxEnclosureListener.java
@@ -82,13 +82,22 @@ public class AjaxEnclosureListener implements
AjaxRequestTarget.IListener
while (entriesItor.hasNext())
{
Map.Entry entry =
entriesItor.next();
- String componentId = entry.getKey();
Component component = entry.getValue();
if (isControllerOfEnclosure(component,
enclosure))
{
+ final Component controller =
component;
target.add(enclosure);
visit.dontGoDeeper();
- keysToRemove.add(componentId);
+ enclosure.visitChildren(new
IVisitor() {
+ @Override
+ public void
component(Component descendant, IVisit visit) {
+ if (descendant
== controller) {
+ // if
the controlling component is in the enclosure we do not need to repaint it
+ //
individually, it will be repainted as part of the enclosure repaint
+
keysToRemove.add(controller.getId());
+ }
+ }
+ });
break;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/a6d73f46/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_4.html
--
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_4.html
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_4.html
new file mode 100644
index 000..8f54a85
--- /dev/null
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_4.html
@@ -0,0 +1,11 @@
+
+
+
+
+ Name
+
+ submit
+
+
+
+
http://git-wip-us.apache.org/repos/asf/wicket/blob/a6d73f46/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_4.java
--
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_4.java
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_4.java
new file mode 100644
index 000..bdeb27d
--- /dev/null
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosurePage_4.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Founda
[jira] [Created] (WICKET-6606) data-wicket-placeholder is invalid XHTML
Gert-Jan Schouten created WICKET-6606: - Summary: data-wicket-placeholder is invalid XHTML Key: WICKET-6606 URL: https://issues.apache.org/jira/browse/WICKET-6606 Project: Wicket Issue Type: Bug Components: wicket-core Affects Versions: 8.1.0 Reporter: Gert-Jan Schouten Because of WICKET-6575, Wicket now sometimes adds a data-wicket-placeholder attribute. However, when you serve your pages with MIME-type application/xhtml+xml, the browser expects valid XML. The data-wicket-placeholder attribute results in a browser parse error, because it does not have a value. This makes 8.1.0 currently unusable to us, since we serve pure XHTML. I suggest giving the attribute an empty value: data-wicket-placeholder="" or a dummy value: data-wicket-placeholder="true". -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[50/52] [abbrv] wicket git commit: WICKET-6563 new IPageStore implementation
http://git-wip-us.apache.org/repos/asf/wicket/blob/c43d3a33/wicket-core/src/main/java/org/apache/wicket/pageStore/AsynchronousDataStore.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/pageStore/AsynchronousDataStore.java
b/wicket-core/src/main/java/org/apache/wicket/pageStore/AsynchronousDataStore.java
deleted file mode 100644
index f749354..000
---
a/wicket-core/src/main/java/org/apache/wicket/pageStore/AsynchronousDataStore.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.pageStore;
-
-import java.util.Iterator;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.wicket.util.lang.Args;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Facade for {@link IDataStore} that does the actual saving in worker thread.
- *
- * Creates an {@link Entry} for each triple (sessionId, pageId, data) and puts
it in
- * {@link #entries} queue if there is room. Acts as producer.
- * Later {@link PageSavingRunnable} reads in blocking manner from {@link
#entries} and saves each
- * entry. Acts as consumer.
- *
- * It starts only one instance of {@link PageSavingRunnable} because all we
need is to make the page
- * storing asynchronous. We don't want to write concurrently in the wrapped
{@link IDataStore},
- * though it may happen in the extreme case when the queue is full. These
cases should be avoided.
- *
- * @author Matej Knopp
- */
-public class AsynchronousDataStore implements IDataStore
-{
- /** Log for reporting. */
- private static final Logger log =
LoggerFactory.getLogger(AsynchronousDataStore.class);
-
- /**
-* The time to wait when adding an {@link Entry} into the entries. In
millis.
-*/
- private static final long OFFER_WAIT = 30L;
-
- /**
-* The time to wait for an entry to save with the wrapped {@link
IDataStore}. In millis.
-*/
- private static final long POLL_WAIT = 1000L;
-
- /**
-* The page saving thread.
-*/
- private Thread pageSavingThread;
-
- /**
-* The wrapped {@link IDataStore} that actually stores that pages
-*/
- private final IDataStore dataStore;
-
- /**
-* The queue where the entries which have to be saved are temporary
stored
-*/
- private final BlockingQueue entries;
-
- /**
-* A map 'sessionId:::pageId' -> {@link Entry}. Used for fast retrieval
of {@link Entry}s which
-* are not yet stored by the wrapped {@link IDataStore}
-*/
- private final ConcurrentMap entryMap;
-
- /**
-* Construct.
-*
-* @param dataStore
-*the wrapped {@link IDataStore} that actually saved the
data
-* @param capacity
-*the capacity of the queue that delays the saving
-*/
- public AsynchronousDataStore(final IDataStore dataStore, final int
capacity)
- {
- this.dataStore = dataStore;
- entries = new LinkedBlockingQueue<>(capacity);
- entryMap = new ConcurrentHashMap<>();
-
- pageSavingThread = new Thread(new PageSavingRunnable(),
"Wicket-AsyncDataStore-PageSavingThread");
- pageSavingThread.setDaemon(true);
- pageSavingThread.start();
- }
-
- @Override
- public void destroy()
- {
- final Thread thread = pageSavingThread;
- pageSavingThread = null;
- if (thread != null && thread.isAlive())
- {
- try
- {
- thread.join();
- } catch (InterruptedException e)
- {
- log.error(e.getMessage(), e);
- }
- }
-
- dataStore.destroy();
- }
-
- /**
-
[44/52] [abbrv] wicket git commit: WICKET-6605 Allow AjaxFallbackButton to be stateless
WICKET-6605 Allow AjaxFallbackButton to be stateless
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/08f6a531
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/08f6a531
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/08f6a531
Branch: refs/heads/WICKET-6563
Commit: 08f6a531ac68261311c5de228048e3bc43e47814
Parents: d1239aa
Author: Andrea Del Bene
Authored: Tue Oct 30 10:42:17 2018 +0100
Committer: Andrea Del Bene
Committed: Tue Oct 30 10:42:17 2018 +0100
--
.../ajax/markup/html/form/AjaxFallbackButton.java | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/08f6a531/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
index fcb9219..03ca2a2 100644
---
a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
+++
b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
@@ -18,6 +18,7 @@ package org.apache.wicket.ajax.markup.html.form;
import java.util.Optional;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
@@ -66,10 +67,15 @@ public abstract class AjaxFallbackButton extends Button
super(id, model);
mForm = form;
- add(new AjaxFormSubmitBehavior(form, "click")
+ add(newAjaxEventBehavior(form, "click"));
+ }
+
+ protected AjaxFormSubmitBehavior newAjaxEventBehavior(Form form,
String event)
+ {
+ return new AjaxFormSubmitBehavior(form, event)
{
private static final long serialVersionUID = 1L;
-
+
@Override
protected void onSubmit(AjaxRequestTarget target)
{
@@ -105,7 +111,12 @@ public abstract class AjaxFallbackButton extends Button
AjaxFallbackButton.this.updateAjaxAttributes(attributes);
}
- });
+ @Override
+ public boolean getStatelessHint(Component component)
+ {
+ return
AjaxFallbackButton.this.getStatelessHint();
+ }
+ };
}
protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
[38/52] [abbrv] wicket git commit: WICKET-6601 dont stop mouse down on drag start
WICKET-6601 dont stop mouse down on drag start
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/578a91a7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/578a91a7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/578a91a7
Branch: refs/heads/WICKET-6563
Commit: 578a91a74583b03c231aa9736b7c4dc5173a0de0
Parents: 5253012
Author: Sven Meier
Authored: Tue Oct 23 15:24:21 2018 +0200
Committer: Sven Meier
Committed: Tue Oct 23 15:26:53 2018 +0200
--
.../java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js | 2 --
.../apache/wicket/extensions/ajax/markup/html/modal/res/modal.js | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/578a91a7/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index 7404cd3..267d897 100644
---
a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++
b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@ -2344,8 +2344,6 @@
document.onmouseout = Wicket.Drag.mouseOut;
Wicket.Drag.current = element;
-
- return false;
},
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/578a91a7/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
--
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
index 8b66687..7f95529 100644
---
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
+++
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
@@ -766,8 +766,8 @@
* Called when dragging has started.
*/
onBegin: function(element, event) {
- // ignore anything inside the content
- if (jQuery(event.target).closest('.w_content').size()) {
+ // all resize elements must be clicked directly
+ if (jQuery(element).is('.w_caption') === false &&
element !== event.target) {
return false;
}
[42/52] [abbrv] wicket git commit: Update ASM to 7.0 and CGLIB to 3.2.9 (for better Java 11 support)
Update ASM to 7.0 and CGLIB to 3.2.9 (for better Java 11 support)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d1239aad
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d1239aad
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d1239aad
Branch: refs/heads/WICKET-6563
Commit: d1239aadd26325a0aa785268c060bed74cf4033c
Parents: 47170ff
Author: Martin Tzvetanov Grigorov
Authored: Mon Oct 29 10:07:04 2018 +0200
Committer: Martin Tzvetanov Grigorov
Committed: Mon Oct 29 10:08:02 2018 +0200
--
pom.xml | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1239aad/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b4c79f8..8be1af8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
11
- 3.2.8
+ 3.2.9
0.8.2
9.4.12.v20180830
5.3.1
@@ -188,13 +188,6 @@
cglib
cglib
${cglib.version}
-
-
-
- org.ow2.asm
- asm
-
-
com.fasterxml.jackson.core
@@ -433,7 +426,7 @@
org.ow2.asm
asm-util
- 6.2
+ 7.0
org.slf4j
[33/52] [abbrv] wicket git commit: Remove duplicate property for Mockito version
Remove duplicate property for Mockito version Upgrade maven-surefire-plugin to 2.22.1 that has better Java 9+ support Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bce0add9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bce0add9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bce0add9 Branch: refs/heads/WICKET-6563 Commit: bce0add91cf29ff2fe193131286f9cb15ffa86b5 Parents: b124725 Author: Martin Tzvetanov Grigorov Authored: Thu Oct 18 16:47:27 2018 +0300 Committer: Martin Tzvetanov Grigorov Committed: Thu Oct 18 17:27:36 2018 +0300 -- pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/bce0add9/pom.xml -- diff --git a/pom.xml b/pom.xml index 9c0bb42..46a8fa2 100644 --- a/pom.xml +++ b/pom.xml @@ -129,9 +129,8 @@ 5.1.0.RELEASE 3.1.0 3.0.1 - 2.22.0 - 2.22.0 - 2.18.3 + 2.22.1 + 2.23.0 1.7.25 1.2.3 2.0.0.0
[35/52] [abbrv] wicket git commit: WICKET-6595 Upgrade JUnit to v5.x
WICKET-6595 Upgrade JUnit to v5.x
Tidy up the Hamcrest dependencies management
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/804f5106
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/804f5106
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/804f5106
Branch: refs/heads/WICKET-6563
Commit: 804f5106e935ac929f14976a6a3b9bedb4f3a97e
Parents: ebdeed5
Author: Martin Tzvetanov Grigorov
Authored: Thu Oct 18 17:26:55 2018 +0300
Committer: Martin Tzvetanov Grigorov
Committed: Thu Oct 18 17:27:37 2018 +0300
--
pom.xml | 23 ---
testing/wicket-js-tests/pom.xml | 8
wicket-core/pom.xml | 5 -
wicket-ioc/pom.xml | 4
wicket-user-guide/pom.xml | 8
5 files changed, 16 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/804f5106/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2213355..efc943d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,12 +185,6 @@
provided
- org.hamcrest
- java-hamcrest
- ${hamcrest.version}
- provided
-
-
cglib
cglib
${cglib.version}
@@ -579,12 +573,6 @@
mockito-core
${mockito.version}
test
-
-
- org.hamcrest
-
hamcrest-core
-
-
@@ -594,10 +582,6 @@
javax.servlet-api
- org.hamcrest
- hamcrest-junit
-
-
org.slf4j
slf4j-api
@@ -905,13 +889,6 @@
maven-javadoc-plugin
${maven.javadoc.version}
-
-
-
org.hamcrest
-
hamcrest-junit
-
${hamcrest.version}
-
-
128m
256m
true
http://git-wip-us.apache.org/repos/asf/wicket/blob/804f5106/testing/wicket-js-tests/pom.xml
--
diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml
index 627b93b..f62708d 100644
--- a/testing/wicket-js-tests/pom.xml
+++ b/testing/wicket-js-tests/pom.xml
@@ -68,6 +68,14 @@
true
+
+
org.apache.maven.plugins
+
maven-surefire-plugin
+
+
+ true
+
+
http://git-wip-us.apache.org/repos/asf/wicket/blob/804f5106/wicket-core/pom.xml
--
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index 0ab47f9..a3746b4 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -77,11 +77,6 @@
assertj-core
- org.hamcrest
- java-hamcrest
- test
-
-
org.junit.jupiter
junit-jupiter-params
http://git-wip-us.apache.org/repos/asf/wicket/blob/804f5106/wicket-ioc/pom.xml
---
[20/52] [abbrv] wicket git commit: Update Jackson dependency to 2.9.7
Update Jackson dependency to 2.9.7 Test JDK 11 build at Buildbot Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0dc8cfb3 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0dc8cfb3 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0dc8cfb3 Branch: refs/heads/WICKET-6563 Commit: 0dc8cfb316fec86b85090d64fb5fcb2a60c92eb3 Parents: 2e447ee Author: Martin Tzvetanov Grigorov Authored: Thu Sep 27 09:17:22 2018 +0300 Committer: Martin Tzvetanov Grigorov Committed: Thu Sep 27 09:17:22 2018 +0300 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/0dc8cfb3/pom.xml -- diff --git a/pom.xml b/pom.xml index e205efe..7f0b4a1 100644 --- a/pom.xml +++ b/pom.xml @@ -206,7 +206,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.0 + 2.9.7 true
[51/52] [abbrv] wicket git commit: WICKET-6563 new IPageStore implementation
WICKET-6563 new IPageStore implementation Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c43d3a33 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c43d3a33 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c43d3a33 Branch: refs/heads/WICKET-6563 Commit: c43d3a338c591b86eedd294bb56ba122753385a6 Parents: 08f6a53 Author: Sven Meier Authored: Mon Jun 25 17:19:41 2018 +0200 Committer: Sven Meier Committed: Tue Oct 30 13:56:10 2018 +0100 -- .../java/org/apache/wicket/Application.java | 33 +- .../wicket/DefaultPageManagerProvider.java | 147 ++-- .../org/apache/wicket/IPageManagerProvider.java | 10 +- .../src/main/java/org/apache/wicket/Page.java | 10 +- .../main/java/org/apache/wicket/Session.java| 7 +- .../core/request/handler/PageProvider.java | 1 - .../handler/RenderPageRequestHandler.java | 2 +- .../core/util/string/ComponentRenderer.java | 2 +- .../org/apache/wicket/mock/MockApplication.java | 2 +- .../org/apache/wicket/mock/MockPageManager.java | 56 +- .../org/apache/wicket/mock/MockPageStore.java | 75 ++ .../apache/wicket/page/AbstractPageManager.java | 121 .../wicket/page/DefaultPageManagerContext.java | 101 --- .../org/apache/wicket/page/IPageManager.java| 80 +-- .../apache/wicket/page/IPageManagerContext.java | 66 -- .../wicket/page/PageAccessSynchronizer.java | 42 +- .../org/apache/wicket/page/PageManager.java | 90 +++ .../wicket/page/PageManagerDecorator.java | 100 --- .../apache/wicket/page/PageStoreManager.java| 508 - .../org/apache/wicket/page/RequestAdapter.java | 206 -- .../pageStore/AbstractCachingPageStore.java | 105 --- .../wicket/pageStore/AbstractPageStore.java | 154 .../wicket/pageStore/AsynchronousDataStore.java | 344 - .../wicket/pageStore/AsynchronousPageStore.java | 400 ++- .../wicket/pageStore/DefaultPageContext.java| 112 +++ .../wicket/pageStore/DefaultPageStore.java | 469 .../wicket/pageStore/DelegatingPageStore.java | 67 ++ .../apache/wicket/pageStore/DiskDataStore.java | 589 --- .../apache/wicket/pageStore/DiskPageStore.java | 710 +++ .../apache/wicket/pageStore/FilePageStore.java | 562 +++ .../wicket/pageStore/GroupingPageStore.java | 288 .../org/apache/wicket/pageStore/IDataStore.java | 83 --- .../apache/wicket/pageStore/IPageContext.java | 114 +++ .../org/apache/wicket/pageStore/IPageStore.java | 106 ++- .../apache/wicket/pageStore/IPersistedPage.java | 44 ++ .../wicket/pageStore/IPersistentPageStore.java | 51 ++ .../wicket/pageStore/InMemoryPageStore.java | 359 ++ .../wicket/pageStore/InSessionPageStore.java| 256 +++ .../apache/wicket/pageStore/NoopPageStore.java | 53 ++ .../wicket/pageStore/PageWindowManager.java | 506 - .../wicket/pageStore/PerSessionPageStore.java | 332 - .../wicket/pageStore/RequestPageStore.java | 157 .../wicket/pageStore/SecondLevelPageCache.java | 42 -- .../apache/wicket/pageStore/SerializedPage.java | 88 +++ .../wicket/pageStore/SerializingPageStore.java | 72 ++ .../wicket/pageStore/disk/NestedFolders.java| 123 .../pageStore/disk/PageWindowManager.java | 493 + .../pageStore/memory/HttpSessionDataStore.java | 186 - .../memory/IDataStoreEvictionStrategy.java | 35 - .../memory/MemorySizeEvictionStrategy.java | 64 -- .../memory/PageNumberEvictionStrategy.java | 62 -- .../wicket/pageStore/memory/PageTable.java | 128 .../pageStore/memory/PageTableCleaner.java | 46 -- .../apache/wicket/settings/StoreSettings.java | 69 +- .../wicket/util/tester/BaseWicketTester.java| 447 ++-- .../core/request/mapper/TestMapperContext.java | 51 +- .../DontStoreNotRenderedPageTestCase.java | 33 +- .../html/TransparentWebMarkupContainerTest.java | 8 +- .../wicket/page/PageAccessSynchronizerTest.java | 2 +- .../wicket/page/PersistentPageManagerTest.java | 79 ++- .../persistent/disk/PageWindowManagerTest.java | 305 .../AbstractConcurrentPageStoreTest.java| 375 ++ .../wicket/pageStore/AbstractPageStoreTest.java | 91 ++- .../pageStore/AsynchronousDataStoreTest.java| 45 +- .../pageStore/AsynchronousPageStoreTest.java| 255 +-- .../wicket/pageStore/DefaultPageStoreTest.java | 31 - .../wicket/pageStore/DiskDataStoreTest.java | 413 --- .../wicket/pageStore/DiskPageStoreTest.java | 52 ++ .../wicket/pageStore/DummyPageContext.java | 110 +++ .../wicket/pageStore/FilePageStoreTest.java | 52 ++ .../wicket/pageStore/GroupingPageStoreTest.java | 112 +++ .../wicket/pageStore/InMemoryPageStoreTest.java | 31 + .../pageStore/InSessionPa
[31/52] [abbrv] wicket git commit: Merge branch 'WICKET-6586-introduce-processing-encoding'
Merge branch 'WICKET-6586-introduce-processing-encoding' Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e749e61a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e749e61a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e749e61a Branch: refs/heads/WICKET-6563 Commit: e749e61a03bf067e85fbfbcf48f40e7a30eca0f6 Parents: c51cf87 072b2fc Author: Martin Tzvetanov Grigorov Authored: Tue Oct 16 10:17:27 2018 +0300 Committer: Martin Tzvetanov Grigorov Committed: Tue Oct 16 10:17:27 2018 +0300 -- .../request/resource/CssPackageResource.java| 49 +-- .../resource/JavaScriptPackageResource.java | 49 +-- .../request/resource/PackageResource.java | 92 +++- 3 files changed, 93 insertions(+), 97 deletions(-) --
[23/52] [abbrv] wicket git commit: Delete cdi-1.1 module again
Delete cdi-1.1 module again
It was mistakenly revived in a merge commit
https://github.com/apache/wicket/commit/0b48f2703b0856e539045a486fd362077fe947a1
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cb7942e2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cb7942e2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cb7942e2
Branch: refs/heads/WICKET-6563
Commit: cb7942e2a44b4afc5549e4bebc48dd7af9d5fdc6
Parents: 92b24c9
Author: Martin Tzvetanov Grigorov
Authored: Mon Oct 1 09:33:21 2018 +0300
Committer: Martin Tzvetanov Grigorov
Committed: Mon Oct 1 09:34:22 2018 +0300
--
wicket-cdi-1.1/pom.xml | 109
1 file changed, 109 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/cb7942e2/wicket-cdi-1.1/pom.xml
--
diff --git a/wicket-cdi-1.1/pom.xml b/wicket-cdi-1.1/pom.xml
deleted file mode 100644
index ead682d..000
--- a/wicket-cdi-1.1/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- 4.0.0
-
- org.apache.wicket
- wicket-parent
- 9.0.0-SNAPSHOT
- ../pom.xml
-
- wicket-cdi-1.1
- bundle
- Wicket CDI 1.1
-
- Provides integration between Wicket and CDI containers. Enables
injection of
- components and behaviors, as well as other non-contextual
object instances.
- Also enables propagation of conversations between wicket
artifacts such as pages
- and resources.
-
-
-
-
-
- javax.enterprise
- cdi-api
- 1.1
- provided
-
-
-
-
-
- javax.enterprise
- cdi-api
-
-
- org.apache.wicket
- wicket-core
-
-
- org.jboss.weld
- weld-core
-
-
- org.junit.jupiter
- junit-jupiter-engine
- test
-
-
- org.jboss.weld
- weld-spi
-
-
- org.junit.jupiter
- junit-jupiter-engine
- test
-
-
- org.junit.vintage
- junit-vintage-engine
- ${junit.version}
- test
-
-
- org.jboss.weld
- weld-spi
-
-
- org.jboss.weld.module
- weld-web
-
-
- org.jboss.weld.se
- weld-se
-
-
- org.jglue.cdi-unit
- cdi-unit
-
-
-
-
-
-
-
org.apache.maven.plugins
-
maven-enforcer-plugin
-
- true
-
-
-
-
-
-
[26/52] [abbrv] wicket git commit: Disable the linting of Javadocs when running with Java 11 (i.e. always)
Disable the linting of Javadocs when running with Java 11 (i.e. always) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b21ec2d4 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b21ec2d4 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b21ec2d4 Branch: refs/heads/WICKET-6563 Commit: b21ec2d4b57a1533b92b6c433a728682c90bc9de Parents: cbc2371 Author: Martin Tzvetanov Grigorov Authored: Tue Oct 2 09:12:54 2018 +0300 Committer: Martin Tzvetanov Grigorov Committed: Tue Oct 2 09:12:54 2018 +0300 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/b21ec2d4/pom.xml -- diff --git a/pom.xml b/pom.xml index 4ba492a..7e73de5 100644 --- a/pom.xml +++ b/pom.xml @@ -1253,9 +1253,9 @@ - Java 8 + Java 11 - 1.8 + 11
[46/52] [abbrv] wicket git commit: WICKET-6563 new IPageStore implementation
http://git-wip-us.apache.org/repos/asf/wicket/blob/c43d3a33/wicket-core/src/test/java/org/apache/wicket/pageStore/disk/PageWindowManagerTest.java
--
diff --git
a/wicket-core/src/test/java/org/apache/wicket/pageStore/disk/PageWindowManagerTest.java
b/wicket-core/src/test/java/org/apache/wicket/pageStore/disk/PageWindowManagerTest.java
new file mode 100644
index 000..714738c
--- /dev/null
+++
b/wicket-core/src/test/java/org/apache/wicket/pageStore/disk/PageWindowManagerTest.java
@@ -0,0 +1,306 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.pageStore.disk;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.security.SecureRandom;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.apache.wicket.pageStore.disk.PageWindowManager.FileWindow;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Test for {@link PageWindowManager}.
+ *
+ * @author Matej Knopp
+ */
+public class PageWindowManagerTest
+{
+ /**
+* https://issues.apache.org/jira/browse/WICKET-4572
+*/
+ @Test
+ void removeObsoleteIndices()
+ {
+ int page0id = 0,
+ page1id = 1,
+ page2id = 2;
+ int maxSize = 10;
+
+ PageWindowManager manager = new PageWindowManager(maxSize);
+
+ // Add few pages.
+ // All of them fully occupy the max space in the
pageWindowManager.
+ // So adding N+1st page removes the Nth page.
+ manager.createPageWindow(page0id, "foo", maxSize);
+ FileWindow page0Window = manager.getPageWindow(page0id);
+ assertWindow(page0Window, page0id,
page0Window.getFilePartOffset(), page0Window.getFilePartSize());
+
+ manager.createPageWindow(page1id, "foo", maxSize);
+ FileWindow page1Window = manager.getPageWindow(page1id);
+ assertWindow(page1Window, page1id,
page1Window.getFilePartOffset(), page1Window.getFilePartSize());
+
+ // Try to get a page which has been lost with the adding of
page1
+ assertNull(manager.getPageWindow(page0id), "Page0 must be lost
when Page1 has been added.");
+
+ manager.createPageWindow(page2id, "foo", maxSize);
+ FileWindow page2Window = manager.getPageWindow(page2id);
+ assertWindow(page2Window, page2id,
page2Window.getFilePartOffset(), page2Window.getFilePartSize());
+
+ // Try to get a page which has been lost with the adding of
page2
+ assertNull(manager.getPageWindow(page1id), "Page1 must be lost
when Page2 has been added.");
+ }
+
+ /**
+*
+*/
+ @Test
+ void addRemove()
+ {
+ PageWindowManager manager = new PageWindowManager(300);
+ FileWindow window;
+
+ window = manager.createPageWindow(1, "foo", 50);
+ assertWindow(window, 1, 0, 50);
+
+ window = manager.createPageWindow(2, "foo", 40);
+ assertWindow(window, 2, 50, 40);
+
+ assertEquals(manager.getTotalSize(), 90);
+
+ window = manager.createPageWindow(2, "foo", 30);
+ assertWindow(window, 2, 50, 30);
+ assertEquals(manager.getTotalSize(), 80);
+
+ manager.removePage(2);
+ assertEquals(manager.getTotalSize(), 50);
+
+ window = manager.createPageWindow(3, "foo", 30);
+ assertWindow(window, 3, 50, 30);
+ assertEquals(manager.getTotalSize(), 80);
+ }
+
+ /**
+*
+*/
+ @Test
+ public void pageWindowCycle()
+ {
+ PageWindowManager manager = new PageWindowManager(100);
+ FileWindow window;
+
+ window = manager.createPag
[11/52] [abbrv] wicket git commit: - wicket-arquilian / wicket-cdi-1.1 : Enable Junit Vintage Engine to run old Testrunners - BaseWicketTester.java: remove dependency on AssertionFailedException - glo
- wicket-arquilian / wicket-cdi-1.1 : Enable Junit Vintage Engine to run old
Testrunners
- BaseWicketTester.java: remove dependency on AssertionFailedException
- global: use AssertionError instead of AssertionFailedError
- updated Templates to use Junit 5 imports and classes
- remove opentest4j as a dependency of wicket-util again
- update cdi-unit to version 4.1.0 from 4.0.2
- Excluded Tests tagged with SLOW from surefire plugin
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4c6cb67e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4c6cb67e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4c6cb67e
Branch: refs/heads/WICKET-6563
Commit: 4c6cb67e5d625b58c6a1e16911103a8c11e45c87
Parents: 0465d2c
Author: renoth
Authored: Sat Sep 1 12:15:17 2018 +0200
Committer: Martin Tzvetanov Grigorov
Committed: Wed Sep 26 16:17:37 2018 +0300
--
testing/wicket-arquillian/pom.xml| 6 ++
.../deployment/AbstractDeploymentTest.java | 5 +++--
wicket-cdi-1.1/pom.xml | 19 +++
.../wicket/util/tester/BaseWicketTester.java | 4 ++--
.../apache/wicket/util/tester/WicketTester.java | 15 ++-
wicket-util/pom.xml | 6 --
.../license/AbstractLicenseHeaderHandler.java| 17 +++--
.../license/ApacheLicenseHeaderTestCase.java | 3 +--
.../util/license/CssLicenseHeaderHandler.java| 4 ++--
.../util/license/JavaLicenseHeaderHandler.java | 5 ++---
.../license/PropertiesLicenseHeaderHandler.java | 9 -
.../license/VelocityLicenseHeaderHandler.java| 9 -
.../util/license/XmlLicenseHeaderHandler.java| 12 ++--
.../util/license/XmlPrologHeaderHandler.java | 4 +---
14 files changed, 63 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/testing/wicket-arquillian/pom.xml
--
diff --git a/testing/wicket-arquillian/pom.xml
b/testing/wicket-arquillian/pom.xml
index 2190f5c..d093dff 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -144,6 +144,12 @@
${junit.version}
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ ${junit.version}
+ test
+
org.apache.wicket
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
--
diff --git
a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
index d5ad762..52b9014 100644
---
a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
+++
b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
@@ -58,8 +58,9 @@ import org.slf4j.LoggerFactory;
*
*/
@Tag(WicketTestTag.SLOW)
-public abstract class AbstractDeploymentTest {
-
+public abstract class AbstractDeploymentTest
+{
+
private static final Logger log =
LoggerFactory.getLogger(AbstractDeploymentTest.class);
private static final String WEBAPP_SRC = "src/main/webapp";
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-cdi-1.1/pom.xml
--
diff --git a/wicket-cdi-1.1/pom.xml b/wicket-cdi-1.1/pom.xml
index 6860248..ead682d 100644
--- a/wicket-cdi-1.1/pom.xml
+++ b/wicket-cdi-1.1/pom.xml
@@ -66,12 +66,23 @@
weld-spi
- org.jboss.weld.module
- weld-web
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+ ${junit.version}
+ test
- junit
- junit
+ org.jboss.weld
+ weld-spi
+
+
+ org.jboss.weld.module
+ weld-web
[24/52] [abbrv] wicket git commit: Cleanup the pom.xml of wicket-arquillian testing module.
Cleanup the pom.xml of wicket-arquillian testing module.
There were some duplicated dependencies after the merge of JUnit 5 upgrade PR
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/926bea99
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/926bea99
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/926bea99
Branch: refs/heads/WICKET-6563
Commit: 926bea99cfca9fbc3447fb5265860e61ab3a2d19
Parents: cb7942e
Author: Martin Tzvetanov Grigorov
Authored: Mon Oct 1 09:40:29 2018 +0300
Committer: Martin Tzvetanov Grigorov
Committed: Mon Oct 1 09:40:29 2018 +0300
--
testing/wicket-arquillian/pom.xml | 30 +-
1 file changed, 1 insertion(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/926bea99/testing/wicket-arquillian/pom.xml
--
diff --git a/testing/wicket-arquillian/pom.xml
b/testing/wicket-arquillian/pom.xml
index 350559d..06991e9 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -117,7 +117,6 @@
org.wildfly
wildfly-weld
- ${wildfly.version}
sun.jdk
@@ -128,8 +127,6 @@
org.wildfly.arquillian
wildfly-arquillian-container-embedded
- 2.1.0.Final
- test
@@ -141,14 +138,6 @@
org.junit.vintage
junit-vintage-engine
- ${junit.version}
- test
-
-
- org.junit.vintage
- junit-vintage-engine
- ${junit.version}
- test
@@ -166,30 +155,13 @@
org.opentest4j
opentest4j
1.1.0
- compile
+ test
org.jboss.shrinkwrap.resolver
shrinkwrap-resolver-impl-maven
-
- org.wildfly
- wildfly-weld
-
-
-org.junit.jupiter
-junit-jupiter-engine
-
-
- org.jboss.arquillian.junit
- arquillian-junit-container
- test
-
-
- org.wildfly.arquillian
-
wildfly-arquillian-container-embedded
-
[39/52] [abbrv] wicket git commit: Removed README documentation about wicket-cdi-1.1
Removed README documentation about wicket-cdi-1.1 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6bda62d6 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6bda62d6 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6bda62d6 Branch: refs/heads/WICKET-6563 Commit: 6bda62d632cff366e5e55d81f4f902bf6359f258 Parents: 578a91a Author: Andrea Del Bene Authored: Fri Oct 26 17:45:41 2018 +0200 Committer: Andrea Del Bene Committed: Fri Oct 26 17:45:41 2018 +0200 -- README.md | 11 +++ 1 file changed, 3 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/6bda62d6/README.md -- diff --git a/README.md b/README.md index 862685e..54f5082 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,6 @@ You will find the source code here: |-- wicket-auth-roles |-- wicket-bean-validation |-- wicket-cdi - |-- wicket-cdi-1.1 |-- wicket-core |-- wicket-devutils |-- wicket-eclipse-settings @@ -114,8 +113,6 @@ Here is a list of projects in this distribution and what they do. - wicket-bean-validation: validates beans with annotation based on javax.validation; - wicket-cdi: the context and dependency injection of the jee standard for wicket; - - wicket-cdi-1.1: the context and dependency injection of the jee standard 1.1 - for wicket; - wicket-devutils: some utils to help debugging wicket; - wicket-experimental: experimental implementations for wicket; - wicket-native-websocket: wicket's native web sockets integration @@ -173,11 +170,9 @@ the src/ folder. Google Guice (http://code.google.com/p/google-guice/) - - wicket-cdi / wicket-cdi-1.1: - Component Dependency Injection - (http://www.oracle.com/technetwork/articles/java/cdi-javaee-bien-225152.html - and - http://download.oracle.com/otndocs/jcp/cdi-1_1-pr-spec/index.html) + - wicket-cdi: + Component Dependency Injection 2.0 + (http://cdi-spec.org/) - wicket-examples:
[34/52] [abbrv] wicket git commit: Use maven-compiler-plugin 'release` setting
Use maven-compiler-plugin 'release` setting Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ebdeed50 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ebdeed50 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ebdeed50 Branch: refs/heads/WICKET-6563 Commit: ebdeed507a5daca4d045007c499130d17dcfc9f2 Parents: bce0add Author: Martin Tzvetanov Grigorov Authored: Thu Oct 18 16:48:08 2018 +0300 Committer: Martin Tzvetanov Grigorov Committed: Thu Oct 18 17:27:36 2018 +0300 -- pom.xml | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/ebdeed50/pom.xml -- diff --git a/pom.xml b/pom.xml index 46a8fa2..2213355 100644 --- a/pom.xml +++ b/pom.xml @@ -773,6 +773,9 @@ maven-compiler-plugin 3.8.0 true + + 11 + org.apache.maven.plugins
[21/52] [abbrv] wicket git commit: Change the groupId of the experimental modules to wicket9
Change the groupId of the experimental modules to wicket9 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7ea12f8a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7ea12f8a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7ea12f8a Branch: refs/heads/WICKET-6563 Commit: 7ea12f8ade07fb7415cc24c9e09822a250d06b04 Parents: 0dc8cfb Author: Martin Tzvetanov Grigorov Authored: Thu Sep 27 09:51:06 2018 +0300 Committer: Martin Tzvetanov Grigorov Committed: Thu Sep 27 09:51:06 2018 +0300 -- pom.xml | 10 +- wicket-experimental/pom.xml | 2 +- wicket-experimental/wicket-http2/pom.xml | 2 +- .../wicket-http2/wicket-http2-core/pom.xml| 2 +- .../wicket-http2/wicket-http2-jetty/pom.xml | 4 ++-- .../wicket-http2/wicket-http2-servlet4/pom.xml| 4 ++-- .../wicket-http2/wicket-http2-tomcat/pom.xml | 4 ++-- .../wicket-http2/wicket-http2-undertow/pom.xml| 4 ++-- wicket-experimental/wicket-metrics/pom.xml| 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/7ea12f8a/pom.xml -- diff --git a/pom.xml b/pom.xml index 7f0b4a1..4ba492a 100644 --- a/pom.xml +++ b/pom.xml @@ -376,31 +376,31 @@ jar - org.apache.wicket.experimental.wicket8 + org.apache.wicket.experimental.wicket9 wicket-http2-core 0.6-SNAPSHOT jar - org.apache.wicket.experimental.wicket8 + org.apache.wicket.experimental.wicket9 wicket-http2-jetty 0.6-SNAPSHOT jar - org.apache.wicket.experimental.wicket8 + org.apache.wicket.experimental.wicket9 wicket-http2-tomcat 0.6-SNAPSHOT jar - org.apache.wicket.experimental.wicket8 + org.apache.wicket.experimental.wicket9 wicket-http2-undertow 0.6-SNAPSHOT jar - org.apache.wicket.experimental.wicket8 + org.apache.wicket.experimental.wicket9 wicket-metrics 0.7-SNAPSHOT jar http://git-wip-us.apache.org/repos/asf/wicket/blob/7ea12f8a/wicket-experimental/pom.xml -- diff --git a/wicket-experimental/pom.xml b/wicket-experimental/pom.xml index 36c9587..3e89538 100644 --- a/wicket-experimental/pom.xml +++ b/wicket-experimental/pom.xml @@ -23,7 +23,7 @@ 9.0.0-SNAPSHOT ../pom.xml - org.apache.wicket.experimental.wicket8 + org.apache.wicket.experimental.wicket9 wicket-experimental pom Wicket-Experimental http://git-wip-us.apache.org/repos/asf/wicket/blob/7ea12f8a/wicket-experimental/wicket-http2/pom.xml -- diff --git a/wicket-experimental/wicket-http2/pom.xml b/wicket-experimental/wicket-http2/pom.xml index bcf15a9..be77b9b 100644 --- a/wicket-experimental/wicket-http2/pom.xml +++ b/wicket-experimental/wicket-http2/pom.xml @@ -18,7 +18,7 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 - org.apache.wicket.experimental.wicket8 + org.apache.wicket.experimental.wicket9 wicket-experimental 9.0.0-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/wicket/blob/7ea12f8a/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml -- diff --git a/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml b/wicket-experiment
[17/52] [abbrv] wicket git commit: Fix filtering of slow tests
Fix filtering of slow tests https://junit.org/junit5/docs/current/user-guide/#running-tests-build-maven-filter-tags Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e2ad8e93 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e2ad8e93 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e2ad8e93 Branch: refs/heads/WICKET-6563 Commit: e2ad8e93dc6a7815e7a7f57d77c169acef5b78fe Parents: 5dcf63d Author: Martin Tzvetanov Grigorov Authored: Wed Sep 26 17:02:02 2018 +0300 Committer: Martin Tzvetanov Grigorov Committed: Wed Sep 26 17:02:02 2018 +0300 -- pom.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/e2ad8e93/pom.xml -- diff --git a/pom.xml b/pom.xml index c5b5d9c..e205efe 100644 --- a/pom.xml +++ b/pom.xml @@ -992,9 +992,6 @@ **/*Test.java - - SLOW - --add-opens java.base/jdk.internal.loader=ALL-UNNAMED --add-modules=ALL-SYSTEM @@ -1206,7 +1203,7 @@ maven-surefire-plugin true - org.apache.wicket.util.WicketTestTag + SLOW
[13/52] [abbrv] wicket git commit: uncommented and migrated ConvertersTest.java
uncommented and migrated ConvertersTest.java
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d08641fa
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d08641fa
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d08641fa
Branch: refs/heads/WICKET-6563
Commit: d08641fae05a34f3263d0b6566729a06564aa099
Parents: 512c421
Author: renoth
Authored: Fri Sep 7 08:44:45 2018 +0200
Committer: Martin Tzvetanov Grigorov
Committed: Wed Sep 26 16:25:38 2018 +0300
--
.../apache/wicket/util/tester/WicketTester.java | 6 +-
.../util/convert/converters/ConvertersTest.java | 65
2 files changed, 43 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/d08641fa/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index 74bab6c..df096ae 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -598,8 +598,7 @@ public class WicketTester extends BaseWicketTester
final List renderedMessages =
model.getObject();
if (renderedMessages == null)
{
- fail(
- String.format("feedback panel at path [%s]
returned null messages", path));
+ fail(String.format("feedback panel at path [%s]
returned null messages", path));
}
if (messages.length != renderedMessages.size())
@@ -750,7 +749,8 @@ public class WicketTester extends BaseWicketTester
* @param expectedDocument
*expected output String
*/
- public void assertResultPage(final String expectedDocument) {
+ public void assertResultPage(final String expectedDocument)
+ {
// Validate the document
String document = getLastResponseAsString();
assertEquals(expectedDocument, document);
http://git-wip-us.apache.org/repos/asf/wicket/blob/d08641fa/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
--
diff --git
a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
index 35be426..ebca9ac 100644
---
a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
+++
b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
@@ -17,6 +17,10 @@
package org.apache.wicket.util.convert.converters;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import java.math.BigDecimal;
import java.text.ChoiceFormat;
import java.text.NumberFormat;
@@ -28,20 +32,27 @@ import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.convert.converter.*;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.wicket.util.convert.converter.BigDecimalConverter;
+import org.apache.wicket.util.convert.converter.BooleanConverter;
+import org.apache.wicket.util.convert.converter.ByteConverter;
+import org.apache.wicket.util.convert.converter.CalendarConverter;
+import org.apache.wicket.util.convert.converter.CharacterConverter;
+import org.apache.wicket.util.convert.converter.DateConverter;
+import org.apache.wicket.util.convert.converter.DoubleConverter;
+import org.apache.wicket.util.convert.converter.FloatConverter;
+import org.apache.wicket.util.convert.converter.IntegerConverter;
+import org.apache.wicket.util.convert.converter.LongConverter;
+import org.apache.wicket.util.convert.converter.ShortConverter;
+import org.junit.jupiter.api.Test;
@SuppressWarnings("javadoc")
-public final class ConvertersTest
+final class ConvertersTest
{
- /** Dutch locale for localized testing. **/
+ /** Dutch locale for localized testing. */
private static final Locale DUTCH_LOCALE = new Locale("nl", "NL");
@Test
- public void thousandSeperator()
- {
+ void thousandSeperator() {
BigDecimalCo
[19/52] [abbrv] wicket git commit: Remove the vendor. It doesn't fix the build and it is better to be without it.
Remove the vendor. It doesn't fix the build and it is better to be without it.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2e447eef
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2e447eef
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2e447eef
Branch: refs/heads/WICKET-6563
Commit: 2e447eef65133f5ecef9bc35836c14fca4e6ff68
Parents: dd2df9a
Author: Martin Tzvetanov Grigorov
Authored: Wed Sep 26 17:09:17 2018 +0300
Committer: Martin Tzvetanov Grigorov
Committed: Wed Sep 26 17:09:17 2018 +0300
--
pom.xml | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/2e447eef/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fc59134..e205efe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1015,7 +1015,6 @@
${maven.compiler.source}
-oracle
[15/52] [abbrv] wicket git commit: Update the OSGi Import-Package for JUnit 5
Update the OSGi Import-Package for JUnit 5 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5d97035e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5d97035e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5d97035e Branch: refs/heads/WICKET-6563 Commit: 5d97035e3225d3dbb59b1b72470c718784775b12 Parents: 4be82eb Author: Martin Tzvetanov Grigorov Authored: Wed Sep 26 16:48:19 2018 +0300 Committer: Martin Tzvetanov Grigorov Committed: Wed Sep 26 16:48:19 2018 +0300 -- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/5d97035e/pom.xml -- diff --git a/pom.xml b/pom.xml index c3275ac..bd8de55 100644 --- a/pom.xml +++ b/pom.xml @@ -753,8 +753,7 @@ * org.apache.wicket*, - org.junit*, - junit.framework* + org.junit.jupiter* * <_nouses>true
[14/52] [abbrv] wicket git commit: Re-order the dependencies
Re-order the dependencies Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4be82eb0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4be82eb0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4be82eb0 Branch: refs/heads/WICKET-6563 Commit: 4be82eb0cddf9c3f48cbd4be208dbf5de7813698 Parents: d08641f Author: Martin Tzvetanov Grigorov Authored: Wed Sep 26 16:38:16 2018 +0300 Committer: Martin Tzvetanov Grigorov Committed: Wed Sep 26 16:38:16 2018 +0300 -- wicket-core/pom.xml | 28 .../wicket-native-websocket-javax/pom.xml | 10 +++ 2 files changed, 10 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/4be82eb0/wicket-core/pom.xml -- diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml index faac57b..0ab47f9 100644 --- a/wicket-core/pom.xml +++ b/wicket-core/pom.xml @@ -51,21 +51,6 @@ openjson - org.assertj - assertj-core - test - - - org.junit.jupiter - junit-jupiter-params - test - - - org.hamcrest - java-hamcrest - test - - org.apache.wicket wicket-request @@ -78,14 +63,6 @@ jdk-serializable-functional - org.mockito - mockito-core - - - com.github.openjson - openjson - - com.google.guava guava test @@ -100,6 +77,11 @@ assertj-core + org.hamcrest + java-hamcrest + test + + org.junit.jupiter junit-jupiter-params http://git-wip-us.apache.org/repos/asf/wicket/blob/4be82eb0/wicket-native-websocket/wicket-native-websocket-javax/pom.xml -- diff --git a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml index ca24277..ef8cfa3 100644 --- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml +++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml @@ -38,11 +38,6 @@ javax.websocket-api - org.junit.jupiter - junit-jupiter-engine - test - - org.apache.wicket wicket-core @@ -62,5 +57,10 @@ org.eclipse.jetty.websocket javax-websocket-server-impl + + org.junit.jupiter + junit-jupiter-engine + test +
[32/52] [abbrv] wicket git commit: WICKET-6599: unwrap ResponseIOException before leaving WicketFilter
WICKET-6599: unwrap ResponseIOException before leaving WicketFilter
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b1247255
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b1247255
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b1247255
Branch: refs/heads/WICKET-6563
Commit: b1247255b12dd3736654bc32a59f54fcd01c0e2c
Parents: e749e61
Author: Emond Papegaaij
Authored: Thu Oct 18 13:40:11 2018 +0200
Committer: Emond Papegaaij
Committed: Thu Oct 18 14:22:49 2018 +0200
--
.../wicket/protocol/http/WicketFilter.java | 37
.../http/servlet/ResponseIOException.java | 5 ++
.../wicket/protocol/http/WicketFilterTest.java | 63
3 files changed, 93 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/b1247255/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
index 47d54cc..fb3ee46 100644
---
a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
+++
b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.ThreadContext;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.protocol.http.servlet.ResponseIOException;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
@@ -152,6 +153,7 @@ public class WicketFilter implements Filter
HttpServletRequest httpServletRequest =
(HttpServletRequest)request;
HttpServletResponse httpServletResponse =
(HttpServletResponse)response;
+ boolean ioExceptionOccurred = false;
try
{
if (previousClassLoader != newClassLoader)
@@ -212,18 +214,21 @@ public class WicketFilter implements Filter
redirectURL += "?" +
httpServletRequest.getQueryString();
}
- try
- {
- // send redirect - this will discard
POST parameters if the request is POST
- // - still better than getting an error
because of lacking trailing slash
-
httpServletResponse.sendRedirect(httpServletResponse.encodeRedirectURL(redirectURL));
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
+ // send redirect - this will discard POST
parameters if the request is POST
+ // - still better than getting an error because
of lacking trailing slash
+
httpServletResponse.sendRedirect(httpServletResponse.encodeRedirectURL(redirectURL));
}
}
+ catch (IOException e)
+ {
+ ioExceptionOccurred = true;
+ throw e;
+ }
+ catch (ResponseIOException e)
+ {
+ ioExceptionOccurred = true;
+ throw e.getCause();
+ }
finally
{
ThreadContext.restore(previousThreadContext);
@@ -233,9 +238,17 @@ public class WicketFilter implements Filter
Thread.currentThread().setContextClassLoader(previousClassLoader);
}
- if (response.isCommitted() &&
httpServletRequest.isAsyncStarted() == false)
+ if (!ioExceptionOccurred && response.isCommitted() &&
+ !httpServletRequest.isAsyncStarted())
{
- response.flushBuffer();
+ try
+ {
+ response.flushBuffer();
+ }
+ catch (ResponseIOException e)
+ {
+ throw e.getCause();
+ }
}
}
return res;
http://git-wip-us.apache.org/repos/asf/wi
[jira] [Commented] (WICKET-6563) Rework page and data storage
[ https://issues.apache.org/jira/browse/WICKET-6563?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16668669#comment-16668669 ] ASF subversion and git services commented on WICKET-6563: - Commit c43d3a338c591b86eedd294bb56ba122753385a6 in wicket's branch refs/heads/WICKET-6563 from [~svenmeier] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=c43d3a3 ] WICKET-6563 new IPageStore implementation > Rework page and data storage > > > Key: WICKET-6563 > URL: https://issues.apache.org/jira/browse/WICKET-6563 > Project: Wicket > Issue Type: Improvement > Components: wicket >Affects Versions: 9.0.0 >Reporter: Sven Meier >Assignee: Sven Meier >Priority: Minor > > IPageManager, IPageStore and IDataStore are riddled with complicated and > error-prone code aiming to do one simple thing: keeping pages around. > There are multiple problems with the current implementation: > * PageStoreManger does too much > ** it handles request and session storage > ** it contains workarounds for DiskDataStore, when the sessionId changes > * IPageStore/AbstractPageStore > ** has no access to IPageManagerContext > ** juggles with byte[], serialization and conversion > * IDataStore introduces an unncecessary third layer into the API > Additional or specialized stores are difficult to implement. > We should rework that. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (WICKET-6603) WicketTester.destroy sometimes hangs
[
https://issues.apache.org/jira/browse/WICKET-6603?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16668667#comment-16668667
]
ASF subversion and git services commented on WICKET-6603:
-
Commit 3398764a77a6bb92d4a8859c49280b8ede77a708 in wicket's branch
refs/heads/WICKET-6563 from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=3398764 ]
[WICKET-6603] Asypc page/data store destroyed without hanging
> WicketTester.destroy sometimes hangs
>
>
> Key: WICKET-6603
> URL: https://issues.apache.org/jira/browse/WICKET-6603
> Project: Wicket
> Issue Type: Bug
> Components: wicket-core
>Affects Versions: 8.1.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Critical
> Fix For: 8.2.0, 9.0.0
>
>
> Hi all,
> I'm experiencing some jetty-shutdown problems after upgrading from 7.9 to
> 8.1. See the stacktrace below.
> Is there a simple remedy for this? (or a known cause?) It is annoying
> because this error prevents Jetty from shutting down, and I use this in my
> tests, so my tests never end... :(
> Btw. I'm on java 10.0.2 and jetty version 9.2.5.v20141112
> {code:java}
> 2018-10-12 11:24:25,738 ERROR - AsynchronousDataStore -
> java.lang.InterruptedException
> at
> java.base/java.util.concurrent.locks.AbstractQueuedSynchronizer.acquireInterruptibly(AbstractQueuedSynchronizer.java:1259)
> at
> java.base/java.util.concurrent.locks.ReentrantLock.lockInterruptibly(ReentrantLock.java:317)
> at
> java.base/java.util.concurrent.LinkedBlockingQueue.offer(LinkedBlockingQueue.java:373)
> at
> org.apache.wicket.pageStore.AsynchronousDataStore.storeData(AsynchronousDataStore.java:207)
> at
> org.apache.wicket.pageStore.AbstractPageStore.storePageData(AbstractPageStore.java:119)
> at
> org.apache.wicket.pageStore.DefaultPageStore.storePage(DefaultPageStore.java:66)
> at
> org.apache.wicket.pageStore.AsynchronousPageStore$PageSavingRunnable.run(AsynchronousPageStore.java:225)
> at java.base/java.lang.Thread.run(Thread.java:844)
> {code}
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (WICKET-6605) Allow AjaxFallbackButton to be stateless
[ https://issues.apache.org/jira/browse/WICKET-6605?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16668668#comment-16668668 ] ASF subversion and git services commented on WICKET-6605: - Commit 08f6a531ac68261311c5de228048e3bc43e47814 in wicket's branch refs/heads/WICKET-6563 from [~bitstorm] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=08f6a53 ] WICKET-6605 Allow AjaxFallbackButton to be stateless > Allow AjaxFallbackButton to be stateless > - > > Key: WICKET-6605 > URL: https://issues.apache.org/jira/browse/WICKET-6605 > Project: Wicket > Issue Type: Improvement >Affects Versions: 7.10.0, 8.1.0 >Reporter: Andrea Del Bene >Assignee: Andrea Del Bene >Priority: Trivial > Fix For: 7.11.0, 8.2.0, 9.0.0 > > > The inner AjaxFormSubmitBehavior of AjaxFallbackButton does not delegate > getStatelessHint() to its component, making impossible for it to be stateless. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[03/52] [abbrv] wicket git commit: - wicket-arquilian / wicket-cdi-1.1 : Enable Junit Vintage Engine to run old Testrunners - BaseWicketTester.java: remove dependency on AssertionFailedException - glo
- wicket-arquilian / wicket-cdi-1.1 : Enable Junit Vintage Engine to run old Testrunners - BaseWicketTester.java: remove dependency on AssertionFailedException - global: use AssertionError instead of AssertionFailedError - updated Templates to use Junit 5 imports and classes - remove opentest4j as a dependency of wicket-util again - update cdi-unit to version 4.1.0 from 4.0.2 - Excluded Tests tagged with SLOW from surefire plugin Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0b48f270 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0b48f270 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0b48f270 Branch: refs/heads/WICKET-6563 Commit: 0b48f2703b0856e539045a486fd362077fe947a1 Parents: 872657b Author: renoth Authored: Sat Sep 1 12:15:17 2018 +0200 Committer: Martin Tzvetanov Grigorov Committed: Wed Sep 26 15:40:32 2018 +0300 -- .../src/test/java/TestHomePage.java | 6 +- pom.xml | 5 +- testing/wicket-arquillian/pom.xml | 6 + .../testing/ApacheLicenceHeaderTest.java| 12 +- .../testing/TestWicketJavaEEApplication.java| 17 +- .../deployment/AbstractDeploymentTest.java | 155 --- .../testing/pages/InsertContactTest.java| 56 ++- .../ArquillianContainerProvidedTest.java| 85 ++-- .../wicket/osgi/OsgiClashingPackagesTest.java | 85 ++-- .../org/apache/wicket/threadtest/App1Test.java | 2 +- .../org/apache/wicket/threadtest/App2Test.java | 2 +- .../authentication/panel/SignInPanelTest.java | 7 +- .../util/markup/xhtml/WellFormedXmlTest.java| 2 +- wicket-cdi/pom.xml | 6 + .../apache/wicket/cdi/CdiConfigurationTest.java | 11 +- .../org/apache/wicket/cdi/CdiWicketTester.java | 22 +- .../wicket/cdi/ConversationPropagatorTest.java | 5 +- .../apache/wicket/cdi/WicketCdiTestCase.java| 8 +- .../wicket/util/tester/BaseWicketTester.java| 433 ++- .../apache/wicket/util/tester/WicketTester.java | 28 +- .../test/java/org/apache/wicket/TesterTest.java | 4 +- .../handler/render/WebPageRendererTest.java | 4 +- .../inspector/SessionSizeModelTest.java | 7 +- .../stateless/StatelessCheckerTest.java | 16 +- .../util/markup/xhtml/WellFormedXmlTest.java| 2 +- .../wicket/examples/JettyTestCaseDecorator.java | 14 +- .../wicket/examples/WicketWebTestCase.java | 9 +- .../examples/ajax/prototype/AjaxTest.java | 4 +- .../wicket/examples/compref/ComprefTest.java| 10 +- .../wicket/examples/encodings/EncodingTest.java | 10 +- .../examples/forminput/FormInputTest.java | 2 +- .../examples/guestbook/GuestbookTest.java | 12 +- .../wicket/examples/hangman/HangManTest.java| 20 +- .../examples/hangman/WordGeneratorTest.java | 28 +- .../examples/helloworld/HelloWorldTest.java | 10 +- .../wicket/examples/images/ImagesTest.java | 13 +- .../wicket/examples/library/LibraryTest.java| 13 +- .../examples/linkomatic/LinkomaticTest.java | 2 +- .../wicket/examples/niceurl/NiceUrlTest.java| 13 +- .../wicket/examples/repeater/RepeaterTest.java | 2 +- .../wicket/examples/signin2/Signin2Test.java| 8 +- .../wicket/examples/template/TemplateTest.java | 5 +- .../wicket/filtertest/WithCPWithFPTest.java | 5 +- .../wicket/filtertest/WithCPWithoutFPTest.java | 4 +- .../wicket/filtertest/WithoutCPWithFPTest.java | 11 +- .../filtertest/WithoutCPWithoutFPTest.java | 11 +- .../util/markup/xhtml/WellFormedXmlTest.java| 2 +- .../ajax/markup/html/AjaxEditableTest.java | 13 +- .../ajax/markup/html/AjaxLazyLoadPanelTest.java | 2 +- .../html/autocomplete/AutoCompleteTest.java | 4 +- .../html/AjaxLazyLoadPanelTesterTest.java | 4 +- .../html/basic/DefaultLinkParserTest.java | 19 +- .../html/captcha/CaptchaImageResourceTest.java | 20 +- .../markup/html/form/DateTextFieldTest.java | 31 +- .../html/form/datetime/DateTimeFieldTest.java | 9 +- .../form/datetime/LocalDateTextFieldTest.java | 5 +- .../html/form/datetime/TimeFieldTest.java | 6 +- .../datetime/ZonedToLocalDateTimeModelTest.java | 4 +- .../markup/html/form/palette/PaletteTest.java | 5 +- .../markup/html/form/select/SelectTest.java | 13 +- .../resource/ThumbnailImageResourceTest.java| 5 +- .../html/repeater/data/table/DataTableTest.java | 34 +- .../data/table/export/CSVDataExporterTest.java | 8 +- .../data/table/filter/FilterFormTest.java | 2 +- .../repeater/tree/table/NodeBorderTest.java | 2 +- .../html/repeater/tree/table/NodeModelTest.java | 22 +- .../tree/table/TreeDataProviderTest.java| 8 +- .../html/repeater/util/ProviderSubsetTest.java | 10 +- .../repeater/util/TreeMo
[04/52] [abbrv] wicket git commit: - upgrade junit4 with junit5 in wicket-util - replace Junit4 Methods in WicketTester.java - remove junit 4 dependencies in pom.xml
- upgrade junit4 with junit5 in wicket-util
- replace Junit4 Methods in WicketTester.java
- remove junit 4 dependencies in pom.xml
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/51725af8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/51725af8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/51725af8
Branch: refs/heads/WICKET-6563
Commit: 51725af8cf2d566e9fe69f76152cfc36ce222c71
Parents: 0b48f27
Author: renoth
Authored: Tue Jul 31 12:32:49 2018 +0200
Committer: Martin Tzvetanov Grigorov
Committed: Wed Sep 26 15:51:32 2018 +0300
--
.../apache/wicket/util/tester/WicketTester.java | 135
wicket-util/pom.xml | 6 +
.../license/AbstractLicenseHeaderHandler.java | 17 +-
.../license/ApacheLicenseHeaderTestCase.java| 12 +-
.../util/license/CssLicenseHeaderHandler.java | 3 +-
.../util/license/JavaLicenseHeaderHandler.java | 5 +-
.../license/PropertiesLicenseHeaderHandler.java | 9 +-
.../license/VelocityLicenseHeaderHandler.java | 9 +-
.../util/license/XmlLicenseHeaderHandler.java | 14 +-
.../util/license/XmlPrologHeaderHandler.java| 118 +++
.../markup/xhtml/WellFormedXmlTestCase.java | 325 +--
.../wicket/util/collections/IntHashMapTest.java | 3 +-
12 files changed, 336 insertions(+), 320 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/51725af8/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index dc352b6..e4e08df 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -51,6 +51,7 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
+import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -283,13 +284,15 @@ public class WicketTester extends BaseWicketTester
{
if (null != getLastResponse().getHeader("Location"))
{
- fail("Location header should *not* be present when
using Ajax");
+ throw new AssertionFailedError(
+ "Location header should *not* be present when
using Ajax");
}
String ajaxLocation =
getLastResponse().getHeader("Ajax-Location");
if (null == ajaxLocation)
{
- fail("Ajax-Location header should be present when using
Ajax");
+ throw new AssertionFailedError(
+ "Ajax-Location header should be present when
using Ajax");
}
int statusCode = getLastResponse().getStatus();
@@ -313,6 +316,18 @@ public class WicketTester extends BaseWicketTester
}
/**
+*
+* @param result
+*/
+ private void assertResult(Result result)
+ {
+ if (result.wasFailed())
+ {
+ throw new AssertionFailedError(result.getMessage());
+ }
+ }
+
+ /**
* Asserts that the Component a the given path has a
behavior of the given type.
*
* @param path
@@ -340,13 +355,13 @@ public class WicketTester extends BaseWicketTester
* tree, using JavaScript. But it shouldn't be needed because you just
have to trust that Wicket
* Ajax JavaScript works.
*
-* @param component
-*a Component to be tested
+* @param componentPath
+*a Component path to test
*/
- public void assertComponentOnAjaxResponse(Component component)
+ public void assertComponentOnAjaxResponse(String componentPath)
{
- Result result = isComponentOnAjaxResponse(component);
- assertResult(result);
+ Component component =
getComponentFromLastRenderedPage(componentPath, false);
+ assertComponentOnAjaxResponse(component);
}
/**
@@ -358,13 +373,13 @@ public class WicketTester extends BaseWicketTester
* tree, using JavaScript. But it shouldn't be needed because you just
have to trust that Wicket
* Ajax JavaScript works.
*
-* @param componentPath
-*a Component path to test
+* @param compo
[jira] [Commented] (WICKET-6559) Encrypted page store
[ https://issues.apache.org/jira/browse/WICKET-6559?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16668670#comment-16668670 ] ASF subversion and git services commented on WICKET-6559: - Commit bf72e27980070572b57c8ad0130c83a7d024aa0f in wicket's branch refs/heads/WICKET-6563 from [~svenmeier] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=bf72e27 ] WICKET-6559 new encrypting page store > Encrypted page store > > > Key: WICKET-6559 > URL: https://issues.apache.org/jira/browse/WICKET-6559 > Project: Wicket > Issue Type: New Feature > Components: wicket >Reporter: Emond Papegaaij >Priority: Major > > To make it virtually impossible to tamper with any serialized data on disk, > Wicket should encrypt the data with a key bound to the user session. This > also prevents accidental leakage of sensitive data (such as passwords) via > serialized form contents. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[52/52] [abbrv] wicket git commit: WICKET-6559 new encrypting page store
WICKET-6559 new encrypting page store
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bf72e279
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bf72e279
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bf72e279
Branch: refs/heads/WICKET-6563
Commit: bf72e27980070572b57c8ad0130c83a7d024aa0f
Parents: c43d3a3
Author: Sven Meier
Authored: Tue Oct 30 09:13:41 2018 +0100
Committer: Sven Meier
Committed: Tue Oct 30 13:56:24 2018 +0100
--
.../wicket/DefaultPageManagerProvider.java | 11 +-
.../wicket/pageStore/CryptingPageStore.java | 146 +++
.../wicket/pageStore/crypt/DefaultCrypter.java | 108 ++
.../apache/wicket/pageStore/crypt/ICrypter.java | 28
.../apache/wicket/settings/StoreSettings.java | 17 ++-
.../wicket/pageStore/CryptingPageStoreTest.java | 87 +++
6 files changed, 393 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/bf72e279/wicket-core/src/main/java/org/apache/wicket/DefaultPageManagerProvider.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/DefaultPageManagerProvider.java
b/wicket-core/src/main/java/org/apache/wicket/DefaultPageManagerProvider.java
index cf4f84a..36c1fac 100644
---
a/wicket-core/src/main/java/org/apache/wicket/DefaultPageManagerProvider.java
+++
b/wicket-core/src/main/java/org/apache/wicket/DefaultPageManagerProvider.java
@@ -21,6 +21,7 @@ import java.io.File;
import org.apache.wicket.page.IPageManager;
import org.apache.wicket.page.PageManager;
import org.apache.wicket.pageStore.AsynchronousPageStore;
+import org.apache.wicket.pageStore.CryptingPageStore;
import org.apache.wicket.pageStore.DiskPageStore;
import org.apache.wicket.pageStore.FilePageStore;
import org.apache.wicket.pageStore.GroupingPageStore;
@@ -41,8 +42,8 @@ import org.apache.wicket.util.lang.Bytes;
*
* {@link RequestPageStore} caching pages until end of the request
* {@link InSessionPageStore} keeping the last accessed page in the
session
- * {@link AsynchronousPageStore} moving storage of pages to a worker
thread (if enabled in
- * {@link StoreSettings#isAsynchronous()})
+ * {@link AsynchronousPageStore} moving storage of pages to a worker
thread (if enabled in {@link StoreSettings#isAsynchronous()})
+ * {@link CryptingPageStore} encrypting all pages (if enabled in {@link
StoreSettings#isEncrypted()})
* {@link DiskPageStore} keeping all pages, configured according to {@link
StoreSettings}
*
* An alternative chain with all pages held in-memory could be:
@@ -166,6 +167,10 @@ public class DefaultPageManagerProvider implements
IPageManagerProvider
Bytes maxSizePerSession = storeSettings.getMaxSizePerSession();
File fileStoreFolder = storeSettings.getFileStoreFolder();
- return new DiskPageStore(application.getName(),
fileStoreFolder, maxSizePerSession, getSerializer());
+ if (storeSettings.isEncrypted()) {
+ return new SerializingPageStore(new
CryptingPageStore(new DiskPageStore(application.getName(), fileStoreFolder,
maxSizePerSession)), getSerializer());
+ } else {
+ return new DiskPageStore(application.getName(),
fileStoreFolder, maxSizePerSession, getSerializer());
+ }
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bf72e279/wicket-core/src/main/java/org/apache/wicket/pageStore/CryptingPageStore.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/pageStore/CryptingPageStore.java
b/wicket-core/src/main/java/org/apache/wicket/pageStore/CryptingPageStore.java
new file mode 100644
index 000..2b27e80
--- /dev/null
+++
b/wicket-core/src/main/java/org/apache/wicket/pageStore/CryptingPageStore.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.pa
[36/52] [abbrv] wicket git commit: WICKET-6601 dont stop event on mouse down
WICKET-6601 dont stop event on mouse down
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6053b687
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6053b687
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6053b687
Branch: refs/heads/WICKET-6563
Commit: 6053b687940b3e5ec5b3410c77c420c305a9d616
Parents: 804f510
Author: Sven Meier
Authored: Tue Oct 23 12:55:17 2018 +0200
Committer: Sven Meier
Committed: Tue Oct 23 12:56:31 2018 +0200
--
.../main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js | 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/6053b687/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index 2f0561f..7404cd3 100644
---
a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++
b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@ -2324,8 +2324,6 @@
return;
}
- Wicket.Event.stop(e);
-
if (e.preventDefault) {
e.preventDefault();
}
[29/52] [abbrv] wicket git commit: WICKET-5552 allow prevention of drags
WICKET-5552 allow prevention of drags
used by ModalWindow to prevent dragging on window content
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ace845c4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ace845c4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ace845c4
Branch: refs/heads/WICKET-6563
Commit: ace845c412d6ea3117c6f366d9bd91b06c6270da
Parents: 6ee5313
Author: Sven Meier
Authored: Mon Oct 15 23:15:06 2018 +0200
Committer: Sven Meier
Committed: Mon Oct 15 23:31:07 2018 +0200
--
.../wicket/ajax/res/js/wicket-ajax-jquery.js| 25 +---
.../ajax/markup/html/modal/res/modal.js | 11 +++--
2 files changed, 25 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/ace845c4/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index 5f64c0b..2f0561f 100644
---
a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++
b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@ -2279,13 +2279,18 @@
Drag: {
/**
-* Initializes the dragging on the specified element.
-* Element's onmousedown will be replaced by generated
handler.
-*
-* @param {Element} element - element clicking on which
the drag should begin
-* @param {Function} onDragBegin - handler called at
the begin on dragging - passed element as first parameter
-* @param {Function} onDragEnd - handler called at the
end of dragging - passed element as first parameter
-* @param {Function} onDrag - handler called during
dragging - passed element and mouse deltas
+* Initializes dragging on the specified element.
+*
+* @param element {Element}
+*element clicking on which
+*the drag should begin
+* @param onDragBegin {Function}
+*called at the begin of dragging - passed
element and event as parameters,
+*may return false to prevent the start
+* @param onDragEnd {Function}
+*handler called at the end of dragging -
passed element as parameter
+* @param onDrag {Function}
+*handler called during dragging - passed
element and mouse deltas as parameters
*/
init: function(element, onDragBegin, onDragEnd, onDrag)
{
@@ -2315,14 +2320,16 @@
var element = this;
+ if (element.wicketOnDragBegin(element, e) ===
false) {
+ return;
+ }
+
Wicket.Event.stop(e);
if (e.preventDefault) {
e.preventDefault();
}
- element.wicketOnDragBegin(element);
-
element.lastMouseX = e.clientX;
element.lastMouseY = e.clientY;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ace845c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
--
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
index b00ceec..6bcebf2 100644
---
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
+++
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
@@ -901,11 +901,18 @@
/**
* Called when dragging has started.
*/
- onBegin: function(object) {
+ onBegin: function(element, event) {
+ // ignore anything inside the content
+ if (jQuery(event.target).closest('.w_content').size()) {
+ return false;
+ }
[40/52] [abbrv] wicket git commit: [WICKET-6603] Asypc page/data store destroyed without hanging
[WICKET-6603] Asypc page/data store destroyed without hanging
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3398764a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3398764a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3398764a
Branch: refs/heads/WICKET-6563
Commit: 3398764a77a6bb92d4a8859c49280b8ede77a708
Parents: 6bda62d
Author: Maxim Solodovnik
Authored: Fri Oct 26 22:56:06 2018 +0700
Committer: Maxim Solodovnik
Committed: Fri Oct 26 22:56:06 2018 +0700
--
.../wicket/pageStore/AsynchronousDataStore.java | 61 ---
.../wicket/pageStore/AsynchronousPageStore.java | 62
2 files changed, 52 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/3398764a/wicket-core/src/main/java/org/apache/wicket/pageStore/AsynchronousDataStore.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/pageStore/AsynchronousDataStore.java
b/wicket-core/src/main/java/org/apache/wicket/pageStore/AsynchronousDataStore.java
index 7c46a7a..f749354 100644
---
a/wicket-core/src/main/java/org/apache/wicket/pageStore/AsynchronousDataStore.java
+++
b/wicket-core/src/main/java/org/apache/wicket/pageStore/AsynchronousDataStore.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
* It starts only one instance of {@link PageSavingRunnable} because all we
need is to make the page
* storing asynchronous. We don't want to write concurrently in the wrapped
{@link IDataStore},
* though it may happen in the extreme case when the queue is full. These
cases should be avoided.
- *
+ *
* @author Matej Knopp
*/
public class AsynchronousDataStore implements IDataStore
@@ -59,7 +59,7 @@ public class AsynchronousDataStore implements IDataStore
/**
* The page saving thread.
*/
- private final Thread pageSavingThread;
+ private Thread pageSavingThread;
/**
* The wrapped {@link IDataStore} that actually stores that pages
@@ -79,7 +79,7 @@ public class AsynchronousDataStore implements IDataStore
/**
* Construct.
-*
+*
* @param dataStore
*the wrapped {@link IDataStore} that actually saved the
data
* @param capacity
@@ -91,8 +91,7 @@ public class AsynchronousDataStore implements IDataStore
entries = new LinkedBlockingQueue<>(capacity);
entryMap = new ConcurrentHashMap<>();
- PageSavingRunnable savingRunnable = new
PageSavingRunnable(dataStore, entries, entryMap);
- pageSavingThread = new Thread(savingRunnable,
"Wicket-AsyncDataStore-PageSavingThread");
+ pageSavingThread = new Thread(new PageSavingRunnable(),
"Wicket-AsyncDataStore-PageSavingThread");
pageSavingThread.setDaemon(true);
pageSavingThread.start();
}
@@ -100,12 +99,13 @@ public class AsynchronousDataStore implements IDataStore
@Override
public void destroy()
{
- if (pageSavingThread.isAlive())
+ final Thread thread = pageSavingThread;
+ pageSavingThread = null;
+ if (thread != null && thread.isAlive())
{
- pageSavingThread.interrupt();
try
{
- pageSavingThread.join();
+ thread.join();
} catch (InterruptedException e)
{
log.error(e.getMessage(), e);
@@ -117,7 +117,7 @@ public class AsynchronousDataStore implements IDataStore
/**
* Little helper
-*
+*
* @param sessionId
* @param id
* @return Entry
@@ -192,12 +192,16 @@ public class AsynchronousDataStore implements IDataStore
/**
* Save the entry in the queue if there is a room or directly pass it
to the wrapped
* {@link IDataStore} if there is no such
-*
+*
* @see
org.apache.wicket.pageStore.IDataStore#storeData(java.lang.String, int, byte[])
*/
@Override
public void storeData(final String sessionId, final int id, final
byte[] data)
{
+ if (pageSavingThread == null)
+ {
+ return;
+ }
Entry entry = new Entry(sessionId, id, data);
String key = getKey(entry);
entryMap.put(key, entry);
@@ -216,13 +220,16 @@ public class AsynchronousDataStore implements IDataStore
catch (InterruptedException e)
{
[41/52] [abbrv] wicket git commit: Bump Guava to 27.0
Bump Guava to 27.0 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/00a1f4e0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/00a1f4e0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/00a1f4e0 Branch: refs/heads/WICKET-6563 Commit: 00a1f4e005fca77af9867a4c45830279d4f86068 Parents: 3398764 Author: Martin Tzvetanov Grigorov Authored: Fri Oct 19 22:46:17 2018 +0300 Committer: Martin Tzvetanov Grigorov Committed: Mon Oct 29 10:08:02 2018 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/00a1f4e0/pom.xml -- diff --git a/pom.xml b/pom.xml index efc943d..f1a1326 100644 --- a/pom.xml +++ b/pom.xml @@ -211,7 +211,7 @@ com.google.guava guava - 26.0-jre + 27.0-jre com.google.inject
[09/52] [abbrv] wicket git commit: updated pom.xml with new junit dependency
updated pom.xml with new junit dependency
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0465d2c0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0465d2c0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0465d2c0
Branch: refs/heads/WICKET-6563
Commit: 0465d2c01df6f3b20069b77d863d27e43f9d2911
Parents: 694ee32
Author: renoth
Authored: Sat Sep 1 07:52:38 2018 +0200
Committer: Martin Tzvetanov Grigorov
Committed: Wed Sep 26 16:14:30 2018 +0300
--
testing/wicket-arquillian/pom.xml | 8 +-
.../deployment/AbstractDeploymentTest.java | 5 +-
wicket-cdi-1.1/pom.xml | 98
3 files changed, 104 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/0465d2c0/testing/wicket-arquillian/pom.xml
--
diff --git a/testing/wicket-arquillian/pom.xml
b/testing/wicket-arquillian/pom.xml
index 13023a6..2190f5c 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -164,10 +164,10 @@
org.wildfly
wildfly-weld
-
- junit
- junit
-
+
+org.junit.jupiter
+junit-jupiter-engine
+
org.jboss.arquillian.junit
arquillian-junit-container
http://git-wip-us.apache.org/repos/asf/wicket/blob/0465d2c0/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
--
diff --git
a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
index 52b9014..d5ad762 100644
---
a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
+++
b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
@@ -58,9 +58,8 @@ import org.slf4j.LoggerFactory;
*
*/
@Tag(WicketTestTag.SLOW)
-public abstract class AbstractDeploymentTest
-{
-
+public abstract class AbstractDeploymentTest {
+
private static final Logger log =
LoggerFactory.getLogger(AbstractDeploymentTest.class);
private static final String WEBAPP_SRC = "src/main/webapp";
http://git-wip-us.apache.org/repos/asf/wicket/blob/0465d2c0/wicket-cdi-1.1/pom.xml
--
diff --git a/wicket-cdi-1.1/pom.xml b/wicket-cdi-1.1/pom.xml
new file mode 100644
index 000..6860248
--- /dev/null
+++ b/wicket-cdi-1.1/pom.xml
@@ -0,0 +1,98 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ 4.0.0
+
+ org.apache.wicket
+ wicket-parent
+ 9.0.0-SNAPSHOT
+ ../pom.xml
+
+ wicket-cdi-1.1
+ bundle
+ Wicket CDI 1.1
+
+ Provides integration between Wicket and CDI containers. Enables
injection of
+ components and behaviors, as well as other non-contextual
object instances.
+ Also enables propagation of conversations between wicket
artifacts such as pages
+ and resources.
+
+
+
+
+
+ javax.enterprise
+ cdi-api
+ 1.1
+ provided
+
+
+
+
+
+ javax.enterprise
+ cdi-api
+
+
+ org.apache.wicket
+ wicket-core
+
+
+ org.jboss.weld
+ weld-core
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
+
+
+ org.jboss.weld
+ weld-spi
+
+
+ org.jboss.weld.module
+ weld-web
+
+
+ junit
+ junit
+
+
+ org.jboss.weld.se
+ w
[37/52] [abbrv] wicket git commit: Fix raw FormComponent raw type warning.
Fix raw FormComponent raw type warning.
this closes #299
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/52530126
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/52530126
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/52530126
Branch: refs/heads/WICKET-6563
Commit: 52530126c1d2aed0b14d0b81b781a5d96351f0a6
Parents: 6053b68
Author: Jezza
Authored: Tue Oct 16 23:58:17 2018 +0200
Committer: Sven Meier
Committed: Tue Oct 23 13:25:20 2018 +0200
--
.../org/apache/wicket/util/tester/BaseWicketTester.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/52530126/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index 313cb2d..d4de9f6 100644
---
a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++
b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -1697,15 +1697,15 @@ public class BaseWicketTester
return component;
}
- private FormComponent assertFormComponent(final String path)
+ private FormComponent assertFormComponent(final String path)
{
Component component = assertExists(path);
- if (component instanceof FormComponent == false)
+ if (component instanceof FormComponent == false)
{
fail("path: '" + path + "' is not a form component");
}
- return (FormComponent)component;
+ return (FormComponent)component;
}
/**
@@ -1717,7 +1717,7 @@ public class BaseWicketTester
*/
public Result isRequired(String path)
{
- FormComponent formComponent = assertFormComponent(path);
+ FormComponent formComponent = assertFormComponent(path);
return isRequired(formComponent);
}
@@ -1743,7 +1743,7 @@ public class BaseWicketTester
*/
public Result isNotRequired(String path)
{
- FormComponent formComponent = assertFormComponent(path);
+ FormComponent formComponent = assertFormComponent(path);
return isNotRequired(formComponent);
}
[28/52] [abbrv] wicket git commit: WICKET-6586 Broken JavaScript due to fix charsetName in JavaScriptPackageResource
WICKET-6586 Broken JavaScript due to fix charsetName in
JavaScriptPackageResource
Introduce PackageResource#getProcessingEncoding() that could be overridden by
the application to use a custom encoding to read a resource from the class path.
Move the compressing logic from Css/JavaScript-PackageResource to
PackageResource class to DRY it.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/072b2fc7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/072b2fc7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/072b2fc7
Branch: refs/heads/WICKET-6563
Commit: 072b2fc7fd521ec07e40fc5af16b75db47694b33
Parents: 6ee5313
Author: Martin Tzvetanov Grigorov
Authored: Fri Oct 12 09:58:04 2018 +0300
Committer: Martin Tzvetanov Grigorov
Committed: Fri Oct 12 09:58:04 2018 +0300
--
.../request/resource/CssPackageResource.java| 49 +--
.../resource/JavaScriptPackageResource.java | 49 +--
.../request/resource/PackageResource.java | 92 +++-
3 files changed, 93 insertions(+), 97 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b2fc7/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java
b/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java
index fd48eb8..d1d2ba7 100644
---
a/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java
+++
b/wicket-core/src/main/java/org/apache/wicket/request/resource/CssPackageResource.java
@@ -22,9 +22,6 @@ import java.util.Locale;
import org.apache.wicket.Application;
import org.apache.wicket.css.ICssCompressor;
-import org.apache.wicket.resource.IScopeAwareTextResourceProcessor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Package resource for css files. It strips comments and whitespace from css.
@@ -33,10 +30,6 @@ public class CssPackageResource extends PackageResource
{
private static final long serialVersionUID = 1L;
- private static final Logger log =
LoggerFactory.getLogger(CssPackageResource.class);
-
- private final String name;
-
/**
* Construct.
*
@@ -57,54 +50,14 @@ public class CssPackageResource extends PackageResource
{
super(scope, name, locale, style, variation);
- this.name = name;
-
// CSS resources can be compressed if there is configured
ICssCompressor, and the
// resource isn't already minified (the file already has .min.
in its name).
setCompress(!name.contains(MIN_POSTFIX_DEFAULT_AS_EXTENSION));
}
- @Override
- protected byte[] processResponse(final Attributes attributes, final
byte[] bytes)
- {
- final byte[] processedResponse =
super.processResponse(attributes, bytes);
-
- ICssCompressor compressor = getCompressor();
-
- if (compressor != null && getCompress())
- {
- try
- {
- String charsetName = "UTF-8";
- String nonCompressed = new
String(processedResponse, charsetName);
- String output;
- if (compressor instanceof
IScopeAwareTextResourceProcessor)
- {
- IScopeAwareTextResourceProcessor
scopeAwareProcessor = (IScopeAwareTextResourceProcessor) compressor;
- output =
scopeAwareProcessor.process(nonCompressed, getScope(), name);
- }
- else
- {
- output =
compressor.compress(nonCompressed);
- }
- return output.getBytes(charsetName);
- }
- catch (Exception e)
- {
- log.error("Error while filtering content", e);
- return processedResponse;
- }
- }
- else
- {
- // don't strip the comments
- return processedResponse;
- }
- }
-
/**
* Gets the {@link ICssCompressor} to be used. By default returns the
configured compressor on
-* application level, but can be overriden by the user application to
provide compressor
+* application level, bu
[01/52] [abbrv] wicket git commit: - wicket-arquilian / wicket-cdi-1.1 : Enable Junit Vintage Engine to run old Testrunners - BaseWicketTester.java: remove dependency on AssertionFailedException - glo
Repository: wicket
Updated Branches:
refs/heads/WICKET-6563 e49d95df2 -> bf72e2798 (forced update)
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java
--
diff --git
a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java
b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java
index 04988dd..96cd2ab 100644
---
a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java
+++
b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java
@@ -16,11 +16,13 @@
*/
package org.apache.wicket.guice;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import javax.inject.Inject;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
-import org.junit.Assert;
/**
* A behavior that will be use injected services
@@ -40,8 +42,8 @@ public class JavaxInjectTestBehavior extends Behavior
{
super.bind(component);
- Assert.assertNotNull(injectedFieldBlue);
- Assert.assertEquals("blue", injectedFieldBlue.getString());
+ assertNotNull(injectedFieldBlue);
+ assertEquals("blue", injectedFieldBlue.getString());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java
--
diff --git
a/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java
b/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java
index 603534b..08c8b71 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java
@@ -16,10 +16,13 @@
*/
package org.apache.wicket.guice;
-import com.google.inject.Inject;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
-import org.junit.Assert;
+
+import com.google.inject.Inject;
/**
* A behavior that will be use injected services
@@ -39,8 +42,8 @@ public class TestBehavior extends Behavior
{
super.bind(component);
- Assert.assertNotNull(injectedFieldBlue);
- Assert.assertEquals("blue", injectedFieldBlue.getString());
+ assertNotNull(injectedFieldBlue);
+ assertEquals("blue", injectedFieldBlue.getString());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-util/pom.xml
--
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index 6f71806..d5777f8 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -44,11 +44,5 @@
org.apache.commons
commons-collections4
-
- org.opentest4j
- opentest4j
- RELEASE
- compile
-
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
--
diff --git
a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
index cbbc934..c6e5685 100644
---
a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
+++
b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
@@ -16,12 +16,17 @@
*/
package org.apache.wicket.util.license;
-import java.io.*;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
import java.util.List;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.string.Strings;
-import org.opentest4j.AssertionFailedError;
+
abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
{
@@ -76,7 +81,7 @@ abstract class AbstractLicenseHeaderHandler implements
ILicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
finally
{
@@ -86,7 +91,7 @@ abstract class AbstractLicenseHeaderHandler implemen
[12/52] [abbrv] wicket git commit: - merge with master - codereview issues fixed
- merge with master
- codereview issues fixed
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/512c4216
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/512c4216
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/512c4216
Branch: refs/heads/WICKET-6563
Commit: 512c4216689a72931f101f7e59b81ab1ccc37b11
Parents: ce3c7c7
Author: renoth
Authored: Fri Sep 7 07:55:44 2018 +0200
Committer: Martin Tzvetanov Grigorov
Committed: Wed Sep 26 16:18:00 2018 +0300
--
pom.xml | 36 ++--
testing/wicket-common-tests/pom.xml | 10 +++---
wicket-bean-validation/pom.xml | 9 +++--
wicket-core/pom.xml | 19 +++
.../apache/wicket/util/tester/WicketTester.java | 5 +--
.../wicket-native-websocket-core/pom.xml| 1 -
wicket-util/pom.xml | 10 +++---
.../markup/xhtml/WellFormedXmlTestCase.java | 20 ++-
8 files changed, 60 insertions(+), 50 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/512c4216/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 7e74e89..c3275ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -495,30 +495,12 @@
- org.junit.jupiter
- junit-jupiter-engine
- ${junit.version}
- test
-
-
- org.junit.jupiter
- junit-jupiter-params
- ${junit.version}
- test
-
-
org.assertj
assertj-core
3.11.0
test
- org.hamcrest
- java-hamcrest
- 2.0.0.0
- test
-
-
org.eclipse.jetty
jetty-jmx
${jetty.version}
@@ -573,6 +555,24 @@
test
+ org.junit.jupiter
+ junit-jupiter-engine
+ ${junit.version}
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-params
+ ${junit.version}
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+ ${junit.version}
+ test
+
+
org.mockito
mockito-core
${mockito.version}
http://git-wip-us.apache.org/repos/asf/wicket/blob/512c4216/testing/wicket-common-tests/pom.xml
--
diff --git a/testing/wicket-common-tests/pom.xml
b/testing/wicket-common-tests/pom.xml
index ecb8402..adbfd7e 100644
--- a/testing/wicket-common-tests/pom.xml
+++ b/testing/wicket-common-tests/pom.xml
@@ -34,11 +34,6 @@
- org.junit.jupiter
- junit-jupiter-engine
- test
-
-
org.apache.wicket
wicket-auth-roles
test
@@ -109,6 +104,11 @@
wicket-velocity
test
+
+ junit-jupiter-engine
+ org.junit.jupiter
+ test
+
http://git-wip-us.apache.org/repos/asf/wicket/blob/512c4216/wicket-bean-validation/pom.xml
--
diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml
index f1240cd..99e6376 100644
--- a/wicket-bean-validation/pom.xml
+++ b/wicket-bean-validation/pom.xml
@@ -25,11 +25,6 @@
wicket-core
[06/52] [abbrv] wicket git commit: proper formatting of WicketTester.java
proper formatting of WicketTester.java
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c30e3291
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c30e3291
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c30e3291
Branch: refs/heads/WICKET-6563
Commit: c30e329162984facf76fdf3686b6bc0cd44c91aa
Parents: b0a96e9
Author: renoth
Authored: Tue Jul 31 13:54:07 2018 +0200
Committer: Martin Tzvetanov Grigorov
Committed: Wed Sep 26 16:10:12 2018 +0300
--
.../apache/wicket/util/tester/FormTester.java | 3 +-
.../apache/wicket/util/tester/WicketTester.java | 280 +--
2 files changed, 138 insertions(+), 145 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3291/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
b/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
index e5d71a6..81550bd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
@@ -580,7 +580,8 @@ public class FormTester
public FormTester setValue(final String formComponentId, final String
value)
{
Component component = workingForm.get(formComponentId);
- assertNotNull(component, "Unable to set value. Couldn't find
component with name: " + formComponentId);
+ assertNotNull(component, "Unable to set value. Couldn't find
component with name: " +
+ formComponentId);
return setValue(component, value);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3291/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index e4e08df..66af566 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -148,14 +148,16 @@ import org.slf4j.LoggerFactory;
*
* Cookie handling:
*
- * There are some expectations about wicket tester cookie handling which
should match as best as it
- * can be with a real client server request response cycle: - all valid
cookies set before a request
- * is made (tester.getRequest().addCookie()) should appear in the page request
- all cookies set in
- * the response should appear in the last response (tester.getLastResponse())
after the request is
- * made (expired cookies and others) - all cookies set in the response should
appear even after a
- * redirect response is made until the final response
(tester.getLastResponse()) is written to the
- * client (wicket tester) - all valid cookies (maxAge!=0) from the last
response should be added to
- * the next request cookies (tester.getRequest().getCookies())
+ * There are some expectations about wicket tester cookie handling which
should match as best as
+ * it can be with a real client server request response cycle:
+ * - all valid cookies set before a request is made
(tester.getRequest().addCookie()) should
+ * appear in the page request
+ * - all cookies set in the response should appear in the last response
(tester.getLastResponse())
+ * after the request is made (expired cookies and others)
+ * - all cookies set in the response should appear even after a redirect
response is made
+ * until the final response (tester.getLastResponse()) is written to the
client (wicket tester)
+ * - all valid cookies (maxAge!=0) from the last response should be added to
+ * the next request cookies (tester.getRequest().getCookies())
*
*
* TODO General: Example usage of FormTester
@@ -258,41 +260,19 @@ public class WicketTester extends BaseWicketTester
}
/**
-* Returns the current Maven build directory taken from the
basedir system property, or
-* null if not set
-*
-* @return path with a trailing slash
-*/
- public static String getBasedir()
- {
- String basedir = System.getProperty("basedir");
- if (basedir != null)
- {
- basedir = basedir + "/";
- }
- else
- {
- basedir = "";
- }
- return basedir;
- }
-
- /**
* Asserts that the Ajax location header is present.
*/
public void asse
[43/52] [abbrv] wicket git commit: Upgrade maven-bundle-plugin to 4.1.0
Upgrade maven-bundle-plugin to 4.1.0 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/47170ff9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/47170ff9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/47170ff9 Branch: refs/heads/WICKET-6563 Commit: 47170ff94a10d38b9821ebab03932931e1da5932 Parents: 00a1f4e Author: Martin Tzvetanov Grigorov Authored: Mon Oct 29 09:56:00 2018 +0200 Committer: Martin Tzvetanov Grigorov Committed: Mon Oct 29 10:08:02 2018 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/47170ff9/pom.xml -- diff --git a/pom.xml b/pom.xml index f1a1326..b4c79f8 100644 --- a/pom.xml +++ b/pom.xml @@ -726,7 +726,7 @@ org.apache.felix maven-bundle-plugin - 4.0.0 + 4.1.0 true
[jira] [Commented] (WICKET-6601) Events to close pop-up on Modal Window are not propagated from caption bar
[ https://issues.apache.org/jira/browse/WICKET-6601?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16668666#comment-16668666 ] ASF subversion and git services commented on WICKET-6601: - Commit 578a91a74583b03c231aa9736b7c4dc5173a0de0 in wicket's branch refs/heads/WICKET-6563 from [~svenmeier] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=578a91a ] WICKET-6601 dont stop mouse down on drag start > Events to close pop-up on Modal Window are not propagated from caption bar > -- > > Key: WICKET-6601 > URL: https://issues.apache.org/jira/browse/WICKET-6601 > Project: Wicket > Issue Type: Improvement > Components: wicket-extensions >Affects Versions: 7.0.0, 8.1.0, 8.2.0 >Reporter: Marco Hes >Assignee: Sven Meier >Priority: Minor > Fix For: 8.2.0, 9.0.0 > > > Even after the fix from WICKET-5552, this issue still exists when clicking on > the caption bar. I use select2 from wicktstuff in a modal window. When the > select2 dropdown is opened and the modal window is closed, the dropdown stays > open afterwards. Also when the dropdown is open and the modal is dragged, the > dropdown stays open and doesn't move along. I believe The click event is not > propagated, so select2 doesn't close the dropdown. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[27/52] [abbrv] wicket git commit: WICKET-6598 Upgrade Objenesis to 3.x for better support of Java 11
WICKET-6598 Upgrade Objenesis to 3.x for better support of Java 11 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6ee5313d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6ee5313d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6ee5313d Branch: refs/heads/WICKET-6563 Commit: 6ee5313d405fbbdd4ce9d9a03ccb526358834fca Parents: b21ec2d Author: Martin Tzvetanov Grigorov Authored: Thu Oct 11 13:40:55 2018 +0300 Committer: Martin Tzvetanov Grigorov Committed: Thu Oct 11 13:40:55 2018 +0300 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/6ee5313d/pom.xml -- diff --git a/pom.xml b/pom.xml index 7e73de5..9c0bb42 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ 1.7.25 1.2.3 2.0.0.0 - 2.6 + 3.0 1.9.1 4.0.3 3.0.4.Final
[08/52] [abbrv] wicket git commit: wicket-core: Migrate to Junit 5
wicket-core: Migrate to Junit 5
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/694ee32d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/694ee32d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/694ee32d
Branch: refs/heads/WICKET-6563
Commit: 694ee32dc63537c7fca22d0c0139a380882f2888
Parents: cba693f
Author: renoth
Authored: Fri Aug 31 23:25:41 2018 +0200
Committer: Martin Tzvetanov Grigorov
Committed: Wed Sep 26 16:12:57 2018 +0300
--
pom.xml | 1 +
.../wicket/util/tester/BaseWicketTester.java| 4 +-
.../apache/wicket/util/tester/WicketTester.java | 156 ++-
.../test/java/org/apache/wicket/TesterTest.java | 1 -
.../handler/render/WebPageRendererTest.java | 1 -
5 files changed, 86 insertions(+), 77 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/694ee32d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 39b9e56..7e74e89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -516,6 +516,7 @@
org.hamcrest
java-hamcrest
2.0.0.0
+ test
org.eclipse.jetty
http://git-wip-us.apache.org/repos/asf/wicket/blob/694ee32d/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index 313cb2d..92686b5 100644
---
a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++
b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -34,7 +34,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.regex.Pattern;
-
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.http.Cookie;
@@ -134,6 +133,7 @@ import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
+import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -723,7 +723,7 @@ public class BaseWicketTester
{
if (redirectCount++ >= 100)
{
- throw new AssertionError("Possible
infinite redirect detected. Bailing out.");
+ throw new
AssertionFailedError("Possible infinite redirect detected. Bailing out.");
}
Url newUrl =
Url.parse(lastResponse.getRedirectLocation(),
http://git-wip-us.apache.org/repos/asf/wicket/blob/694ee32d/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index 66af566..1b469a8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -148,16 +148,14 @@ import org.slf4j.LoggerFactory;
*
* Cookie handling:
*
- * There are some expectations about wicket tester cookie handling which
should match as best as
- * it can be with a real client server request response cycle:
- * - all valid cookies set before a request is made
(tester.getRequest().addCookie()) should
- * appear in the page request
- * - all cookies set in the response should appear in the last response
(tester.getLastResponse())
- * after the request is made (expired cookies and others)
- * - all cookies set in the response should appear even after a redirect
response is made
- * until the final response (tester.getLastResponse()) is written to the
client (wicket tester)
- * - all valid cookies (maxAge!=0) from the last response should be added to
- * the next request cookies (tester.getRequest().getCookies())
+ * There are some expectations about wicket tester cookie handling which
should match as best as it
+ * can be with a real client server request response cycle: - all valid
cookies set before a request
+ * is made (tester.getRequest().addCookie()) should appear in the page request
- all cookies set in
+ * the response should appear in the last
[05/52] [abbrv] wicket git commit: removed import, added some imports
removed import, added some imports
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b0a96e95
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b0a96e95
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b0a96e95
Branch: refs/heads/WICKET-6563
Commit: b0a96e9514bb8fad94c6a63b7781e643c18a6a17
Parents: 51725af
Author: renoth
Authored: Tue Jul 31 12:45:28 2018 +0200
Committer: Martin Tzvetanov Grigorov
Committed: Wed Sep 26 16:03:32 2018 +0300
--
.../util/convert/converters/ConvertersTest.java | 205
.../wicket/util/io/FullyBufferedReaderTest.java | 324 +--
2 files changed, 298 insertions(+), 231 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a96e95/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
--
diff --git
a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
index 2f8142a..35be426 100644
---
a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
+++
b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
@@ -14,16 +14,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.wicket.util.convert.converters;
+import java.math.BigDecimal;
+import java.text.ChoiceFormat;
+import java.text.NumberFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import org.apache.wicket.util.convert.ConversionException;
+import org.apache.wicket.util.convert.converter.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
+
@SuppressWarnings("javadoc")
public final class ConvertersTest
{
-/* *//** Dutch locale for localized testing. *//*
+ /** Dutch locale for localized testing. **/
private static final Locale DUTCH_LOCALE = new Locale("nl", "NL");
@Test
- public void thousandSeperator() throws Exception
+ public void thousandSeperator()
{
BigDecimalConverter bdc = new BigDecimalConverter();
assertEquals(new BigDecimal(3000), bdc.convertToObject("3 000",
Locale.FRENCH));
@@ -32,11 +49,11 @@ public final class ConvertersTest
assertEquals(3000, dc.convertToObject("3 000", Locale.FRENCH),
0.001);
}
- *//**
+ /**
* WICKET-4988 nbsp between digits only
-*//*
+*/
@Test
- public void thousandSeperatorWithCurrency() throws Exception
+ public void thousandSeperatorWithCurrency()
{
FloatConverter fc = new FloatConverter()
{
@@ -68,13 +85,14 @@ public final class ConvertersTest
assertEquals(Boolean.FALSE, converter.convertToObject("false",
Locale.getDefault(Locale.Category.FORMAT)));
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidBooleanConversion()
{
BooleanConverter converter = new BooleanConverter();
- // should throw an exception
- converter.convertToObject("whatever",
Locale.getDefault(Locale.Category.FORMAT));
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("whatever",
Locale.getDefault(Locale.Category.FORMAT));
+ });
}
@Test
@@ -86,25 +104,31 @@ public final class ConvertersTest
assertEquals("10", converter.convertToString((byte)10,
Locale.US));
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidByteConversion1()
{
ByteConverter converter = new ByteConverter();
- converter.convertToObject("whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidByteConversion2()
{
ByteConverter converter = new ByteConverter();
- converter.convertToObject("10whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("10whatever", Locale.US);
+
[45/52] [abbrv] wicket git commit: WICKET-6563 new IPageStore implementation
http://git-wip-us.apache.org/repos/asf/wicket/blob/c43d3a33/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PersistedPanel.java
--
diff --git
a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PersistedPanel.java
b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PersistedPanel.java
new file mode 100644
index 000..4705f5d
--- /dev/null
+++
b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PersistedPanel.java
@@ -0,0 +1,201 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.devutils.diskstore.browser;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.wicket.PageReference;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
+import org.apache.wicket.devutils.inspector.InspectorPage;
+import
org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import
org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import
org.apache.wicket.extensions.markup.html.repeater.data.table.DefaultDataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import
org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.pageStore.DefaultPageContext;
+import org.apache.wicket.pageStore.IPageContext;
+import org.apache.wicket.pageStore.IPersistedPage;
+import org.apache.wicket.pageStore.IPersistentPageStore;
+import org.apache.wicket.util.time.Duration;
+
+/**
+ * A panel that shows data about {@link IPersistedPage}s in an {@link
IPersistentPageStore}.
+ */
+public class PersistedPanel extends GenericPanel
+{
+
+ /**
+* Construct.
+*
+* @param id
+*the component id
+*/
+ public PersistedPanel(String id, IModel store)
+ {
+ super(id, store);
+
+ final Label storeLabel = new Label("store", () -> {
+ IPersistentPageStore s = getModelObject();
+
+ if (s == null) {
+ return "N/A";
+ }
+
+ return String.format("%s - %s", s.getClass().getName(),
s.getTotalSize());
+ });
+ storeLabel.setOutputMarkupId(true);
+ add(storeLabel);
+
+ final DropDownChoice sessionsSelector =
createSessionsSelector("sessions");
+ sessionsSelector.setOutputMarkupId(true);
+ add(sessionsSelector);
+
+ final DataTable table =
createTable("table", sessionsSelector.getModel());
+ table.setOutputMarkupId(true);
+ add(table);
+
+ AjaxFallbackLink refreshLink = new
AjaxFallbackLink("refresh")
+ {
+ @Override
+ public void onClick(Optional
targetOptional)
+ {
+ targetOptional.ifPresent(target ->
target.add(table));
+ }
+ };
+ add(refreshLink);
+
+ AjaxFallbackLink currentSessionLink = new
AjaxFallbackLink("currentSessionLink")
+ {
+ @Override
+ public void onCl
[22/52] [abbrv] wicket git commit: WICKET-6539 expose toolbars as WebMarkupContainer
WICKET-6539 expose toolbars as WebMarkupContainer
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/92b24c98
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/92b24c98
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/92b24c98
Branch: refs/heads/WICKET-6563
Commit: 92b24c98a8e979fd9c2611fc3b919b43ee67c9d2
Parents: 7ea12f8
Author: Sven Meier
Authored: Thu Sep 27 12:37:38 2018 +0200
Committer: Sven Meier
Committed: Thu Sep 27 12:37:56 2018 +0200
--
.../extensions/markup/html/repeater/data/table/DataTable.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/92b24c98/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
--
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
index 003db19..8a9d77b 100644
---
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
+++
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
@@ -235,7 +235,7 @@ public class DataTable extends Panel implements
IPageableItems
/**
* @return the container with the toolbars at the top
*/
- public final ToolbarsContainer getTopToolbars()
+ public final WebMarkupContainer getTopToolbars()
{
return topToolbars;
}
@@ -243,7 +243,7 @@ public class DataTable extends Panel implements
IPageableItems
/**
* @return the container with the toolbars at the bottom
*/
- public final ToolbarsContainer getBottomToolbars()
+ public final WebMarkupContainer getBottomToolbars()
{
return bottomToolbars;
}
[48/52] [abbrv] wicket git commit: WICKET-6563 new IPageStore implementation
http://git-wip-us.apache.org/repos/asf/wicket/blob/c43d3a33/wicket-core/src/main/java/org/apache/wicket/pageStore/SerializingPageStore.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/pageStore/SerializingPageStore.java
b/wicket-core/src/main/java/org/apache/wicket/pageStore/SerializingPageStore.java
new file mode 100644
index 000..70c93e4
--- /dev/null
+++
b/wicket-core/src/main/java/org/apache/wicket/pageStore/SerializingPageStore.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.pageStore;
+
+import org.apache.wicket.page.IManageablePage;
+import org.apache.wicket.serialize.ISerializer;
+import org.apache.wicket.util.lang.Args;
+
+/**
+ * A store that serializes all pages before delegating and vice versa.
+ */
+public class SerializingPageStore extends DelegatingPageStore
+{
+
+ private ISerializer serializer;
+
+ /**
+* @param delegate
+*store to delegate to
+* @param serializer
+*serializer to use if session gets persisted
+*/
+ public SerializingPageStore(IPageStore delegate, ISerializer serializer)
+ {
+ super(delegate);
+
+ this.serializer = Args.notNull(serializer, "serializer");
+ }
+
+ /**
+* Supports asynchronous add if the delegate supports it.
+*/
+ @Override
+ public boolean canBeAsynchronous(IPageContext context)
+ {
+ return getDelegate().canBeAsynchronous(context);
+ }
+
+ @Override
+ public IManageablePage getPage(IPageContext context, int id)
+ {
+ IManageablePage page = super.getPage(context, id);
+
+ if (page instanceof SerializedPage) {
+ page =
(IManageablePage)serializer.deserialize(((SerializedPage)page).getData());
+ }
+ return page;
+ }
+
+ @Override
+ public void addPage(IPageContext context, IManageablePage page)
+ {
+ if (page instanceof SerializedPage == false) {
+ page = new SerializedPage(page.getPageId(),
page.getClass().getName(), serializer.serialize(page));
+ }
+ super.addPage(context, page);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c43d3a33/wicket-core/src/main/java/org/apache/wicket/pageStore/disk/NestedFolders.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/pageStore/disk/NestedFolders.java
b/wicket-core/src/main/java/org/apache/wicket/pageStore/disk/NestedFolders.java
new file mode 100644
index 000..0f2077c
--- /dev/null
+++
b/wicket-core/src/main/java/org/apache/wicket/pageStore/disk/NestedFolders.java
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.pageStore.disk;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.wicket.util.file.Files;
+import org.apache.wicket.util.lang.Args;
+
+/**
+ * Helps creating nested folders.
+ *
+ * @author svenmeier
+ */
+public class NestedFolders
+{
+ private final File base;
+
+ /**
+* Create folders in the given base folder.
+*
+* @param bas
[47/52] [abbrv] wicket git commit: WICKET-6563 new IPageStore implementation
http://git-wip-us.apache.org/repos/asf/wicket/blob/c43d3a33/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java -- diff --git a/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java b/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java index 04c4f19..046a1ec 100644 --- a/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java @@ -20,19 +20,19 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; -import java.io.ByteArrayInputStream; import java.io.IOException; -import java.io.ObjectInputStream; import java.io.Serializable; +import java.util.concurrent.atomic.AtomicReference; import org.apache.wicket.Application; +import org.apache.wicket.MetaDataKey; import org.apache.wicket.ThreadContext; -import org.apache.wicket.pageStore.DefaultPageStore; -import org.apache.wicket.pageStore.IDataStore; +import org.apache.wicket.pageStore.DummyPageContext; +import org.apache.wicket.pageStore.IPageContext; import org.apache.wicket.pageStore.IPageStore; -import org.apache.wicket.pageStore.memory.DummyPageManagerContext; +import org.apache.wicket.pageStore.InSessionPageStore; +import org.apache.wicket.pageStore.NoopPageStore; import org.apache.wicket.serialize.java.JavaSerializer; -import org.apache.wicket.versioning.InMemoryPageStore; import org.junit.jupiter.api.Test; /** @@ -58,42 +58,39 @@ class PersistentPageManagerTest ThreadContext.detach(); // create IPageManager (with IPageStore) and store a page instance - IPageManager pageManager = newPersistentPageManager(APP_NAME); + final AtomicReference sessionData = new AtomicReference(null); + + IPageManager pageManager = createPageManager(APP_NAME, sessionData); + + // add a page TestPage toSerializePage = new TestPage(); - pageManager.touchPage(toSerializePage); - pageManager.commitRequest(); + pageManager.addPage(toSerializePage); + pageManager.detach(); // get the stored SessionEntry - Serializable sessionEntry = pageManager.getContext().getSessionAttribute(null); + assertNotNull(sessionData.get()); // destroy the manager and the store pageManager.destroy(); // simulate persisting of the http sessions initiated by the web container - byte[] serializedSessionEntry = new JavaSerializer(APP_NAME).serialize(sessionEntry); - assertNotNull(serializedSessionEntry, - "Wicket needs to be able to serialize the session entry"); - - // simulate loading of the persisted http session initiated by the web container - // when starting an application - ObjectInputStream in = new ObjectInputStream( - new ByteArrayInputStream(serializedSessionEntry)); + byte[] serializedSessionData = new JavaSerializer(APP_NAME).serialize(sessionData.get()); + assertNotNull(serializedSessionData, "Wicket needs to be able to serialize the session entry"); // WicketFilter is not initialized so there is no Application available yet assertFalse(Application.exists(), "Worker thread should be unaware of Wicket application"); - assertEquals(APP_NAME, in.readObject()); + // simulate loading of the persisted http session initiated by the web container + // when starting an application + sessionData.set(new JavaSerializer(APP_NAME).deserialize(serializedSessionData)); // without available IPageStore the read SessionEntry holds // the IManageablePage itself, not SerializedPage - Serializable loadedSessionEntry = (Serializable)in.readObject(); - assertNotNull(loadedSessionEntry, - "Wicket needs to be able to deserialize the session entry regardless the application availability"); + assertNotNull(sessionData.get(), "Wicket needs to be able to deserialize the session entry regardless the application availability"); // provide new IPageStore which will read IManageablePage's or SerializedPage's // from the SessionEntry's - IPageManager newPageManager = newPersistentPageManager(APP_NAME); - newPageManager.getContext().setSessionAttribute(null, loadedSessionEntry); + IPageManager newPageManager = createPageManager(APP_NAME, se
[25/52] [abbrv] wicket git commit: WICKET-6596 Use JQuery 3.x as default
WICKET-6596 Use JQuery 3.x as default
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cbc23715
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cbc23715
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cbc23715
Branch: refs/heads/WICKET-6563
Commit: cbc237159c4c6632b4f7db893c28ab39d1b40ed4
Parents: 926bea9
Author: Martin Tzvetanov Grigorov
Authored: Mon Oct 1 14:43:12 2018 +0300
Committer: Martin Tzvetanov Grigorov
Committed: Mon Oct 1 14:43:12 2018 +0300
--
.../ajax/WicketAjaxJQueryResourceReference.java | 2 +-
.../resource/JQueryPluginResourceReference.java | 2 +-
.../settings/JavaScriptLibrarySettings.java | 2 +-
.../apache/wicket/TestDetachPageAjaxResult.html | 2 +-
.../wicket/TestDetachPageExpectedResult.html| 2 +-
.../ajax/AjaxBehaviorEnabled_expected.html | 2 +-
...axHeaderContributionPage2_ajax_expected.html | 2 +-
.../AjaxHeaderContributionPage2_expected.html | 2 +-
...jaxHeaderContributionPage_ajax_expected.html | 2 +-
.../AjaxHeaderContributionPage_expected.html| 2 +-
.../ajax/DomReadyOrderPage_ajax_expected.html | 2 +-
.../wicket/ajax/DomReadyOrderPage_expected.html | 2 +-
.../form/AjaxFormSubmitTestPage_expected.html | 2 +-
.../OnChangeAjaxBehaviorTestPage_expected.html | 2 +-
.../ajaxLink/AjaxLinkPageExpectedResult.html| 2 +-
.../AjaxLinkWithBorderPageExpectedResult.html | 2 +-
.../html/ajaxLink/AjaxPage2_ExpectedResult.html | 2 +-
.../SimpleTestPageExpectedResult-1.html | 2 +-
.../SimpleTestPageExpectedResult.html | 2 +-
.../head/filter/DeferredPageExpected.html | 2 +-
.../head/filter/FilteredHeaderPageExpected.html | 2 +-
.../html/basic/SimplePageExpectedResult_13.html | 2 +-
.../HideableBorderPage_ExpectedResult.html | 2 +-
.../panel/InlinePanelPageExpectedResult_7.html | 2 +-
.../panel/InlinePanelPageExpectedResult_8.html | 2 +-
.../ResourceAggregatorTest1Page_results.html| 2 +-
.../ResourceAggregatorTest2Page_results.html| 2 +-
.../filter/FilterFormTestPage_expected.html | 30 ++--
28 files changed, 42 insertions(+), 42 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/cbc23715/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java
b/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java
index 2ed5b88..f6f9980 100644
---
a/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java
+++
b/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java
@@ -57,7 +57,7 @@ public class WicketAjaxJQueryResourceReference extends
JavaScriptResourceReferen
}
else
{
- jqueryReference = JQueryResourceReference.getV2();
+ jqueryReference = JQueryResourceReference.getV3();
}
List dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(jqueryReference));
http://git-wip-us.apache.org/repos/asf/wicket/blob/cbc23715/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java
b/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java
index 843cb00..9010af1 100644
---
a/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java
+++
b/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java
@@ -80,7 +80,7 @@ public class JQueryPluginResourceReference extends
JavaScriptResourceReference
}
else
{
- backingLibraryReference =
JQueryResourceReference.getV2();
+ backingLibraryReference =
JQueryResourceReference.getV3();
}
List dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(backingLibraryReference));
http://git-wip-us.apache.org/repos/asf/wicket/blob/cbc23715/wicket-core/src/main/java/org/apache/wicket/settings/JavaScriptLibrarySettings.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/settings/JavaScriptLibrarySettings.java
b/wicket-core/src/main/java/org/apache/wicket/settings/JavaScriptLibrarySettings
[30/52] [abbrv] wicket git commit: WICKET-4423 allow dragging over iframe
WICKET-4423 allow dragging over iframe
with pointer-events=none
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c51cf875
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c51cf875
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c51cf875
Branch: refs/heads/WICKET-6563
Commit: c51cf875f59ce0438a5f339aae71eb92fa915a1c
Parents: ace845c
Author: Sven Meier
Authored: Mon Oct 15 23:29:14 2018 +0200
Committer: Sven Meier
Committed: Mon Oct 15 23:31:17 2018 +0200
--
.../ajax/markup/html/modal/res/modal.js | 154 +--
1 file changed, 6 insertions(+), 148 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/c51cf875/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
--
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
index 6bcebf2..8b66687 100644
---
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
+++
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
@@ -56,142 +56,6 @@
}
/**
-* Supporting code for getting mouse move and mouse up events from
iframes.
-* The problem when dragging a div with an iframe is that when the
mouse cursor
-* gets over an iframe, all mouse events are received by the iframe's
document. (IE and FF)
-*
-* This code can recursively traverse all iframes in document and
temporarily forward
-* events from their documents to parent document.
-*/
- Wicket.Iframe = {
-
- /**
-* Returns the horizontal position of given element (in pixels).
-*/
- findPosX: function(e) {
- if (e.offsetParent) {
- var c = 0;
- while (e) {
- c += e.offsetLeft;
- e = e.offsetParent;
- }
- return c;
- } else if (e.x) {
- return e.x;
- } else {
- return 0;
- }
- },
-
- /**
-* Returns the vertical position of given element (in pixels).
-*/
- findPosY: function(e) {
- if (e.offsetParent) {
- var c = 0;
- while (e) {
- c += e.offsetTop;
- e = e.offsetParent;
- }
- return c;
- } else if (e.y) {
- return e.y;
- } else {
- return 0;
- }
- },
-
- /**
-* Forwards the events from iframe to the parent document
(works recursively).
-* @param {Document} doc - document to which the events will be
forwarded
-* @param {HTMLElement} iframe - source iframe
-* @param {Array} revertList - list to which altered iframes
will be added
-*/
- forwardEvents: function(doc, iframe, revertList) {
- try {
- var idoc = iframe.contentWindow.document;
- idoc.old_onmousemove = idoc.onmousemove;
- idoc.onmousemove = function(evt) {
- if (!evt) {
- evt =
iframe.contentWindow.event;
- }
- var e = {};
-
- var dx = 0;
- var dy = 0;
- if (Wicket.Browser.isIELessThan11() ||
Wicket.Browser.isGecko()) {
- dx = Wicket.Window.getScrollX();
- dy = Wicket.Window.getScrollY();
- }
-
- e.clientX = evt.clientX +
Wicket.Iframe.findPosX(iframe) - dx;
- e.clientY = evt.clientY +
Wicket.Iframe.findPosY(iframe) - dy;
-
[18/52] [abbrv] wicket git commit: INFRA-17064 - Revert the toolchains vendor
INFRA-17064 - Revert the toolchains vendor
Hopefully this will make it work again
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/dd2df9ab
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/dd2df9ab
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/dd2df9ab
Branch: refs/heads/WICKET-6563
Commit: dd2df9ab064aebbac08b7547b4330a71475be6b6
Parents: e2ad8e9
Author: Martin Tzvetanov Grigorov
Authored: Wed Sep 26 17:07:08 2018 +0300
Committer: Martin Tzvetanov Grigorov
Committed: Wed Sep 26 17:07:08 2018 +0300
--
pom.xml | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/dd2df9ab/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e205efe..fc59134 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1015,6 +1015,7 @@
${maven.compiler.source}
+oracle
[16/52] [abbrv] wicket git commit: Update JUnit to 5.3.1
Update JUnit to 5.3.1
Mark it as optional to prevent issues in OSGi environment
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5dcf63dd
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5dcf63dd
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5dcf63dd
Branch: refs/heads/WICKET-6563
Commit: 5dcf63dd7ff5d1e0b1692836e76986199686ee97
Parents: 5d97035
Author: Martin Tzvetanov Grigorov
Authored: Wed Sep 26 16:53:54 2018 +0300
Committer: Martin Tzvetanov Grigorov
Committed: Wed Sep 26 16:53:54 2018 +0300
--
pom.xml | 5 -
.../src/main/java/org/apache/wicket/util/WicketTestTag.java | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/5dcf63dd/pom.xml
--
diff --git a/pom.xml b/pom.xml
index bd8de55..c5b5d9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
3.2.8
0.8.2
9.4.12.v20180830
- 5.2.0
+ 5.3.1
5.1.0.RELEASE
3.1.0
3.0.1
@@ -559,18 +559,21 @@
junit-jupiter-engine
${junit.version}
test
+ true
org.junit.jupiter
junit-jupiter-params
${junit.version}
test
+ true
org.junit.vintage
junit-vintage-engine
${junit.version}
test
+ true
org.mockito
http://git-wip-us.apache.org/repos/asf/wicket/blob/5dcf63dd/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java
--
diff --git
a/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java
b/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java
index cf92bca..5c4e7e7 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java
@@ -21,5 +21,6 @@ package org.apache.wicket.util;
* Used to mark slow running tests which are not executed with Maven profile
'fast'
*/
public interface WicketTestTag {
-public static final String SLOW = "SLOW";
+
+ String SLOW = "SLOW";
}
[10/52] [abbrv] wicket git commit: - fix test error
- fix test error Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ce3c7c75 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ce3c7c75 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ce3c7c75 Branch: refs/heads/WICKET-6563 Commit: ce3c7c7551377365925c5e80bbf47528ced58401 Parents: 4c6cb67 Author: renoth Authored: Sat Sep 1 15:41:18 2018 +0200 Committer: Martin Tzvetanov Grigorov Committed: Wed Sep 26 16:17:37 2018 +0300 -- testing/wicket-arquillian/pom.xml | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/ce3c7c75/testing/wicket-arquillian/pom.xml -- diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml index d093dff..350559d 100644 --- a/testing/wicket-arquillian/pom.xml +++ b/testing/wicket-arquillian/pom.xml @@ -163,6 +163,13 @@ + org.opentest4j + opentest4j + 1.1.0 + compile + + + org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven
[02/52] [abbrv] wicket git commit: - wicket-arquilian / wicket-cdi-1.1 : Enable Junit Vintage Engine to run old Testrunners - BaseWicketTester.java: remove dependency on AssertionFailedException - glo
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
--
diff --git
a/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
b/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
index 8e588ad..bdb08ad 100644
---
a/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
+++
b/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
@@ -16,21 +16,23 @@
*/
package org.apache.wicket.devutils.stateless;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.tester.DummyHomePage;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @author Marat Radchenko
*/
-public class StatelessCheckerTest extends Assert
+public class StatelessCheckerTest
{
@StatelessComponent
public static class StatelessPage extends DummyHomePage
@@ -97,7 +99,7 @@ public class StatelessCheckerTest extends Assert
private WicketTester tester;
- @Before
+ @BeforeEach
public void setUp()
{
tester = new WicketTester();
@@ -105,7 +107,7 @@ public class StatelessCheckerTest extends Assert
checkerQuietly = new StatelessCheckerQuietly();
}
- @After
+ @AfterEach
public void tearDown()
{
tester.destroy();
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
--
diff --git
a/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
b/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
index a8e7628..88d9025 100644
---
a/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
+++
b/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.util.markup.xhtml;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checks that the html markup files are well formed xml-s.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
--
diff --git
a/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
b/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
index cd00729..96ba0f8 100644
---
a/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
+++
b/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
@@ -16,22 +16,22 @@
*/
package org.apache.wicket.examples;
-import com.meterware.httpunit.HttpUnitOptions;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
+import com.meterware.httpunit.HttpUnitOptions;
/**
* Test decorator that starts a jetty instance
*
* @author ivaynberg
*/
-public class JettyTestCaseDecorator extends Assert
+public class JettyTestCaseDecorator
{
private Server server;
private String contextPath;
@@ -41,7 +41,7 @@ public class JettyTestCaseDecorator extends Assert
/**
* @throws Exception
*/
- @Before
+ @BeforeEach
public void before() throws Exception
{
HttpUnitOptions.setExceptionsThrownOnScriptError(false);
@@ -87,7 +87,7 @@ public class JettyTestCaseDecorator extends Assert
/**
* @throws Exception
*/
- @After
+ @AfterEach
public void after() throws Exception
{
contextPath = null;
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
[07/52] [abbrv] wicket git commit: wicket-auth-roles: Migrate to Junit 5 wicket-request: Migrate to Junit 5 wicket-util: fix Assertion order
wicket-auth-roles: Migrate to Junit 5
wicket-request: Migrate to Junit 5
wicket-util: fix Assertion order
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cba693fb
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cba693fb
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cba693fb
Branch: refs/heads/WICKET-6563
Commit: cba693fbd8bd1f0cd7c0be8bc6a6aba73a8e5dae
Parents: c30e329
Author: renoth
Authored: Thu Aug 30 22:59:22 2018 +0200
Committer: Martin Tzvetanov Grigorov
Committed: Wed Sep 26 16:10:50 2018 +0300
--
.../wicket/util/license/ApacheLicenseHeaderTestCase.java | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/cba693fb/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
--
diff --git
a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
index 4c88b1b..596b2ed 100644
---
a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
+++
b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
@@ -16,14 +16,6 @@
*/
package org.apache.wicket.util.license;
-import org.apache.wicket.util.lang.Generics;
-import org.apache.wicket.util.string.Strings;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.opentest4j.AssertionFailedError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.File;
import java.io.FileFilter;
import java.util.ArrayList;
@@ -37,6 +29,7 @@ import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.string.Strings;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -104,7 +97,7 @@ public abstract class ApacheLicenseHeaderTestCase
*
*/
@BeforeEach
- public final void before()
+ final void before()
{
// setup the base directory for when running inside maven
(building a release
// comes to mind).
[49/52] [abbrv] wicket git commit: WICKET-6563 new IPageStore implementation
http://git-wip-us.apache.org/repos/asf/wicket/blob/c43d3a33/wicket-core/src/main/java/org/apache/wicket/pageStore/FilePageStore.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/pageStore/FilePageStore.java
b/wicket-core/src/main/java/org/apache/wicket/pageStore/FilePageStore.java
new file mode 100644
index 000..71beeda
--- /dev/null
+++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/FilePageStore.java
@@ -0,0 +1,562 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.pageStore;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.charset.Charset;
+import java.nio.file.StandardOpenOption;
+import java.nio.file.attribute.UserDefinedFileAttributeView;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
+
+import org.apache.wicket.Session;
+import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.page.IManageablePage;
+import org.apache.wicket.pageStore.disk.NestedFolders;
+import org.apache.wicket.serialize.ISerializer;
+import org.apache.wicket.util.file.Files;
+import org.apache.wicket.util.io.IOUtils;
+import org.apache.wicket.util.lang.Args;
+import org.apache.wicket.util.lang.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A storage of pages in files.
+ *
+ * While {@link DiskPageStore} uses a single file per session, this
implementation stores each page
+ * in its own file. This improves on a {@link DiskPageStore disadvantage of
DiskPageStore} surfacing
+ * with alternating Ajax requests from different browser tabs.
+ */
+public class FilePageStore implements IPersistentPageStore
+{
+ private static final String ATTRIBUTE_PAGE_TYPE =
"user.wicket_page_type";
+
+ private static final String FILE_SUFFIX = ".data";
+
+ private static final Logger log =
LoggerFactory.getLogger(FilePageStore.class);
+
+ private static final String KEY = "wicket:FilePageStore";
+
+ /**
+* A cache that holds all page stores.
+*/
+ private static final ConcurrentMap FILE_STORES =
new ConcurrentHashMap<>();
+
+ private final String applicationName;
+
+ private final ISerializer serializer;
+
+ private final Bytes maxSizePerSession;
+
+ private final NestedFolders folders;
+
+ /**
+* Create a store that supports {@link SerializedPage}s only.
+*
+* @param applicationName
+*name of application
+* @param fileStoreFolder
+*folder to store to
+* @param maxSizePerSession
+*maximum size per session
+*
+* @see SerializingPageStore
+*/
+ public FilePageStore(String applicationName, File fileStoreFolder,
Bytes maxSizePerSession)
+ {
+ this(applicationName, fileStoreFolder, maxSizePerSession, null);
+ }
+
+ /**
+* Create a store to disk.
+*
+* @param applicationName
+*name of application
+* @param fileStoreFolder
+*folder to store to
+* @param maxSizePerSession
+*maximum size per session
+* @param serializer
+*for serialization of pages
+*/
+ public FilePageStore(String applicationName, File fileStoreFolder,
Bytes maxSizePerSession,
+ ISerializer serializer)
+ {
+ this.applicationName = Args.notNull(applicationName,
"applicationName");
+ this.folders = new NestedFolders(new File(fileStoreFolder,
applicationName + "-filestore"));
+ this.maxSizePerSession = Args.notNul
[jira] [Resolved] (WICKET-6605) Allow AjaxFallbackButton to be stateless
[ https://issues.apache.org/jira/browse/WICKET-6605?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Andrea Del Bene resolved WICKET-6605. - Resolution: Fixed > Allow AjaxFallbackButton to be stateless > - > > Key: WICKET-6605 > URL: https://issues.apache.org/jira/browse/WICKET-6605 > Project: Wicket > Issue Type: Improvement >Affects Versions: 7.10.0, 8.1.0 >Reporter: Andrea Del Bene >Assignee: Andrea Del Bene >Priority: Trivial > Fix For: 7.11.0, 8.2.0, 9.0.0 > > > The inner AjaxFormSubmitBehavior of AjaxFallbackButton does not delegate > getStatelessHint() to its component, making impossible for it to be stateless. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (WICKET-6605) Allow AjaxFallbackButton to be stateless
[ https://issues.apache.org/jira/browse/WICKET-6605?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16668472#comment-16668472 ] ASF subversion and git services commented on WICKET-6605: - Commit e1ff3da3eead75852f54e225bdea1204e930184f in wicket's branch refs/heads/wicket-7.x from [~bitstorm] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=e1ff3da ] WICKET-6605 Allow AjaxFallbackButton to be stateless > Allow AjaxFallbackButton to be stateless > - > > Key: WICKET-6605 > URL: https://issues.apache.org/jira/browse/WICKET-6605 > Project: Wicket > Issue Type: Improvement >Affects Versions: 7.10.0, 8.1.0 >Reporter: Andrea Del Bene >Assignee: Andrea Del Bene >Priority: Trivial > Fix For: 7.11.0, 8.2.0, 9.0.0 > > > The inner AjaxFormSubmitBehavior of AjaxFallbackButton does not delegate > getStatelessHint() to its component, making impossible for it to be stateless. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
wicket git commit: WICKET-6605 Allow AjaxFallbackButton to be stateless
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 88a521ce8 -> e1ff3da3e
WICKET-6605 Allow AjaxFallbackButton to be stateless
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e1ff3da3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e1ff3da3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e1ff3da3
Branch: refs/heads/wicket-7.x
Commit: e1ff3da3eead75852f54e225bdea1204e930184f
Parents: 88a521c
Author: Andrea Del Bene
Authored: Tue Oct 30 10:42:17 2018 +0100
Committer: Andrea Del Bene
Committed: Tue Oct 30 10:55:18 2018 +0100
--
.../ajax/markup/html/form/AjaxFallbackButton.java| 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/e1ff3da3/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
index 0d164fd..9479e35 100644
---
a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
+++
b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.ajax.markup.html.form;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
@@ -64,7 +65,12 @@ public abstract class AjaxFallbackButton extends Button
super(id, model);
mForm = form;
- add(new AjaxFormSubmitBehavior(form, "click")
+ add(newAjaxEventBehavior(form, "click"));
+ }
+
+ protected AjaxFormSubmitBehavior newAjaxEventBehavior(Form form,
String event)
+ {
+ return new AjaxFormSubmitBehavior(form, event)
{
private static final long serialVersionUID = 1L;
@@ -103,7 +109,12 @@ public abstract class AjaxFallbackButton extends Button
AjaxFallbackButton.this.updateAjaxAttributes(attributes);
}
- });
+ @Override
+ public boolean getStatelessHint(Component component)
+ {
+ return
AjaxFallbackButton.this.getStatelessHint();
+ }
+ };
}
protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
buildbot failure in on wicket-branch-8.x
The Buildbot has detected a new failure on builder wicket-branch-8.x while building wicket. Full details are available at: https://ci.apache.org/builders/wicket-branch-8.x/builds/48 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_slave1_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-wicket-branch-8.x-commit' triggered this build Build Source Stamp: [branch wicket-8.x] f4dc540f866e90b6a6a5da3b29357df6917b5e6a Blamelist: Andrea Del Bene BUILD FAILED: failed compile Sincerely, -The Buildbot
[jira] [Commented] (WICKET-6605) Allow AjaxFallbackButton to be stateless
[ https://issues.apache.org/jira/browse/WICKET-6605?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16668447#comment-16668447 ] ASF subversion and git services commented on WICKET-6605: - Commit f4dc540f866e90b6a6a5da3b29357df6917b5e6a in wicket's branch refs/heads/wicket-8.x from [~bitstorm] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=f4dc540 ] WICKET-6605 Allow AjaxFallbackButton to be stateless > Allow AjaxFallbackButton to be stateless > - > > Key: WICKET-6605 > URL: https://issues.apache.org/jira/browse/WICKET-6605 > Project: Wicket > Issue Type: Improvement >Affects Versions: 7.10.0, 8.1.0 >Reporter: Andrea Del Bene >Assignee: Andrea Del Bene >Priority: Trivial > Fix For: 7.11.0, 8.2.0, 9.0.0 > > > The inner AjaxFormSubmitBehavior of AjaxFallbackButton does not delegate > getStatelessHint() to its component, making impossible for it to be stateless. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
wicket git commit: WICKET-6605 Allow AjaxFallbackButton to be stateless
Repository: wicket
Updated Branches:
refs/heads/wicket-8.x ec1549118 -> f4dc540f8
WICKET-6605 Allow AjaxFallbackButton to be stateless
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f4dc540f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f4dc540f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f4dc540f
Branch: refs/heads/wicket-8.x
Commit: f4dc540f866e90b6a6a5da3b29357df6917b5e6a
Parents: ec15491
Author: Andrea Del Bene
Authored: Tue Oct 30 10:42:17 2018 +0100
Committer: Andrea Del Bene
Committed: Tue Oct 30 10:49:53 2018 +0100
--
.../ajax/markup/html/form/AjaxFallbackButton.java | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4dc540f/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
index fcb9219..03ca2a2 100644
---
a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
+++
b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
@@ -18,6 +18,7 @@ package org.apache.wicket.ajax.markup.html.form;
import java.util.Optional;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
@@ -66,10 +67,15 @@ public abstract class AjaxFallbackButton extends Button
super(id, model);
mForm = form;
- add(new AjaxFormSubmitBehavior(form, "click")
+ add(newAjaxEventBehavior(form, "click"));
+ }
+
+ protected AjaxFormSubmitBehavior newAjaxEventBehavior(Form form,
String event)
+ {
+ return new AjaxFormSubmitBehavior(form, event)
{
private static final long serialVersionUID = 1L;
-
+
@Override
protected void onSubmit(AjaxRequestTarget target)
{
@@ -105,7 +111,12 @@ public abstract class AjaxFallbackButton extends Button
AjaxFallbackButton.this.updateAjaxAttributes(attributes);
}
- });
+ @Override
+ public boolean getStatelessHint(Component component)
+ {
+ return
AjaxFallbackButton.this.getStatelessHint();
+ }
+ };
}
protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
[jira] [Commented] (WICKET-6605) Allow AjaxFallbackButton to be stateless
[ https://issues.apache.org/jira/browse/WICKET-6605?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16668445#comment-16668445 ] ASF subversion and git services commented on WICKET-6605: - Commit 08f6a531ac68261311c5de228048e3bc43e47814 in wicket's branch refs/heads/master from [~bitstorm] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=08f6a53 ] WICKET-6605 Allow AjaxFallbackButton to be stateless > Allow AjaxFallbackButton to be stateless > - > > Key: WICKET-6605 > URL: https://issues.apache.org/jira/browse/WICKET-6605 > Project: Wicket > Issue Type: Improvement >Affects Versions: 7.10.0, 8.1.0 >Reporter: Andrea Del Bene >Assignee: Andrea Del Bene >Priority: Trivial > Fix For: 7.11.0, 8.2.0, 9.0.0 > > > The inner AjaxFormSubmitBehavior of AjaxFallbackButton does not delegate > getStatelessHint() to its component, making impossible for it to be stateless. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
wicket git commit: WICKET-6605 Allow AjaxFallbackButton to be stateless
Repository: wicket
Updated Branches:
refs/heads/master d1239aadd -> 08f6a531a
WICKET-6605 Allow AjaxFallbackButton to be stateless
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/08f6a531
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/08f6a531
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/08f6a531
Branch: refs/heads/master
Commit: 08f6a531ac68261311c5de228048e3bc43e47814
Parents: d1239aa
Author: Andrea Del Bene
Authored: Tue Oct 30 10:42:17 2018 +0100
Committer: Andrea Del Bene
Committed: Tue Oct 30 10:42:17 2018 +0100
--
.../ajax/markup/html/form/AjaxFallbackButton.java | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/08f6a531/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
index fcb9219..03ca2a2 100644
---
a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
+++
b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
@@ -18,6 +18,7 @@ package org.apache.wicket.ajax.markup.html.form;
import java.util.Optional;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
@@ -66,10 +67,15 @@ public abstract class AjaxFallbackButton extends Button
super(id, model);
mForm = form;
- add(new AjaxFormSubmitBehavior(form, "click")
+ add(newAjaxEventBehavior(form, "click"));
+ }
+
+ protected AjaxFormSubmitBehavior newAjaxEventBehavior(Form form,
String event)
+ {
+ return new AjaxFormSubmitBehavior(form, event)
{
private static final long serialVersionUID = 1L;
-
+
@Override
protected void onSubmit(AjaxRequestTarget target)
{
@@ -105,7 +111,12 @@ public abstract class AjaxFallbackButton extends Button
AjaxFallbackButton.this.updateAjaxAttributes(attributes);
}
- });
+ @Override
+ public boolean getStatelessHint(Component component)
+ {
+ return
AjaxFallbackButton.this.getStatelessHint();
+ }
+ };
}
protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
[jira] [Created] (WICKET-6605) Allow AjaxFallbackButton to be stateless
Andrea Del Bene created WICKET-6605: --- Summary: Allow AjaxFallbackButton to be stateless Key: WICKET-6605 URL: https://issues.apache.org/jira/browse/WICKET-6605 Project: Wicket Issue Type: Improvement Affects Versions: 8.1.0, 7.10.0 Reporter: Andrea Del Bene Assignee: Andrea Del Bene Fix For: 7.11.0, 8.2.0, 9.0.0 The inner AjaxFormSubmitBehavior of AjaxFallbackButton does not delegate getStatelessHint() to its component, making impossible for it to be stateless. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Reopened] (WICKET-6604) Ajax repaint is not correctly handled when component being repainted has an enclosure associated with it and is not a child of the enclosure
[
https://issues.apache.org/jira/browse/WICKET-6604?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Martin Grigorov reopened WICKET-6604:
-
I do not see a commit in master branch.
[~ivaynberg] Any reason not to have the fix in master ?
> Ajax repaint is not correctly handled when component being repainted has an
> enclosure associated with it and is not a child of the enclosure
>
>
> Key: WICKET-6604
> URL: https://issues.apache.org/jira/browse/WICKET-6604
> Project: Wicket
> Issue Type: Bug
>Affects Versions: 7.10.0, 8.1.0
>Reporter: Igor Vaynberg
>Assignee: Igor Vaynberg
>Priority: Minor
> Labels: ajax
> Fix For: 7.11.0, 8.2.0
>
>
> When a component is repainted with ajax we first check if that component is a
> controlling component of the enclosure and if it is we repaint the enclosure
> instead of the component. However, we make the assumption that the
> controlling component of the enclosure is always contained within the
> enclosure, which may not always be true with inline enclosures.
> For example:
> {code:java}
> Name
> {code}
> In this case the inline enclosure will only encompass the label. So if we
> repaint the textfield by adding it to the ajax request handler we will get a
> strange result where any header contributions associated with the name
> component will get rendered, but the markup for the name component will not -
> because we make the assumption that since it is controlling an enclosure it
> is also inside it so there is no point in repainting it directly.
>
> One may argue that controlling components have to be inside the enclosure and
> we should throw an error if they are not, but I prefer this more flexible
> approach which allows the controller to be outside.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
