wicket git commit: Date-time tests are fixed
Repository: wicket Updated Branches: refs/heads/WICKET-6105-java.time 11ef5c489 -> 9ab8f47a9 Date-time tests are fixed Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9ab8f47a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9ab8f47a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9ab8f47a Branch: refs/heads/WICKET-6105-java.time Commit: 9ab8f47a980e9cd472bf731bb6496d276ee8db7a Parents: 11ef5c4 Author: Maxim Solodovnik Authored: Sat Sep 23 12:38:05 2017 +0700 Committer: Maxim Solodovnik Committed: Sat Sep 23 12:38:05 2017 +0700 -- .../html/form/datetime/DateConverter.java | 35 +++ .../html/form/datetime/StyleDateConverter.java | 47 ++-- 2 files changed, 59 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/9ab8f47a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateConverter.java -- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateConverter.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateConverter.java index ce9f6f2..e667b9e 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateConverter.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateConverter.java @@ -65,6 +65,18 @@ public abstract class DateConverter implements IConverter this.applyTimeZoneDifference = applyTimeZoneDifference; } + protected ZonedDateTime convertToObject(String value, DateTimeFormatter format, Locale locale) { + try + { + // parse date retaining the time of the submission + return ZonedDateTime.parse(value, format); + } + catch (RuntimeException e) + { + throw newConversionException(e, locale); + } + } + @Override public ZonedDateTime convertToObject(String value, Locale locale) { @@ -79,20 +91,11 @@ public abstract class DateConverter implements IConverter if (applyTimeZoneDifference) { ZoneId zoneId = getClientTimeZone(); - ZonedDateTime dateTime; // set time zone for client format = format.withZone(getTimeZone()); - try - { - // parse date retaining the time of the submission - dateTime = ZonedDateTime.parse(value, format); - } - catch (RuntimeException e) - { - throw newConversionException(e, locale); - } + ZonedDateTime dateTime = convertToObject(value, format, locale); // apply the server time zone to the parsed value if (zoneId != null) { @@ -103,15 +106,7 @@ public abstract class DateConverter implements IConverter } else { - try - { - ZonedDateTime dateTime = ZonedDateTime.parse(value); - return dateTime; - } - catch (RuntimeException e) - { - throw newConversionException(e, locale); - } + return convertToObject(value, format, locale); } } @@ -124,7 +119,7 @@ public abstract class DateConverter implements IConverter *- {@link Locale} used to set 'format' variable with localized pattern * @return {@link ConversionException} */ - private ConversionException newConversionException(RuntimeException cause, Locale locale) + ConversionException newConversionException(RuntimeException cause, Locale locale) { return new ConversionException(cause) .setVariable("format", getDatePattern(locale)); http://git-wip-us.apache.org/repos/asf/wicket/blob/9ab8f47a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/StyleDateConverter.java -- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/StyleDateConve
[jira] [Created] (WICKET-6473) Double slash break 404page
Ilia Naryzhny created WICKET-6473: - Summary: Double slash break 404page Key: WICKET-6473 URL: https://issues.apache.org/jira/browse/WICKET-6473 Project: Wicket Issue Type: Bug Components: wicket Affects Versions: 7.8.0 Reporter: Ilia Naryzhny Issue came from email thread: http://markmail.org/thread/rlozkiz7gy2z3bkc -- We have in Orienteer customized NotFoundPage https://github.com/OrienteerBAP/Orienteer/blob/master/orienteer-core/src/main/java/org/orienteer/core/web/NotFoundPage.java . And it works perfectly except one case: if somebody by mistake put double slash in URL. For example https://demo.orienteer.org// Application is trying to render 404 page, but all resources are not found and user see just plan page without styles and scripts. Taking into account that resources are included commonly through XXXPackageResource and WebJarsResourc - it looks like Wicket issue. Demonstatin can be found there: Please check this one: https://github.com/PhantomYdn/wicket-bugs/tree/master/doubleslash -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[43/50] [abbrv] wicket git commit: Wicket is compilable, tests are fails
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yuiloader/yuiloader-min.js -- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yuiloader/yuiloader-min.js b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yuiloader/yuiloader-min.js deleted file mode 100644 index 9934bb0..000 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yuiloader/yuiloader-min.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2011, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.com/yui/license.html -version: 2.9.0 -*/ -if(typeof YAHOO=="undefined"||!YAHOO){var YAHOO={};}YAHOO.namespace=function(){var b=arguments,g=null,e,c,f;for(e=0;e":">",'"':""","'":"'","/":"/","`":"`"},d=["to String","valueOf"],e={isArray:function(j){return a.toString.apply(j)===c;},isBoolean:function(j){return typeof j==="boolean";},isFunction:function(j){return(typeof j==="function")||a.toString.apply(j)===h;},isNull:function(j){return j===null;},isNumber:function(j){return typeof j==="number"&&isFinite(j);},isObject:function(j){return(j&&(typeof j==="object"||f.isFunction(j)))||false;},isString:function(j){return typeof j==="string";},isUndefined:function(j){return typeof j==="undefined";},_IEEnumFix:(YAHOO.env.ua.ie)?function(l,k){var j,n,m;for(j=0;j"'\/`]/g,function(k){return g[k];});},extend:function(m,n,l){if(!n||!m){throw new Error("extend failed, please check that "+"all dependencies are included.");}var k=function(){},j;k.prototype=n.prototype;m.prototype=new k();m.prototype.constructor=m;m.superclass=n.prototype;if(n.prototype.constructor==a.construc tor){n.prototype.constructor=n;}if(l){for(j in l){if(f.hasOwnProperty(l,j)){m.prototype[j]=l[j];}}f._IEEnumFix(m.prototype,l);}},augmentObject:function(n,m){if(!m||!n){throw new Error("Absorb failed, verify dependencies.");}var j=arguments,l,o,k=j[2];if(k&&k!==true){for(l=2;l0)?f.dump(j[l],p-1):t);}else{r.push(j[l]);}r.push(q);}if(r.l ength>1){r.pop();}r.push("]");}else{r.push("{");for(l in j){if(f.hasOwnProperty(j,l)){r.push(l+m);if(f.isObject(j[l])){r.push((p>0)?f.dump(j[l],p-1):t);}else{r.push(j[l]);}r.push(q);}}if(r.length>1){r.pop();}r.push("}");}return r.join("");},substitute:function(x,y,E,l){var D,C,B,G,t,u,F=[],p,z=x.length,A="dump",r=" ",q="{",m="}",n,w;for(;;){D=x.lastIndexOf(q,z);if(D<0){break;}C=x.indexOf(m,D);if(D+1>C){break;}p=x.substring(D+1,C);G=p;u=null;B=G.indexOf(r);if(B>-1){u=G.substring(B+1);G=G.substring(0,B);}t=y[G];if(E){t=E(G,t,u);}if(f.isObject(t)){if(f.isArray(t)){t=f.dump(t,parseInt(u,10));}else{u=u||"";n=u.indexOf(A);if(n>-1){u=u.substring(4);}w=t.toString();if(w===i||n>-1){t=f.dump(t,parseInt(u,10));}else{t=w;}}}else{if(!f.isString(t)&&!f.isNumber(t)){t="~-"+F.length+"-~";F[F.length]=p;}}x=x.substring(0,D)+t+x.substring(C+1);if(l===false){z=D-1;}}for(D=F.length-1;D>=0;D=D-1){x=x.replace(new RegExp("~-"+D+"-~"),"{"+F[D]+"}","g");}return x;},trim:function(j){try{return j.replace(/^\s+ |\s+$/g,"");}catch(k){return j; -}},merge:function(){var n={},k=arguments,j=k.length,m;for(m=0;m=420){z.addEventListener("load",function(){YAHOO.log(x+" DOM2 onlo ad "+u,"info","Get");F(x,u);});}else{t=m[x];if(t.varName){v=YAHOO.util.Get.POLL_FREQ;YAHOO.log("Polling for "+t.varName[0]);t.maxattempts=YAHOO.util.Get.TIMEOUT/v;t.attempts=0;t._cache=t.varName[0].split(".");t.timer=s.later(v,t,function(w){I=this._cache;A=I.length;J=this.win;for(C=0;Cthis.maxattempts){y="Over retry limit, giving up";t.timer.cancel();q(x,y);}else{YAHOO.log(I[C]+" failed, retrying");}return;}}YAHOO.log("Safari poll complete");t.timer.cancel();F(x,u);},null,true);}else{s.later(YAHOO.util.Get.POLL_FREQ,null,F,[x,u]);else{z.onload=function(){YAHOO.log(x+" onload "+u,"info","Get");F(x,u);};}}};q=function(w,v){YAHOO.log("get failure: "+v,"warn","Get");var u=m[w],t;if(u.onFailure){t=u.scope||u.win;u.onFailure.call(t,a(u,v));}};d=function(z){if(m[z]){var t=m[z],u=t.nodes,x=u.length,C=t.win.document,A=C.getElementsByTagName("head")[0],v,y,w,B;if(t.insertBefore){v=b(t.insertBefore,z);if(v){A=v.parentNode;}}for( y=0;yhttp://yui.yahooapis.com/"+VERSION+"/build/","comboBase":"http://yui.yahooapis.com/combo?","skin":{"defaultSkin":"sam","base":"assets/skins/","path":"skin.css","after":["reset","fonts","grids","base"],"rollup ":3},dupsAllowed:["yahoo","get"],"moduleInfo":{"animation":{"type":"js","path":"animation/animation-min.js","requires":["dom","event"]},"autocomplete":{"type":"js","path":"autocomplete/autocomplete-min.js","requires":["dom","event","datasource"],"optional":["connection","animation"],"skinnable":true},"base":{"type":"css","path":"base/base-min.css","after":["reset","fonts","grids"]},"button":{"type":"js","path":"button/button-min.js","requires":["element"],"optional":["menu"],"skinnable":true},"calendar":{"type":
[jira] [Commented] (WICKET-6465) PageStore not cleared at session end
[ https://issues.apache.org/jira/browse/WICKET-6465?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16176761#comment-16176761 ] ASF subversion and git services commented on WICKET-6465: - Commit 68b24aa788b25a67cfb16bee08a85328dad7b91c in wicket's branch refs/heads/WICKET-6105-java.time from [~svenmeier] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=68b24aa ] WICKET-6465 prevent unbound during storeTouchedPages with ThreadLocal This closes #233 > PageStore not cleared at session end > > > Key: WICKET-6465 > URL: https://issues.apache.org/jira/browse/WICKET-6465 > Project: Wicket > Issue Type: Bug > Components: wicket >Affects Versions: 7.8.0 > Environment: Tomcat >Reporter: Franta Mejta >Assignee: Sven Meier >Priority: Critical > Fix For: 7.9.0, 8.0.0-M8 > > Attachments: WICKET-6465.patch > > > WICKET-6387 causes the page store not to be cleared at logout on Tomcat. The > problem is that tomcat does not call {{valueUnbound}} or {{valueBound}} when > an attribute is set to the current value (new == old). > https://github.com/apache/tomcat/blob/e28b35c9e40aeb4b7ac52a98f07ad965630e2766/java/org/apache/catalina/session/StandardSession.java#L1424 -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[38/50] [abbrv] wicket git commit: simplified example: wantAutomaticUpdate returns true anyway and is not overriden in CheckGroupSelector
simplified example: wantAutomaticUpdate returns true anyway and is not overriden in CheckGroupSelector Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2ab3e0ae Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2ab3e0ae Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2ab3e0ae Branch: refs/heads/WICKET-6105-java.time Commit: 2ab3e0ae5e41f286d72a510f827154f9cd7acf74 Parents: 2f9194a Author: Sven Meier Authored: Wed Sep 20 23:01:11 2017 +0200 Committer: Sven Meier Committed: Wed Sep 20 23:04:56 2017 +0200 -- .../examples/compref/CheckBoxSelectorPage.java | 26 ++-- 1 file changed, 2 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/2ab3e0ae/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.java -- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.java index 6e93db8..aa1bcd9 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.java @@ -58,32 +58,10 @@ public class CheckBoxSelectorPage extends WicketExamplePage checkgroup.add(new Check<>("check3", Model.of(3))); checkgroup.add(new Check<>("check4", Model.of(4))); // one selector inside the checkgroup... - checkgroup.add(new CheckGroupSelector("groupSelector") - { - private static final long serialVersionUID = 1L; - - @Override - protected boolean wantAutomaticUpdate() - { - return true; // override again to enable auto update. in - // CheckGroupSelector it is disabled for - // backwards compatibility. - } - }); + checkgroup.add(new CheckGroupSelector("groupSelector")); // ...and one selector outside the checkgroup - form.add(new CheckGroupSelector("groupSelectorOutside", checkgroup) - { - private static final long serialVersionUID = 1L; - - @Override - protected boolean wantAutomaticUpdate() - { - return true; // override again to enable auto update. in - // CheckGroupSelector it is disabled for - // backwards compatibility. - } - }); + form.add(new CheckGroupSelector("groupSelectorOutside", checkgroup)); final CheckBoxMultipleChoice choice = new CheckBoxMultipleChoice<>( "choice", Model.ofList(new ArrayList<>()), Arrays.asList(1, 2, 3, 4)); form.add(choice);
[41/50] [abbrv] wicket git commit: Wicket is compilable, tests are fails
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/resources/META-INF/NOTICE -- diff --git a/wicket-datetime/src/main/resources/META-INF/NOTICE b/wicket-datetime/src/main/resources/META-INF/NOTICE index 932e9eb..48b098e 100644 --- a/wicket-datetime/src/main/resources/META-INF/NOTICE +++ b/wicket-datetime/src/main/resources/META-INF/NOTICE @@ -8,7 +8,4 @@ released under the BSD License: http://developer.yahoo.net/yui/license.txt Copyright (c) 2010, Yahoo! Inc. - - This product includes software developed by - Joda.org (http://www.joda.org/). \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/test/java/org/apache/wicket/datetime/DateConverterTest.java -- diff --git a/wicket-datetime/src/test/java/org/apache/wicket/datetime/DateConverterTest.java b/wicket-datetime/src/test/java/org/apache/wicket/datetime/DateConverterTest.java deleted file mode 100644 index 5c9c4df..000 --- a/wicket-datetime/src/test/java/org/apache/wicket/datetime/DateConverterTest.java +++ /dev/null @@ -1,86 +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.datetime; - -import java.util.Calendar; -import java.util.Locale; - -import org.apache.wicket.util.convert.converter.CalendarConverter; -import org.joda.time.format.DateTimeFormatter; -import org.junit.Assert; -import org.junit.Test; - -/** - * Tests for {@link DateConverter} and subclasses. - * - * @author akiraly - */ -public class DateConverterTest -{ - /** -* WICKET-3598 -*/ - @Test - public void testLocaleUsed() - { - Locale locale = Locale.GERMAN; - - StyleDateConverter styleDateConverter = new StyleDateConverter("F-", false); - DateTimeFormatter styleFormatter = styleDateConverter.getFormat(locale); - - Assert.assertEquals(locale, styleFormatter.getLocale()); - - PatternDateConverter patternDateConverter = new PatternDateConverter( - styleDateConverter.getDatePattern(locale), false); - DateTimeFormatter patternFormatter = patternDateConverter.getFormat(locale); - - Assert.assertEquals(locale, patternFormatter.getLocale()); - - Calendar now = Calendar.getInstance(); - - String actual = styleDateConverter.convertToString(now.getTime(), locale); - String expected = patternDateConverter.convertToString(now.getTime(), locale); - - Assert.assertEquals(expected, actual); - } - - /** -* WICKET-3658 -*/ - @Test - public void testCalendarConverterWithDelegate() - { - Locale locale = Locale.GERMAN; - - Calendar input = Calendar.getInstance(locale); - input.clear(); - input.set(2011, Calendar.MAY, 7); - - StyleDateConverter styleDateConverter = new StyleDateConverter("F-", false); - - CalendarConverter calendarConverter = new CalendarConverter(styleDateConverter); - - String expected = styleDateConverter.convertToString(input.getTime(), locale); - String actual = calendarConverter.convertToString(input, locale); - - Assert.assertEquals(expected, actual); - - Calendar revert = calendarConverter.convertToObject(actual, locale); - - Assert.assertEquals(input, revert); - } -} http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatePickerTest.java -- diff --git a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatePickerTest.java b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatePickerTest.java deleted file mode 100644 index 478d7d4..000 --- a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatePickerT
[06/50] [abbrv] wicket git commit: WICKET-6432 added factory method for non-model targetChainingModel logs warning now if target is not serializable
WICKET-6432 added factory method for non-model targetChainingModel logs warning now if target is not serializable Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a0d20c92 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a0d20c92 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a0d20c92 Branch: refs/heads/WICKET-6105-java.time Commit: a0d20c9282be25937e4ff8f9c7c171a056ec0ff4 Parents: 2191159 Author: Sven Meier Authored: Sun Aug 6 09:24:04 2017 +0200 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 14:59:34 2017 +0300 -- .../java/org/apache/wicket/model/ChainingModel.java | 6 ++ .../apache/wicket/model/CompoundPropertyModel.java | 16 2 files changed, 22 insertions(+) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/a0d20c92/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java b/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java index 8d8df3f..fa0ca7a 100644 --- a/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java +++ b/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.model; +import java.io.Serializable; + import org.apache.wicket.Session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,6 +48,10 @@ public class ChainingModel implements IChainingModel + "in models directly as it may lead to serialization problems. " + "If you need to access a property of the session via the model use the " + "page instance as the model object and 'session.attribute' as the path."); + } else if (modelObject instanceof Serializable == false) + { + LOG.warn("It is not a good idea to reference a non-serializable instance " + + "in models directly as it may lead to serialization problems."); } target = modelObject; http://git-wip-us.apache.org/repos/asf/wicket/blob/a0d20c92/wicket-core/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java b/wicket-core/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java index 50bd4a0..6146529 100644 --- a/wicket-core/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java +++ b/wicket-core/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.model; +import java.io.Serializable; + import org.apache.wicket.Component; /** @@ -155,4 +157,18 @@ public class CompoundPropertyModel extends ChainingModel implements ICompo { return new CompoundPropertyModel<>(model); } + + /** +* Type-infering factory method +* +* @param +* the type of the model's object +* @param object +*model object +* @return {@link CompoundPropertyModel} instance +*/ + public static CompoundPropertyModel of(Z object) + { + return new CompoundPropertyModel<>(object); + } }
[37/50] [abbrv] wicket git commit: Add Maven plugin that can create and push the examples as a Docker image to https://bintray.com/apache/wicket-docker/
Add Maven plugin that can create and push the examples as a Docker image to https://bintray.com/apache/wicket-docker/ Usage: $ docker login -u -p apache-docker-wicket-docker.bintray.io $ cd wicket-examples $ mvn clean install docker:build -DpushImage -Pdocker Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2f9194a1 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2f9194a1 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2f9194a1 Branch: refs/heads/WICKET-6105-java.time Commit: 2f9194a1e52f27fcc34262c725dbb7b313f2146b Parents: 68b24aa Author: Martin Tzvetanov Grigorov Authored: Mon Sep 18 22:06:58 2017 +0300 Committer: Martin Tzvetanov Grigorov Committed: Mon Sep 18 22:06:58 2017 +0300 -- wicket-examples/pom.xml | 51 +++- 1 file changed, 50 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/2f9194a1/wicket-examples/pom.xml -- diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml index 3ba56d1..979075f 100644 --- a/wicket-examples/pom.xml +++ b/wicket-examples/pom.xml @@ -30,7 +30,11 @@ Examples displaying a component reference and several components in action. - + + +1.0.0 + + @@ -270,4 +274,49 @@ + + + + + docker + + + + com.spotify + docker-maven-plugin + ${docker-maven-plugin.version} + + apache-docker-wicket-docker.bintray.io/wicket-examples:${project.version} + tomcat:8.5-jre8-alpine + + + /usr/local/tomcat/webapps + ${project.build.directory} + wicket-examples.war + + + true + + ${project.version} + latest + + + + 4 + + + + + build + + build + + install + + + + + + +
[28/50] [abbrv] wicket git commit: WICKET-6462 When an Ajax Button is submitted, AjaxFormSubmitBehavior # onSubmit is called twice
WICKET-6462 When an Ajax Button is submitted, AjaxFormSubmitBehavior # onSubmit is called twice Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2295939c Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2295939c Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2295939c Branch: refs/heads/WICKET-6105-java.time Commit: 2295939cca8d35e47280218a41accc708d226aec Parents: 1fc1e3d Author: Andrea Del Bene Authored: Mon Sep 4 21:48:41 2017 +0200 Committer: Andrea Del Bene Committed: Mon Sep 4 21:49:57 2017 +0200 -- .../apache/wicket/ajax/form/AjaxFormSubmitBehavior.java | 7 --- .../java/org/apache/wicket/markup/html/form/Form.java| 11 +++ 2 files changed, 7 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/2295939c/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java index 3c0fbbf..0caca83 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java @@ -174,13 +174,6 @@ public abstract class AjaxFormSubmitBehavior extends AjaxEventBehavior Form form = getForm(); form.getRootForm().onFormSubmitted(submitter); - - //the target form might have wantSubmitOnParentFormSubmit returning "false" - //so it must be explicitly submitted. - if (!form.isSubmitted()) - { - form.onFormSubmitted(submitter); - } } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/2295939c/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java index 212a68f..1350e25 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java @@ -718,7 +718,7 @@ public class Form extends WebMarkupContainer */ public final void onFormSubmitted(IFormSubmitter submitter) { - markFormsSubmitted(); + markFormsSubmitted(submitter); if (handleMultiPart()) { @@ -984,18 +984,21 @@ public class Form extends WebMarkupContainer /** * Sets FLAG_SUBMITTED to true on this form and every enabled nested form. +* @param submitter */ - private void markFormsSubmitted() + private void markFormsSubmitted(IFormSubmitter submitter) { setFlag(FLAG_SUBMITTED, true); - + Form formToProcess = findFormToProcess(submitter); + visitChildren(Form.class, new IVisitor() { @Override public void component(final Component component, final IVisit visit) { Form form = (Form)component; - if (form.wantSubmitOnParentFormSubmit() && form.isEnabledInHierarchy() && form.isVisibleInHierarchy()) + if ((form.wantSubmitOnParentFormSubmit() || form == formToProcess) + && form.isEnabledInHierarchy() && form.isVisibleInHierarchy()) { form.setFlag(FLAG_SUBMITTED, true); return;
[48/50] [abbrv] wicket git commit: Wicket is compilable, tests are fails
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/calendar.js -- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/calendar.js b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/calendar.js deleted file mode 100644 index 05ce3ce..000 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/calendar.js +++ /dev/null @@ -1,7390 +0,0 @@ -/* -Copyright (c) 2011, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.com/yui/license.html -version: 2.9.0 -*/ -(function () { - -/** -* Config is a utility used within an Object to allow the implementer to -* maintain a list of local configuration properties and listen for changes -* to those properties dynamically using CustomEvent. The initial values are -* also maintained so that the configuration can be reset at any given point -* to its initial state. -* @namespace YAHOO.util -* @class Config -* @constructor -* @param {Object} owner The owner Object to which this Config Object belongs -*/ -YAHOO.util.Config = function (owner) { - -if (owner) { -this.init(owner); -} - - -}; - - -var Lang = YAHOO.lang, -CustomEvent = YAHOO.util.CustomEvent, -Config = YAHOO.util.Config; - - -/** - * Constant representing the CustomEvent type for the config changed event. - * @property YAHOO.util.Config.CONFIG_CHANGED_EVENT - * @private - * @static - * @final - */ -Config.CONFIG_CHANGED_EVENT = "configChanged"; - -/** - * Constant representing the boolean type string - * @property YAHOO.util.Config.BOOLEAN_TYPE - * @private - * @static - * @final - */ -Config.BOOLEAN_TYPE = "boolean"; - -Config.prototype = { - -/** -* Object reference to the owner of this Config Object -* @property owner -* @type Object -*/ -owner: null, - -/** -* Boolean flag that specifies whether a queue is currently -* being executed -* @property queueInProgress -* @type Boolean -*/ -queueInProgress: false, - -/** -* Maintains the local collection of configuration property objects and -* their specified values -* @property config -* @private -* @type Object -*/ -config: null, - -/** -* Maintains the local collection of configuration property objects as -* they were initially applied. -* This object is used when resetting a property. -* @property initialConfig -* @private -* @type Object -*/ -initialConfig: null, - -/** -* Maintains the local, normalized CustomEvent queue -* @property eventQueue -* @private -* @type Object -*/ -eventQueue: null, - -/** -* Custom Event, notifying subscribers when Config properties are set -* (setProperty is called without the silent flag -* @event configChangedEvent -*/ -configChangedEvent: null, - -/** -* Initializes the configuration Object and all of its local members. -* @method init -* @param {Object} owner The owner Object to which this Config -* Object belongs -*/ -init: function (owner) { - -this.owner = owner; - -this.configChangedEvent = -this.createEvent(Config.CONFIG_CHANGED_EVENT); - -this.configChangedEvent.signature = CustomEvent.LIST; -this.queueInProgress = false; -this.config = {}; -this.initialConfig = {}; -this.eventQueue = []; - -}, - -/** -* Validates that the value passed in is a Boolean. -* @method checkBoolean -* @param {Object} val The value to validate -* @return {Boolean} true, if the value is valid -*/ -checkBoolean: function (val) { -return (typeof val == Config.BOOLEAN_TYPE); -}, - -/** -* Validates that the value passed in is a number. -* @method checkNumber -* @param {Object} val The value to validate -* @return {Boolean} true, if the value is valid -*/ -checkNumber: function (val) { -return (!isNaN(val)); -}, - -/** -* Fires a configuration property event using the specified value. -* @method fireEvent -* @private -* @param {String} key The configuration property's name -* @param {value} Object The v
[24/50] [abbrv] wicket git commit: WICKET-6451 enhance support for unmodifiable or null sets
WICKET-6451 enhance support for unmodifiable or null sets Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/10f5f76e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/10f5f76e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/10f5f76e Branch: refs/heads/WICKET-6105-java.time Commit: 10f5f76e5d84a85a8aa260b1fd0502bb29a3cc7e Parents: 7646010 Author: Sven Meier Authored: Thu Aug 31 11:28:43 2017 +0200 Committer: Sven Meier Committed: Thu Aug 31 11:28:43 2017 +0200 -- .../wicket/markup/html/form/FormComponent.java | 33 +++- .../html/form/CollectionFormComponentTest.java | 81 +--- 2 files changed, 102 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/10f5f76e/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java index 9d4460e..37722d8 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; @@ -42,12 +43,14 @@ import org.apache.wicket.core.util.lang.WicketObjects; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.html.form.AutoLabelResolver.AutoLabelMarker; import org.apache.wicket.model.IModel; +import org.apache.wicket.model.IObjectClassAwareModel; import org.apache.wicket.model.IPropertyReflectionAwareModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; import org.apache.wicket.util.convert.IConverter; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.lang.Classes; +import org.apache.wicket.util.lang.Objects; import org.apache.wicket.util.string.StringList; import org.apache.wicket.util.string.StringValue; import org.apache.wicket.util.string.Strings; @@ -1575,7 +1578,7 @@ public abstract class FormComponent extends LabeledWebMarkupContainer impleme /** * Update the model of a {@link FormComponent} containing a {@link Collection}. * -* If the model object does not yet exists, a new {@link ArrayList} is filled with the converted +* If the model object does not yet exists, a new suitable collection is filled with the converted * input and used as the new model object. Otherwise the existing collection is modified * in-place, then {@link Model#setObject(Object)} is called with the same instance: it allows * the Model to be notified of changes even when {@link Model#getObject()} returns a different @@ -1599,7 +1602,14 @@ public abstract class FormComponent extends LabeledWebMarkupContainer impleme Collection collection = formComponent.getModelObject(); if (collection == null) { - collection = new ArrayList<>(convertedInput); + Class hint = null; + if (formComponent.getModel() instanceof IObjectClassAwareModel) { + hint = ((IObjectClassAwareModel)formComponent.getModel()).getObjectClass(); + } + if (hint == null) { + hint = List.class; + } + collection = newCollection(hint, convertedInput); formComponent.setModelObject(collection); } else @@ -1621,7 +1631,7 @@ public abstract class FormComponent extends LabeledWebMarkupContainer impleme logger.debug("An error occurred while trying to modify the collection attached to " + formComponent, unmodifiable); } - collection = new ArrayList<>(convertedInput); + collection = newCollection(collection.getClass(), convertedInput); } try @@ -1645,4 +1655,21 @@ public abstract class FormComponent extends LabeledWebMarkupContainer impleme formComponent.modelChanged(); } } + + /** +* Creates a new collection. +* +* @p
[18/50] [abbrv] wicket git commit: Added a note about the Marckdown version of the new release's announce
Added a note about the Marckdown version of the new release's announce Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d851788a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d851788a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d851788a Branch: refs/heads/WICKET-6105-java.time Commit: d851788ab5fcbf648eec33eb479a608823c01409 Parents: dc1e9f8 Author: Andrea Del Bene Authored: Mon Aug 7 12:00:33 2017 +0200 Committer: Andrea Del Bene Committed: Mon Aug 7 12:03:36 2017 +0200 -- release.sh | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/d851788a/release.sh -- diff --git a/release.sh b/release.sh index 242e11d..2eb352a 100755 --- a/release.sh +++ b/release.sh @@ -612,6 +612,9 @@ Use the release-announce.txt as a starter for the release announcement: cat release-announce.txt | pbcopy +A Markdown file called wicket-$version-released.md has been also generated. +You can use it to update the site with the release announcement. + To promote the release after a successful vote, run: $ ./promote-$version.sh
[16/50] [abbrv] wicket git commit: Reduced degree of nesting and also didn't mess up the indentation all over the place
Reduced degree of nesting and also didn't mess up the indentation all over the place Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2f23607e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2f23607e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2f23607e Branch: refs/heads/WICKET-6105-java.time Commit: 2f23607e13fb3582e84874f57a8a3ec6b7cc5a98 Parents: f2a23b8 Author: Domas Poliakas Authored: Thu Aug 3 09:04:52 2017 +0100 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 15:27:21 2017 +0300 -- .../wicket/util/tester/BaseWicketTester.java| 26 +--- 1 file changed, 12 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/2f23607e/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 ce8bc08..b0263c7 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 @@ -2328,26 +2328,24 @@ public class BaseWicketTester failMessage = "Component wasn't found in the AJAX response. " + componentInfo; result = isTrue(failMessage, isComponentInAjaxResponse); - if (result.wasFailed()){ - // Check if the component has been included as part of an enclosure render - Enclosure enclosure = getLastRenderedPage().visitChildren(Enclosure.class, (Enclosure enc, IVisit visit) -> { - if (AjaxEnclosureListener.isControllerOfEnclosure(component, enc)){ - visit.stop(enc); - } - }); + if (!result.wasFailed()) { + return result; + } - if (enclosure != null){ - failMessage = "Component's enclosure was not found in the AJAX response. " + enclosure; - boolean isEnclosureInAjaxResponse = !isComponentOnAjaxResponse(enclosure).wasFailed(); - return isTrue(failMessage, isEnclosureInAjaxResponse); - } else { - return result; + // Check if the component has been included as part of an enclosure render + Enclosure enclosure = getLastRenderedPage().visitChildren(Enclosure.class, (Enclosure enc, IVisit visit) -> { + if (AjaxEnclosureListener.isControllerOfEnclosure(component, enc)){ + visit.stop(enc); } + }); - } else { + if (enclosure == null) { return result; } + failMessage = "Component's enclosure was not found in the AJAX response. " + enclosure; + boolean isEnclosureInAjaxResponse = !isComponentOnAjaxResponse(enclosure).wasFailed(); + return isTrue(failMessage, isEnclosureInAjaxResponse); }
[17/50] [abbrv] wicket git commit: Added CHANGELOG for release 8.0.0-M7
Added CHANGELOG for release 8.0.0-M7 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/dc1e9f81 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/dc1e9f81 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/dc1e9f81 Branch: refs/heads/WICKET-6105-java.time Commit: dc1e9f816d2318470ccba11b76ec7618b826b10a Parents: 2f23607 Author: Andrea Del Bene Authored: Mon Aug 7 11:50:01 2017 +0200 Committer: Andrea Del Bene Committed: Mon Aug 7 11:50:01 2017 +0200 -- CHANGELOG-8.x | 43 +++ 1 file changed, 43 insertions(+) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/dc1e9f81/CHANGELOG-8.x -- diff --git a/CHANGELOG-8.x b/CHANGELOG-8.x index e297fbf..5fd4d1c 100644 --- a/CHANGELOG-8.x +++ b/CHANGELOG-8.x @@ -2,6 +2,49 @@ This file contains all changes done in releases for Apache Wicket 8.x. === +Release Notes - Wicket - Version 8.0.0-M7 + +** Bug + +* [WICKET-4324] - [wicket-ioc] LazyInitProxyFactory CGLIB proxies naming strategy may cause java.lang.IllegalAccessError +* [WICKET-6366] - Autocomplete race condition makes page unresponsive +* [WICKET-6373] - Edge not recognized in UserAgent +* [WICKET-6374] - Exception caused by border extending another border with +* [WICKET-6376] - Ajax redirects to non http(s)-urls are interpreted as relative +* [WICKET-6377] - Autolinking breaks hierarchy for nested elements +* [WICKET-6379] - IModel's default models should detach the target model +* [WICKET-6386] - Simplification of the code in WICKET-3347 is not consistent with previous behavior +* [WICKET-6387] - ModalWindow PageReference broken +* [WICKET-6393] - NestedStringResourceLoader ignores hard-coded default values and throws MissingResourceException +* [WICKET-6398] - WICKET-6204 breaks jQuery.noConflict() +* [WICKET-6399] - Dequeuing of Border component with nested body fails +* [WICKET-6400] - Object with array property fails on NPE when construction JSON object +* [WICKET-6402] - OSGi-Manifest: wicket does not declare BSN +* [WICKET-6406] - Each path has to be pushed directly +* [WICKET-6419] - Localization of PageParameters +* [WICKET-6428] - PageProvider#getPageInstance() may return null +* [WICKET-6429] - AbstractRequestLogger should not create new Sessions +* [WICKET-6434] - Fixed WicketTester to detect components in enclosure when doing isComponentOnAjaxResponse. + +** Improvement + +* [WICKET-6372] - Consider to switch to a sans-serif typeface in the Wicket guide +* [WICKET-6385] - Allow using custom port for web socket connections +* [WICKET-6388] - MockServletContext should define non-null session tracking modes +* [WICKET-6389] - Introduce CsrfPreventionRequestCycleListener that is aware of Web Socket requests +* [WICKET-6401] - OSGi-Manifest: wicket-util should decalre its dependency to 'commons-io' and 'commons-fileupload' +* [WICKET-6412] - Model#orElse behavior is inconsistent! +* [WICKET-6421] - WicketTester should provide assertBehavior method +* [WICKET-6433] - Allow to set the rel attribute with CssHeaderItem +* [WICKET-6436] - Please add CompoundPropertyModel.of(T object) method +* [WICKET-6437] - Libraries should be updated to most recent versions + +** Task + +* [WICKET-6390] - Update Tomcat to 8.5.15 to get the latest HTTP2 features and APIs + +=== + Release Notes - Wicket - Version 8.0.0-M6 ** Bug
[42/50] [abbrv] wicket git commit: Wicket is compilable, tests are fails
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yuiloader/yuiloader.js -- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yuiloader/yuiloader.js b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yuiloader/yuiloader.js deleted file mode 100644 index a63c6d9..000 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yuiloader/yuiloader.js +++ /dev/null @@ -1,4065 +0,0 @@ -/* -Copyright (c) 2011, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.com/yui/license.html -version: 2.9.0 -*/ -/** - * The YAHOO object is the single global object used by YUI Library. It - * contains utility function for setting up namespaces, inheritance, and - * logging. YAHOO.util, YAHOO.widget, and YAHOO.example are namespaces - * created automatically for and used by the library. - * @module yahoo - * @title YAHOO Global - */ - -/** - * YAHOO_config is not included as part of the library. Instead it is an - * object that can be defined by the implementer immediately before - * including the YUI library. The properties included in this object - * will be used to configure global properties needed as soon as the - * library begins to load. - * @class YAHOO_config - * @static - */ - -/** - * A reference to a function that will be executed every time a YAHOO module - * is loaded. As parameter, this function will receive the version - * information for the module. See - * YAHOO.env.getVersion for the description of the version data structure. - * @property listener - * @type Function - * @static - * @default undefined - */ - -/** - * Set to true if the library will be dynamically loaded after window.onload. - * Defaults to false - * @property injecting - * @type boolean - * @static - * @default undefined - */ - -/** - * Instructs the yuiloader component to dynamically load yui components and - * their dependencies. See the yuiloader documentation for more information - * about dynamic loading - * @property load - * @static - * @default undefined - * @see yuiloader - */ - -/** - * Forces the use of the supplied locale where applicable in the library - * @property locale - * @type string - * @static - * @default undefined - */ - -if (typeof YAHOO == "undefined" || !YAHOO) { -/** - * The YAHOO global namespace object. If YAHOO is already defined, the - * existing YAHOO object will not be overwritten so that defined - * namespaces are preserved. - * @class YAHOO - * @static - */ -var YAHOO = {}; -} - -/** - * Returns the namespace specified and creates it if it doesn't exist - * - * YAHOO.namespace("property.package"); - * YAHOO.namespace("YAHOO.property.package"); - * - * Either of the above would create YAHOO.property, then - * YAHOO.property.package - * - * Be careful when naming packages. Reserved words may work in some browsers - * and not others. For instance, the following will fail in Safari: - * - * YAHOO.namespace("really.long.nested.namespace"); - * - * This fails because "long" is a future reserved word in ECMAScript - * - * For implementation code that uses YUI, do not create your components - * in the namespaces defined by YUI ( - * YAHOO.util, - * YAHOO.widget, - * YAHOO.lang, - * YAHOO.tool, - * YAHOO.example, - * YAHOO.env) -- create your own namespace (e.g., 'companyname'). - * - * @method namespace - * @static - * @param {String*} arguments 1-n namespaces to create - * @return {Object} A reference to the last namespace object created - */ -YAHOO.namespace = function() { -var a=arguments, o=null, i, j, d; -for (i=0; i - * name: The name of the module - * version: The version in use - * build: The build number in use - * versions: All versions that were registered - * builds:All builds that were registered. - * mainClass: An object that was was stamped with the - * current version and build. If - * mainClass.VERSION != version or mainClass.BUILD != build, - * multiple versions of pieces of the library have been - * loaded, potentially causing issues. - * - * - * @method getVersion - * @static - * @param {String} name the name of the module (event, slider, etc) - * @return {Object} The version info - */ -YAHOO.env.getVersion = function(name) { -return YAHOO.env.modules[name] || null; -}; - -/** - * Do not fork for a browser if it can be avoided. Use feature detection when - * you can. Use the user agent as a last resort. YAHOO.env.ua stores a version - * number for the browser engine, 0 otherwise. This value may or may not map - * to the version number of the browser using the engine. The value is - * presented as a float so that it can easily be used for boolean evaluation - * as well as for l
[13/50] [abbrv] wicket git commit: Forgot to add a license
Forgot to add a license Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/aeda988d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/aeda988d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/aeda988d Branch: refs/heads/WICKET-6105-java.time Commit: aeda988d3a46de753a5a2fca9778ea7d99e3f782 Parents: 4158b8c Author: Domas Poliakas Authored: Thu Jul 27 14:27:26 2017 +0100 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 15:27:21 2017 +0300 -- .../tester/MockPageWithLabelInEnclosure.java| 20 +++- 1 file changed, 19 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/aeda988d/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.java -- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.java index b2f09f1..06e6ca2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.java @@ -1,3 +1,19 @@ +/* + * 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.util.tester; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -6,7 +22,9 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; /** - * Created by dpoliakas on 27/07/2017. + * Mock page which has an ajax link in an enclosure. Clicking the link invokes ajax rendering the link again. + * + * @author Domas Poliakas (disblader) */ public class MockPageWithLabelInEnclosure extends WebPage {
[20/50] [abbrv] wicket git commit: WICKET-6438 8.x reference guide needs a few minor improvements
WICKET-6438 8.x reference guide needs a few minor improvements Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/075d8371 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/075d8371 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/075d8371 Branch: refs/heads/WICKET-6105-java.time Commit: 075d8371ef3eb2e5f3bdadf008ae904cafd222b3 Parents: 2cb93c3 Author: ozeray Authored: Sun Aug 6 03:12:03 2017 +0300 Committer: Andrea Del Bene Committed: Sat Aug 12 17:13:05 2017 +0200 -- .../src/main/asciidoc/contributing.adoc | 16 ++- .../src/main/asciidoc/helloWorld.adoc | 1 - .../main/asciidoc/helloWorld/helloWorld_2.adoc | 2 +- .../main/asciidoc/helloWorld/helloWorld_3.adoc | 2 +- .../src/main/asciidoc/img/comsysto-logo.png | Bin 9926 -> 12166 bytes .../main/asciidoc/img/page-panel-hierarchy.png | Bin 161128 -> 75309 bytes .../src/main/asciidoc/introduction.adoc | 6 ++-- .../asciidoc/keepControl/keepControl_1.adoc | 2 +- .../asciidoc/keepControl/keepControl_2.adoc | 4 +-- .../asciidoc/keepControl/keepControl_4.adoc | 10 --- .../asciidoc/keepControl/keepControl_5.adoc | 23 --- .../src/main/asciidoc/layout/layout_2.adoc | 4 +-- .../src/main/asciidoc/layout/layout_4.adoc | 20 ++--- .../asciidoc/wicketstuff/wicketstuff_1.adoc | 28 +-- 14 files changed, 79 insertions(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/075d8371/wicket-user-guide/src/main/asciidoc/contributing.adoc -- diff --git a/wicket-user-guide/src/main/asciidoc/contributing.adoc b/wicket-user-guide/src/main/asciidoc/contributing.adoc index fab207f..e338e23 100644 --- a/wicket-user-guide/src/main/asciidoc/contributing.adoc +++ b/wicket-user-guide/src/main/asciidoc/contributing.adoc @@ -3,23 +3,25 @@ You can contribute to this guide by following these steps: * The guide uses AsciiDoctor to generate the final HTML/PDF so you should consult with its http://asciidoctor.org[syntax] -* Clone Apache Wicket's GIT repository https://github.com/apache/wicket.git[site] +* Fork Apache Wicket's GIT https://github.com/apache/wicket.git[repository] to your own github account. + +* Clone your forked copy of Apache Wicket's repository into your machine [source,java] -git clone https://github.com/apache/wicket.git +git clone https://github.com/<>/wicket.git * Edit the _.adoc_ files in `wicket/wicket-user-guide/src/main/asciidoctor` folder -* To preview your changes run _mvn clean package -P guide_ in the `wicket/wicket-user-guide` folder (in eclipse use a run configuration) +* To preview your changes run _mvn clean package -P guide_ in the `wicket/wicket-user-guide` folder (You may use a run configuration in your IDE) -* Navigate to _wicket/wicket-user-guide/target/guide/8.x_ and open one of the following files in a browser / pdf viewer: -** _guide/single.html_ (single page version) -** _guide/single.pdf_ (single page pdf version) +* Navigate to _wicket/wicket-user-guide/target/generated-docs_ and open one of the following files in a browser / pdf viewer: +** _single.html_ (single page version) +** _single.pdf_ (single page pdf version) * Create a ticket in Apache Wicket's https://issues.apache.org/jira/browse/WICKET[JIRA] -* *Commit and push the changes* to your forked Apache Wicket's GIT repository and *create a pull request* on github +* *Commit and push the changes* to your forked Apache Wicket's GIT repository and *create a pull request* on github (Enter the created JIRA ticket id into your pull request's title) *Thank you!* http://git-wip-us.apache.org/repos/asf/wicket/blob/075d8371/wicket-user-guide/src/main/asciidoc/helloWorld.adoc -- diff --git a/wicket-user-guide/src/main/asciidoc/helloWorld.adoc b/wicket-user-guide/src/main/asciidoc/helloWorld.adoc index b50e96c..52bec1b 100644 --- a/wicket-user-guide/src/main/asciidoc/helloWorld.adoc +++ b/wicket-user-guide/src/main/asciidoc/helloWorld.adoc @@ -4,7 +4,6 @@ Both frameworks share the same component-based architecture: in AWT we have a _W image::../img/uml-component.png[] -["plantuml", "uml-component", "svg"] @startuml package java.awt { http://git-wip-us.apache.org/repos/asf/wicket/blob/075d8371/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_2.adoc -- diff --git a/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_2.adoc b/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_2.adoc index f2b3c52..356f536 100644 --- a/wicket-user-guide/src
[31/50] [abbrv] wicket git commit: Refactored for better comprehension
Refactored for better comprehension (cherry picked from commit bbe25098439394541f1acf8f15e4b2442b54674a) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0d627810 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0d627810 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0d627810 Branch: refs/heads/WICKET-6105-java.time Commit: 0d62781071b3fbc2d1982419d55ec6bfdc62e626 Parents: c4a92df Author: Domas Poliakas Authored: Mon Sep 4 20:07:40 2017 +0100 Committer: Martin Tzvetanov Grigorov Committed: Tue Sep 5 00:10:08 2017 +0300 -- .../AbstractHeaderRenderStrategy.java | 55 --- .../ChildFirstHeaderRenderStrategyTest.java | 5 +- .../renderStrategy/EnclosureAjaxRenderPage.html | 16 ++ .../renderStrategy/EnclosureAjaxRenderPage.java | 56 .../markup/renderStrategy/SimplePage3.html | 16 -- .../markup/renderStrategy/SimplePage3.java | 56 6 files changed, 110 insertions(+), 94 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/0d627810/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java index 91d5fd1..25ab204 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java @@ -18,6 +18,7 @@ package org.apache.wicket.markup.renderStrategy; import org.apache.wicket.Application; import org.apache.wicket.Component; +import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.application.HeaderContributorListenerCollection; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.IHeaderContributor; @@ -122,28 +123,44 @@ public abstract class AbstractHeaderRenderStrategy implements IHeaderRenderStrat rootComponent.internalRenderHead(headerContainer); - // If the root component is an inline enclosure, then we force header render of its controller as well; normally - // this would not trigger because the controller is a sibling of the enclosure if (rootComponent instanceof InlineEnclosure) { - InlineEnclosure typedComponent = (InlineEnclosure) rootComponent; - - final String childId = typedComponent.getChildId(); - - // Visit the siblings of the enclosure to attempt and find the controller of the enclosure - Component enclosureController = typedComponent.getParent().visitChildren(new IVisitor() { - @Override - public void component(Component object, IVisit visit) { - if (object.getId().equals(childId)){ - visit.stop(object); - } else { - visit.dontGoDeeper(); - } - } - }); + renderInlineEnclosure(headerContainer, (InlineEnclosure) rootComponent); + } + } + - if (enclosureController != null){ - enclosureController.internalRenderHead(headerContainer); + /** +* Searches for the siblings of the given enclosure for the controller of the given enclosure and +* renders that controller's header contributions. +* +* This is done explicitly because when an enclosed component is added to the {@link AjaxRequestTarget} +* and is consequently replaced for render by the enclosure, the component's header contributions would not make +* it to the response as the enclosure is a sibling of the component in the hierarchy and only children's header contributions +* are added to the response. +* +* Fixes WICKET-6459 +* +* @param container the header container to render the header contributions of the enclosure's controller +* @param enclosure the enclosure whose controller's contributions are going to be rendered +*/ + protected void renderInlineEnclosure(HtmlHeaderContainer container, InlineEnclosure enclosure){ + + final String childId = enclosure.getChildId(); + +
[25/50] [abbrv] wicket git commit: Added documentation for stream-based children iteration.
Added documentation for stream-based children iteration. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b088c696 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b088c696 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b088c696 Branch: refs/heads/WICKET-6105-java.time Commit: b088c6967cb4f1cef7eb95995561adc12a7bdcd1 Parents: 10f5f76 Author: Andrea Del Bene Authored: Mon Sep 4 11:35:31 2017 +0200 Committer: Andrea Del Bene Committed: Mon Sep 4 11:35:31 2017 +0200 -- wicket-user-guide/src/main/asciidoc/layout/layout_2.adoc | 2 +- wicket-user-guide/src/main/asciidoc/single.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/b088c696/wicket-user-guide/src/main/asciidoc/layout/layout_2.adoc -- diff --git a/wicket-user-guide/src/main/asciidoc/layout/layout_2.adoc b/wicket-user-guide/src/main/asciidoc/layout/layout_2.adoc index ec71d00..0e28723 100644 --- a/wicket-user-guide/src/main/asciidoc/layout/layout_2.adoc +++ b/wicket-user-guide/src/main/asciidoc/layout/layout_2.adoc @@ -42,7 +42,7 @@ Label name = (Label)get("innerContainer:name"); * replace a specific child component with a new component having the same id (with method _replace_). -* iterate thought children components with the iterator returned by method _iterator_ or using visitor pattern with methods _visitChildren_. +* iterate thought children components. This can be done in the old way (pre-Wicket 8) using method _iterator_ or using visitor pattern with method _visitChildren_. Starting from Wicket 8 the same task can be accomplished using the _stream_ object returned by methods _stream_ (which contains only the direct children) and _streamChildren_ (which contains all children). Both _Panel_ and _WebPage_ have their own associated markup file which is used to render the corresponding component. If such file is not provided, Wicket will apply markup inheritance looking for a markup file through their ancestor classes. When a panel is attached to a container, the content of its markup file is inserted into its related tag. http://git-wip-us.apache.org/repos/asf/wicket/blob/b088c696/wicket-user-guide/src/main/asciidoc/single.adoc -- diff --git a/wicket-user-guide/src/main/asciidoc/single.adoc b/wicket-user-guide/src/main/asciidoc/single.adoc index 1dc1f22..4fc1464 100644 --- a/wicket-user-guide/src/main/asciidoc/single.adoc +++ b/wicket-user-guide/src/main/asciidoc/single.adoc @@ -8,7 +8,7 @@ The Apache Software Foundation //custom variables used inside the guide :wicket_examples_url: http://examples8x.wicket.apache.org -:wicket_tutorial_examples_url: http://examples-wickettutorial.rhcloud.com/ +:wicket_tutorial_examples_url: https://wicket-guide.herokuapp.com/ == Introduction include::introduction.adoc[]
[07/50] [abbrv] wicket git commit: Library versions are updated
Library versions are updated Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2191159c Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2191159c Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2191159c Branch: refs/heads/WICKET-6105-java.time Commit: 2191159c0eb6086656c1d26203821ee0d61aaaee Parents: 1408c94 Author: Maxim Solodovnik Authored: Sat Aug 5 22:08:45 2017 +0700 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 14:59:34 2017 +0300 -- pom.xml | 24 testing/wicket-arquillian/pom.xml | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/2191159c/pom.xml -- diff --git a/pom.xml b/pom.xml index ec0b726..fdbc63e 100644 --- a/pom.xml +++ b/pom.xml @@ -126,10 +126,10 @@ 3.2.5 0.7.9 - 9.4.5.v20170502 + 9.4.6.v20170531 2.9.9 4.12 - 4.3.8.RELEASE + 4.3.10.RELEASE 3.1.0 2.10.4 2.20 @@ -137,9 +137,9 @@ 1.7.25 2.8.2 2.0.0.0 - 2.5.1 + 2.6 1.8.10 - 3.2.2 + 3.2.3 @@ -147,7 +147,7 @@ com.google.code.findbugs jsr305 - 3.0.1 + 3.0.2 provided @@ -176,7 +176,7 @@ javax.validation validation-api - 1.1.0.Final + 2.0.0.Final provided @@ -224,7 +224,7 @@ com.fasterxml.jackson.core jackson-databind - 2.8.8 + 2.9.0 true @@ -235,7 +235,7 @@ commons-fileupload commons-fileupload - 1.3.2 + 1.3.3 commons-io @@ -266,7 +266,7 @@ org.apache.commons commons-lang3 - 3.5 + 3.6 org.apache.velocity @@ -428,13 +428,13 @@ org.danekja jdk-serializable-functional - 1.8.2 + 1.8.3 jar com.github.openjson openjson - 1.0.7 + 1.0.8 jar @@ -538,7 +538,7 @@ org.hibernate hibernate-validator - 5.3.4.Final + 6.0.1.Final test http://git-wip-us.apache.org/repos/asf/wicket/blob/2191159c/testing/wicket-arquillian/pom.xml -- diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml index 73d148d..94613da 100644 --- a/testing/wicket-arquillian/pom.xml +++ b/testing/wicket-arquillian/pom.xml @@ -42,12 +42,12 @@ 11091 - 1.1.12.Final + 1.1.13.Final 2.10 UTF-8 8.2.1.Final 1.0.2.Final - 1.0.3.Final + 1.1.0.Final
[32/50] [abbrv] wicket git commit: WICKET-6440 SecuredRemoteAddressRequestWrapperFactory doesn't make request secure
WICKET-6440 SecuredRemoteAddressRequestWrapperFactory doesn't make request secure Use the wrapped request in the logging of the new secure state (cherry picked from commit 18a1c2f9ea793a6707b30644f14a63a5edafcbc4) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/48f45809 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/48f45809 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/48f45809 Branch: refs/heads/WICKET-6105-java.time Commit: 48f45809154558c1a6edba35f7211a0fd3f196ac Parents: 0d62781 Author: Martin Tzvetanov Grigorov Authored: Tue Sep 5 00:32:03 2017 +0300 Committer: Martin Tzvetanov Grigorov Committed: Tue Sep 5 00:33:07 2017 +0300 -- .../servlet/SecuredRemoteAddressRequestWrapperFactory.java | 9 + 1 file changed, 1 insertion(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/48f45809/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java index caeaf56..eb1dbae 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java @@ -93,7 +93,6 @@ public class SecuredRemoteAddressRequestWrapperFactory extends AbstractRequestWr private final static String SECURED_REMOTE_ADDRESSES_PARAMETER = "securedRemoteAddresses"; - /** */ public static class Config { /** @see #setSecuredRemoteAdresses(String) */ @@ -147,9 +146,6 @@ public class SecuredRemoteAddressRequestWrapperFactory extends AbstractRequestWr this.config = config; } - /** -* {@inheritDoc} -*/ @Override public HttpServletRequest getWrapper(final HttpServletRequest request) { @@ -159,15 +155,12 @@ public class SecuredRemoteAddressRequestWrapperFactory extends AbstractRequestWr { log.debug("Incoming request uri=" + request.getRequestURI() + " with originalSecure='" + request.isSecure() + "', remoteAddr='" + request.getRemoteAddr() + - "' will be seen with newSecure='" + request.isSecure() + "'"); + "' will be seen with newSecure='" + xRequest.isSecure() + "'"); } return xRequest; } - /** -* {@inheritDoc} -*/ @Override public boolean needsWrapper(final HttpServletRequest request) {
[jira] [Commented] (WICKET-6105) Decommission wicket-datetime
[ https://issues.apache.org/jira/browse/WICKET-6105?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16176763#comment-16176763 ] ASF subversion and git services commented on WICKET-6105: - Commit a9b06ca2e23a76dd99c3e77f3fc4e9aa17a2f815 in wicket's branch refs/heads/WICKET-6105-java.time from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=a9b06ca ] Merge branch 'master' into WICKET-6105-java.time > Decommission wicket-datetime > > > Key: WICKET-6105 > URL: https://issues.apache.org/jira/browse/WICKET-6105 > Project: Wicket > Issue Type: Task > Components: wicket, wicket-datetime >Affects Versions: 8.0.0-M1 >Reporter: Martin Grigorov >Assignee: Martin Grigorov > > Discussion at dev@: http://markmail.org/message/uqu6gfma6wihwcwt > The idea is to: > * preserve DateConverter classes in wicket-util (and use Java 8 java.time.** > classes instead of Joda-Time). > * move DateLabel to wicket-extensions > * synch -datetime's DateTextField with -extensions' DateTextField > * move everything else in WicketStuff project so existing applications could > easily migrate to Wicket 8 -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[45/50] [abbrv] wicket git commit: Wicket is compilable, tests are fails
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/event/event.js -- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/event/event.js b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/event/event.js deleted file mode 100644 index 3b5c86d..000 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/event/event.js +++ /dev/null @@ -1,2537 +0,0 @@ -/* -Copyright (c) 2011, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.com/yui/license.html -version: 2.9.0 -*/ - -/** - * The CustomEvent class lets you define events for your application - * that can be subscribed to by one or more independent component. - * - * @param {String} type The type of event, which is passed to the callback - * when the event fires - * @param {Object} context The context the event will fire from. "this" will - * refer to this object in the callback. Default value: - * the window object. The listener can override this. - * @param {boolean} silent pass true to prevent the event from writing to - * the debugsystem - * @param {int} signature the signature that the custom event subscriber - * will receive. YAHOO.util.CustomEvent.LIST or - * YAHOO.util.CustomEvent.FLAT. The default is - * YAHOO.util.CustomEvent.LIST. - * @param fireOnce {boolean} If configured to fire once, the custom event - * will only notify subscribers a single time regardless of how many times - * the event is fired. In addition, new subscribers will be notified - * immediately if the event has already been fired. - * @namespace YAHOO.util - * @class CustomEvent - * @constructor - */ -YAHOO.util.CustomEvent = function(type, context, silent, signature, fireOnce) { - -/** - * The type of event, returned to subscribers when the event fires - * @property type - * @type string - */ -this.type = type; - -/** - * The context the event will fire from by default. Defaults to the window obj. - * @property scope - * @type object - */ -this.scope = context || window; - -/** - * By default all custom events are logged in the debug build. Set silent to true - * to disable debug output for this event. - * @property silent - * @type boolean - */ -this.silent = silent; - -/** - * If configured to fire once, the custom event will only notify subscribers - * a single time regardless of how many times the event is fired. In addition, - * new subscribers will be notified immediately if the event has already been - * fired. - * @property fireOnce - * @type boolean - * @default false - */ -this.fireOnce = fireOnce; - -/** - * Indicates whether or not this event has ever been fired. - * @property fired - * @type boolean - * @default false - */ -this.fired = false; - -/** - * For fireOnce events the arguments the event was fired with are stored - * so that new subscribers get the proper payload. - * @property firedWith - * @type Array - */ -this.firedWith = null; - -/** - * Custom events support two styles of arguments provided to the event - * subscribers. - * - * YAHOO.util.CustomEvent.LIST: - * - * param1: event name - * param2: array of arguments sent to fire - * param3: a custom object supplied by the subscriber - * - * - * YAHOO.util.CustomEvent.FLAT - * - * param1: the first argument passed to fire. If you need to - * pass multiple parameters, use and array or object literal - * param2: a custom object supplied by the subscriber - * - * - * - * @property signature - * @type int - */ -this.signature = signature || YAHOO.util.CustomEvent.LIST; - -/** - * The subscribers to this event - * @property subscribers - * @type Subscriber[] - */ -this.subscribers = []; - -if (!this.silent) { -} - -var onsubscribeType = "_YUICEOnSubscribe"; - -// Only add subscribe events for events that are not generated by -// CustomEvent -if (type !== onsubscribeType) { - -/** - * Custom events provide a custom event that fires whenever there is - * a new subscriber to the event. This provides an opportunity to - * handle the case where there is a non-repeating event that has - * already fired has a new subscriber. - * - * @event subscribeEvent - * @type YAHOO.util.CustomEvent - * @param fn {Function} The function to execute - * @param obj An object to be passed along when the event fires. - * Defaul
[09/50] [abbrv] wicket git commit: Merge branch 'pr-226-rel_attribute_for_cssheaderitem'
Merge branch 'pr-226-rel_attribute_for_cssheaderitem' Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5f2809c7 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5f2809c7 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5f2809c7 Branch: refs/heads/WICKET-6105-java.time Commit: 5f2809c7ca9049f6fef2cd660614fa79df7575e0 Parents: 5ec319f f4593f7 Author: Martin Tzvetanov Grigorov Authored: Sun Aug 6 15:05:32 2017 +0300 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 15:05:32 2017 +0300 -- .../wicket/core/util/string/CssUtils.java | 38 -- .../markup/head/CssContentHeaderItem.java | 14 ++-- .../wicket/markup/head/CssHeaderItem.java | 74 ++-- .../markup/head/CssReferenceHeaderItem.java | 56 --- .../markup/head/CssUrlReferenceHeaderItem.java | 55 --- .../wicket/markup/head/MetaDataHeaderItem.java | 8 +++ .../wicket/http2/markup/head/PushItem.java | 12 ++-- .../http2/markup/head/PushItemHeaderValue.java | 12 ++-- .../http2/markup/head/Jetty9PushBuilder.java| 2 +- 9 files changed, 226 insertions(+), 45 deletions(-) --
[05/50] [abbrv] wicket git commit: Clean up Clirr configurations.
Clean up Clirr configurations. For some reason wicket-cdi 7.x was compared against Wicket 6.1.0 (cherry picked from commit a89f2a7b7d4e915c86c2622cbf16f879fa7085da) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f4593f71 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f4593f71 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f4593f71 Branch: refs/heads/WICKET-6105-java.time Commit: f4593f71204ff5940302f6ded4beb1d25c2ddff6 Parents: a0d20c9 Author: Martin Tzvetanov Grigorov Authored: Sun Aug 6 14:00:48 2017 +0300 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 14:59:34 2017 +0300 -- wicket-cdi/pom.xml | 29 - wicket-devutils/pom.xml | 13 - wicket-experimental/pom.xml | 17 - 3 files changed, 4 insertions(+), 55 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/f4593f71/wicket-cdi/pom.xml -- diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml index 21d4112..ffb927d 100644 --- a/wicket-cdi/pom.xml +++ b/wicket-cdi/pom.xml @@ -61,33 +61,4 @@ junit - - - - - org.codehaus.mojo - clirr-maven-plugin - - - clirr-check - compile - - check - - - 6.1.0 - true - true - - - - - 6.1.0 - true - true - - - - - http://git-wip-us.apache.org/repos/asf/wicket/blob/f4593f71/wicket-devutils/pom.xml -- diff --git a/wicket-devutils/pom.xml b/wicket-devutils/pom.xml index b5bee39..b21d499 100644 --- a/wicket-devutils/pom.xml +++ b/wicket-devutils/pom.xml @@ -41,17 +41,4 @@ wicket-extensions - - - - - org.codehaus.mojo - clirr-maven-plugin - - true - - - - - http://git-wip-us.apache.org/repos/asf/wicket/blob/f4593f71/wicket-experimental/pom.xml -- diff --git a/wicket-experimental/pom.xml b/wicket-experimental/pom.xml index 1c9c529..ff4012a 100644 --- a/wicket-experimental/pom.xml +++ b/wicket-experimental/pom.xml @@ -32,17 +32,8 @@ wicket-http2 wicket-metrics - - - - - org.codehaus.mojo - clirr-maven-plugin - - true - - - - - + + + true +
[26/50] [abbrv] wicket git commit: WICKET-6463 Please add additional constructor to Roles
WICKET-6463 Please add additional constructor to Roles Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1f805dd5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1f805dd5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1f805dd5 Branch: refs/heads/WICKET-6105-java.time Commit: 1f805dd5af6d06e9209907f33f3c7ab4a4678e76 Parents: b088c69 Author: Martin Tzvetanov Grigorov Authored: Mon Sep 4 22:11:39 2017 +0300 Committer: Martin Tzvetanov Grigorov Committed: Mon Sep 4 22:11:39 2017 +0300 -- .../authroles/authorization/strategies/role/Roles.java | 9 + .../annotations/AnnotationsRoleAuthorizationStrategy.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/1f805dd5/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/Roles.java -- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/Roles.java b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/Roles.java index 5d272de..fa5251d 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/Roles.java +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/Roles.java @@ -16,9 +16,11 @@ */ package org.apache.wicket.authroles.authorization.strategies.role; +import java.util.Collection; import java.util.HashSet; import org.apache.wicket.util.io.IClusterable; +import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.StringList; @@ -53,6 +55,7 @@ public class Roles extends HashSet implements IClusterable */ public Roles(final String roles) { + Args.notNull(roles, "roles"); for (final String role : roles.split("\\s*,\\s*")) { add(role); @@ -67,12 +70,18 @@ public class Roles extends HashSet implements IClusterable */ public Roles(final String[] roles) { + Args.notNull(roles, "roles"); for (final String role : roles) { add(role); } } + public Roles(final Collection roles) { + Args.notNull(roles, "roles"); + addAll(roles); + } + /** * Whether this roles object containes the provided role. * http://git-wip-us.apache.org/repos/asf/wicket/blob/1f805dd5/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java -- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java index ff7b9dd..96163e1 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java @@ -171,7 +171,7 @@ public class AnnotationsRoleAuthorizationStrategy extends AbstractRoleAuthorizat } Roles acceptedRoles = new Roles(authorizeActionAnnotation.roles()); - if (!(isEmpty(acceptedRoles) || hasAny(acceptedRoles))) + if (!hasAny(acceptedRoles)) { return false; }
[jira] [Commented] (WICKET-6105) Decommission wicket-datetime
[ https://issues.apache.org/jira/browse/WICKET-6105?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16176760#comment-16176760 ] ASF subversion and git services commented on WICKET-6105: - Commit 8019324c27739a705205e1c499f4509c0dc3c194 in wicket's branch refs/heads/WICKET-6105-java.time from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=8019324 ] Merge remote-tracking branch 'origin/master' into WICKET-6105-java.time > Decommission wicket-datetime > > > Key: WICKET-6105 > URL: https://issues.apache.org/jira/browse/WICKET-6105 > Project: Wicket > Issue Type: Task > Components: wicket, wicket-datetime >Affects Versions: 8.0.0-M1 >Reporter: Martin Grigorov >Assignee: Martin Grigorov > > Discussion at dev@: http://markmail.org/message/uqu6gfma6wihwcwt > The idea is to: > * preserve DateConverter classes in wicket-util (and use Java 8 java.time.** > classes instead of Joda-Time). > * move DateLabel to wicket-extensions > * synch -datetime's DateTextField with -extensions' DateTextField > * move everything else in WicketStuff project so existing applications could > easily migrate to Wicket 8 -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[08/50] [abbrv] wicket git commit: Small code cleaning to BasicResourceReferenceMapper
Small code cleaning to BasicResourceReferenceMapper Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1408c944 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1408c944 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1408c944 Branch: refs/heads/WICKET-6105-java.time Commit: 1408c908001be150aa11c45d1f6865f105d0 Parents: ffeb024 Author: Andrea Del Bene Authored: Sat Aug 5 12:43:43 2017 +0200 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 14:59:34 2017 +0300 -- .../mapper/BasicResourceReferenceMapper.java| 16 +++- 1 file changed, 3 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/1408c944/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java index d0f1375..2c533bc 100755 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java @@ -204,19 +204,9 @@ public class BasicResourceReferenceMapper extends AbstractResourceReferenceMappe segments.add(getClassName(reference.getScope())); // setup resource parameters - PageParameters parameters = referenceRequestHandler.getPageParameters(); - - if (parameters == null) - { - parameters = new PageParameters(); - } - else - { - parameters = new PageParameters(parameters); - - // need to remove indexed parameters otherwise the URL won't be able to decode - parameters.clearIndexed(); - } + PageParameters parameters = new PageParameters(referenceRequestHandler.getPageParameters()); + // need to remove indexed parameters otherwise the URL won't be able to decode + parameters.clearIndexed(); ResourceUtil.encodeResourceReferenceAttributes(url, reference);
[27/50] [abbrv] wicket git commit: WICKET-6460 Rename AjaxDownload to AjaxDownloadBehavior
WICKET-6460 Rename AjaxDownload to AjaxDownloadBehavior Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1fc1e3d7 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1fc1e3d7 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1fc1e3d7 Branch: refs/heads/WICKET-6105-java.time Commit: 1fc1e3d7040ed2f3e73e7067efd201a958a90b3e Parents: 1f805dd Author: Martin Tzvetanov Grigorov Authored: Mon Sep 4 22:26:30 2017 +0300 Committer: Martin Tzvetanov Grigorov Committed: Mon Sep 4 22:26:30 2017 +0300 -- .../examples/ajax/builtin/AjaxDownloadPage.java | 22 +- .../wicket/extensions/ajax/AjaxDownload.java| 384 -- .../extensions/ajax/AjaxDownloadBehavior.java | 388 +++ 3 files changed, 399 insertions(+), 395 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/1fc1e3d7/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxDownloadPage.java -- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxDownloadPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxDownloadPage.java index 6d1aa3e..70a682d 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxDownloadPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxDownloadPage.java @@ -20,8 +20,8 @@ import java.util.concurrent.TimeUnit; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; -import org.apache.wicket.extensions.ajax.AjaxDownload; -import org.apache.wicket.extensions.ajax.AjaxDownload.Location; +import org.apache.wicket.extensions.ajax.AjaxDownloadBehavior; +import org.apache.wicket.extensions.ajax.AjaxDownloadBehavior.Location; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.request.http.flow.AbortWithHttpErrorCodeException; import org.apache.wicket.request.resource.ContentDisposition; @@ -76,7 +76,7 @@ public class AjaxDownloadPage extends BasePage IResource resource = new ExampleResource("downloaded via ajax") .setContentDisposition(ContentDisposition.ATTACHMENT); - final AjaxDownload download = new AjaxDownload(resource) { + final AjaxDownloadBehavior download = new AjaxDownloadBehavior(resource) { @Override protected void onBeforeDownload(AjaxRequestTarget target) @@ -118,7 +118,7 @@ public class AjaxDownloadPage extends BasePage IResource resource = new ExampleResource("downloaded via ajax in iframe") .setContentDisposition(ContentDisposition.ATTACHMENT); - final AjaxDownload download = new AjaxDownload(resource) { + final AjaxDownloadBehavior download = new AjaxDownloadBehavior(resource) { @Override protected void onBeforeDownload(AjaxRequestTarget target) @@ -166,7 +166,7 @@ public class AjaxDownloadPage extends BasePage } }; - final AjaxDownload download = new AjaxDownload(reference) { + final AjaxDownloadBehavior download = new AjaxDownloadBehavior(reference) { @Override protected void onBeforeDownload(AjaxRequestTarget target) @@ -208,7 +208,7 @@ public class AjaxDownloadPage extends BasePage IResource resource = new ExampleResource("downloaded via ajax in a new browser window") .setContentDisposition(ContentDisposition.INLINE); - final AjaxDownload download = new AjaxDownload(resource) { + final AjaxDownloadBehavior download = new AjaxDownloadBehavior(resource) { @Override protected void onBeforeDownload(AjaxRequestTarget target) @@ -240,7 +240,7 @@ public class AjaxDownloadPage extends BasePage target.add(downloadingContainer); } }; - download.setLocation(AjaxDownload.Location.NewWindow); + download.setLocation(AjaxDownloadBehavior.Location.NewWindow); add(download); add(new AjaxLink("downloadInNewWindow") @@ -258,7 +258,7 @@ public class AjaxDownloadPage extends BasePage IResource resource = new ExampleResource("downloaded via ajax in same browser window") .setContentDisposition(ContentDisposition
[49/50] [abbrv] wicket git commit: Wicket is compilable, tests are fails
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/calendar-min.js -- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/calendar-min.js b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/calendar-min.js deleted file mode 100644 index 223cdcf..000 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/calendar-min.js +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (c) 2011, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.com/yui/license.html -version: 2.9.0 -*/ -(function(){YAHOO.util.Config=function(d){if(d){this.init(d);}};var b=YAHOO.lang,c=YAHOO.util.CustomEvent,a=YAHOO.util.Config;a.CONFIG_CHANGED_EVENT="configChanged";a.BOOLEAN_TYPE="boolean";a.prototype={owner:null,queueInProgress:false,config:null,initialConfig:null,eventQueue:null,configChangedEvent:null,init:function(d){this.owner=d;this.configChangedEvent=this.createEvent(a.CONFIG_CHANGED_EVENT);this.configChangedEvent.signature=c.LIST;this.queueInProgress=false;this.config={};this.initialConfig={};this.eventQueue=[];},checkBoolean:function(d){return(typeof d==a.BOOLEAN_TYPE);},checkNumber:function(d){return(!isNaN(d));},fireEvent:function(d,f){var e=this.config[d];if(e&&e.event){e.event.fire(f);}},addProperty:function(e,d){e=e.toLowerCase();this.config[e]=d;d.event=this.createEvent(e,{scope:this.owner});d.event.signature=c.LIST;d.key=e;if(d.handler){d.event.subscribe(d.handler,this.owner);}this.setProperty(e,d.value,true);if(!d.suppressEvent){this.queueProperty(e,d.value);}},get Config:function(){var d={},f=this.config,g,e;for(g in f){if(b.hasOwnProperty(f,g)){e=f[g];if(e&&e.event){d[g]=e.value;}}}return d;},getProperty:function(d){var e=this.config[d.toLowerCase()];if(e&&e.event){return e.value;}else{return undefined;}},resetProperty:function(d){d=d.toLowerCase();var e=this.config[d];if(e&&e.event){if(d in this.initialConfig){this.setProperty(d,this.initialConfig[d]);return true;}}else{return false;}},setProperty:function(e,g,d){var f;e=e.toLowerCase();if(this.queueInProgress&&!d){this.queueProperty(e,g);return true;}else{f=this.config[e];if(f&&f.event){if(f.validator&&!f.validator(g)){return false;}else{f.value=g;if(!d){this.fireEvent(e,g);this.configChangedEvent.fire([e,g]);}return true;}}else{return false;}}},queueProperty:function(v,r){v=v.toLowerCase();var u=this.config[v],l=false,k,g,h,j,p,t,f,n,o,d,m,w,e;if(u&&u.event){if(!b.isUndefined(r)&&u.validator&&!u.validator(r)){return false;}else{if(!b.isUndefined(r)){u.value=r;}else{r=u.value;}l=false;k=th is.eventQueue.length;for(m=0;m0){g=f-1;do{d=e.subscribers[g];if(d&&d.obj==j&&d.fn==h){return true;}}while(g--);}return false;};YAHOO.lang.augmentProto(a,YAHOO.util.EventProvider);}());YAHOO.widget.DateMath={DAY:"D",WEEK:"W",YEAR:"Y",MONTH:"M",ONE_DAY_MS:1000*60*60*24,WEEK_ONE_JAN_DATE:1,add:function(a,e,c){var g=new Date(a.getTime());switch(e){case this.MONTH:var f=a.getMonth()+c;var b=0;if(f<0){while(f<0){f+=12;b-=1;}}else{if(f>11){while(f>11){f-=12;b+=1;}}}g.setMonth(f);g.setFullYear(a.getFullYear()+b);break;case this.DAY:this._addDays(g,c);break;case this.YEAR:g.setFullYear(a.getFullYear()+c);break;case this.WEEK:this._addDays(g,(c*7));break;}return g;},_addDays:function(e,c){if(YAHOO.env.ua.webkit&&YAHOO.env.ua.webkit<420){if(c<0){for(var b=-128;ca;c-=a){e.set Date(e.getDate()+a);}}}e.setDate(e.getDate()+c);},subtract:function(a,c,b){return this.add(a,c,(b*-1));},before:function(c,b){var a=b.getTime();if(c.getTime()a){return true;}else{return false;}},between:function(b,a,c){if(this.after(b,a)&&this.before(b,c)){return true;}else{return false;}},getJan1:function(a){return this.getDate(a,0,1);},getDayOffset:function(b,d){var c=this.getJan1(d);var a=Math.ceil((b.getTime()-c.getTime())/this.ONE_DAY_MS);return a;},getWeekNumber:function(d,b,g){b=b||0;g=g||this.WEEK_ONE_JAN_DATE;var h=this.clearTime(d),l,m;if(h.getDay()===b){l=h;}else{l=this.getFirstDayOfWeek(h,b);}var i=l.getFullYear();m=new Date(l.getTime()+6*this.ONE_DAY_MS);var f;if(i!==m.getFullYear()&&m.getDate()>=g){f=1;}else{var e=this.clearTime(this.getDate(i,0,g)),a=this.getFirstDayOfWeek(e,b);var j=Math.round((h.getTime()-a.getTime())/this.ONE_DAY_MS);var k=j%7;var c=(j-k)/7;f=c+1;}return f;}, getFirstDayOfWeek:function(d,a){a=a||0; -var b=d.getDay(),c=(b-a+7)%7;return this.subtract(d,this.DAY,c);},isYearOverlapWeek:function(a){var c=false;var b=this.add(a,this.DAY,6);if(b.getFullYear()!=a.getFullYear()){c=true;}return c;},isMonthOverlapWeek:function(a){var c=false;var b=this.add(a,this.DAY,6);if(b.getMonth()!=a.getMonth()){c=true;}return c;},findMonthStart:function(a){var b=this.getDate(a.getFullYear(),a.getMonth(),1);return b;},findMonthEnd:function(b){var d=this.findMonthStart(b);var c=this.add(d,
[30/50] [abbrv] wicket git commit: Ajax inline enclosure fix.
Ajax inline enclosure fix. (cherry picked from commit f9fa76cf4c46674dd4d4e83d5474e7bc904ec457) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c4a92dfd Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c4a92dfd Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c4a92dfd Branch: refs/heads/WICKET-6105-java.time Commit: c4a92dfdb63fcb294e446e36454cd9730a7a9b43 Parents: a690aa0 Author: Domas Poliakas Authored: Fri Sep 1 17:39:42 2017 +0100 Committer: Martin Tzvetanov Grigorov Committed: Tue Sep 5 00:09:57 2017 +0300 -- .../AbstractHeaderRenderStrategy.java | 28 ++ .../ChildFirstHeaderRenderStrategyTest.java | 39 ++ .../markup/renderStrategy/SimplePage3.html | 16 ++ .../markup/renderStrategy/SimplePage3.java | 56 4 files changed, 139 insertions(+) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/c4a92dfd/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java index aef5d4e..91d5fd1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java @@ -23,7 +23,10 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.IHeaderContributor; import org.apache.wicket.markup.html.internal.HtmlHeaderContainer; import org.apache.wicket.markup.html.internal.HtmlHeaderContainer.HeaderStreamState; +import org.apache.wicket.markup.html.internal.InlineEnclosure; import org.apache.wicket.util.lang.Args; +import org.apache.wicket.util.visit.IVisit; +import org.apache.wicket.util.visit.IVisitor; /** * An abstract implementation of a header render strategy which is only missing the code to traverse @@ -116,7 +119,32 @@ public abstract class AbstractHeaderRenderStrategy implements IHeaderRenderStrat final HeaderStreamState headerStreamState, final Component rootComponent) { headerContainer.renderHeaderTagBody(headerStreamState); + rootComponent.internalRenderHead(headerContainer); + + // If the root component is an inline enclosure, then we force header render of its controller as well; normally + // this would not trigger because the controller is a sibling of the enclosure + if (rootComponent instanceof InlineEnclosure) { + InlineEnclosure typedComponent = (InlineEnclosure) rootComponent; + + final String childId = typedComponent.getChildId(); + + // Visit the siblings of the enclosure to attempt and find the controller of the enclosure + Component enclosureController = typedComponent.getParent().visitChildren(new IVisitor() { + @Override + public void component(Component object, IVisit visit) { + if (object.getId().equals(childId)){ + visit.stop(object); + } else { + visit.dontGoDeeper(); + } + } + }); + + if (enclosureController != null){ + enclosureController.internalRenderHead(headerContainer); + } + } } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c4a92dfd/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java -- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java index 516ce6e..e68c812 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java @@ -19,10 +19,16 @@ package org.apache.wicket.markup.renderStrategy; import org.apache.wicket.Page; import org.apache.wicket.util.tester.WicketTestCase; import org.ap
[40/50] [abbrv] wicket git commit: Merge branch 'master' into WICKET-6105-java.time
Merge branch 'master' into WICKET-6105-java.time Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a9b06ca2 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a9b06ca2 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a9b06ca2 Branch: refs/heads/WICKET-6105-java.time Commit: a9b06ca2e23a76dd99c3e77f3fc4e9aa17a2f815 Parents: 8019324 e15993c Author: Maxim Solodovnik Authored: Fri Sep 22 21:57:06 2017 +0700 Committer: Maxim Solodovnik Committed: Fri Sep 22 21:57:06 2017 +0700 -- .../apache/wicket/page/PageStoreManager.java| 63 ++-- .../wicket/resource/FileSystemResource.java | 2 +- wicket-examples/pom.xml | 51 +++- .../examples/compref/CheckBoxSelectorPage.java | 26 +--- 4 files changed, 97 insertions(+), 45 deletions(-) --
[01/50] [abbrv] wicket git commit: Small code cleaning to BasicResourceReferenceMapper
Repository: wicket Updated Branches: refs/heads/WICKET-6105-java.time b82bce9cd -> 11ef5c489 Small code cleaning to BasicResourceReferenceMapper Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d062ac55 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d062ac55 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d062ac55 Branch: refs/heads/WICKET-6105-java.time Commit: d062ac55dd83b0cf4c262295ff504687daaa4c29 Parents: b16b075 Author: Andrea Del Bene Authored: Sat Aug 5 12:43:43 2017 +0200 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 14:53:00 2017 +0300 -- .../mapper/BasicResourceReferenceMapper.java| 16 +++- 1 file changed, 3 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/d062ac55/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java index d0f1375..2c533bc 100755 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java @@ -204,19 +204,9 @@ public class BasicResourceReferenceMapper extends AbstractResourceReferenceMappe segments.add(getClassName(reference.getScope())); // setup resource parameters - PageParameters parameters = referenceRequestHandler.getPageParameters(); - - if (parameters == null) - { - parameters = new PageParameters(); - } - else - { - parameters = new PageParameters(parameters); - - // need to remove indexed parameters otherwise the URL won't be able to decode - parameters.clearIndexed(); - } + PageParameters parameters = new PageParameters(referenceRequestHandler.getPageParameters()); + // need to remove indexed parameters otherwise the URL won't be able to decode + parameters.clearIndexed(); ResourceUtil.encodeResourceReferenceAttributes(url, reference);
[jira] [Commented] (WICKET-6471) FileSystemResource file descriptor leak
[ https://issues.apache.org/jira/browse/WICKET-6471?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16176762#comment-16176762 ] ASF subversion and git services commented on WICKET-6471: - Commit e15993c092930fe36ab9c624d286a2043172cb76 in wicket's branch refs/heads/WICKET-6105-java.time from [~svenmeier] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=e15993c ] WICKET-6471 inputstream has to be closed > FileSystemResource file descriptor leak > --- > > Key: WICKET-6471 > URL: https://issues.apache.org/jira/browse/WICKET-6471 > Project: Wicket > Issue Type: Bug > Components: wicket >Affects Versions: 7.9.0 >Reporter: Boris Goldowsky >Assignee: Sven Meier > Fix For: 8.0.0-M8, 7.10.0 > > Attachments: frquickstart.zip > > > FileSystemResource does not appear to close the InputStream that it creates. > I believe it should call setClose(true) on the PartWriterCallback. > To verify the problem, see the attached quick start. Change the filename in > HomePage.java to point to some valid image file on your system. After viewing > the home page in a browser, check for files that the jetty process has open, > eg: > {noformat} > lsof -p PID | grep logo > {noformat} > If you load the home page a few more times, using Shift-reload to avoid > simply loading from cache, you can see many file descriptors pointing to the > image file are kept open: > {noformat} > java87278 borisgoldowsky txt REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 175r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 180r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 181r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > {noformat} -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[39/50] [abbrv] wicket git commit: WICKET-6471 inputstream has to be closed
WICKET-6471 inputstream has to be closed Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e15993c0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e15993c0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e15993c0 Branch: refs/heads/WICKET-6105-java.time Commit: e15993c092930fe36ab9c624d286a2043172cb76 Parents: 2ab3e0a Author: Sven Meier Authored: Thu Sep 21 23:29:15 2017 +0200 Committer: Sven Meier Committed: Thu Sep 21 23:30:00 2017 +0200 -- .../main/java/org/apache/wicket/resource/FileSystemResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/e15993c0/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java index ee72113..a940b1c 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java @@ -102,7 +102,7 @@ public class FileSystemResource extends AbstractResource Long startbyte = cycle.getMetaData(CONTENT_RANGE_STARTBYTE); Long endbyte = cycle.getMetaData(CONTENT_RANGE_ENDBYTE); resourceResponse.setWriteCallback( - new PartWriterCallback(getInputStream(), size, startbyte, endbyte)); + new PartWriterCallback(getInputStream(), size, startbyte, endbyte).setClose(true)); return resourceResponse; } catch (IOException e)
[34/50] [abbrv] wicket git commit: Merge remote-tracking branch 'origin/master' into WICKET-6105-java.time
http://git-wip-us.apache.org/repos/asf/wicket/blob/8019324c/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java -- http://git-wip-us.apache.org/repos/asf/wicket/blob/8019324c/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.java -- diff --cc wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.java index 4cc0995,faec290..f3f3cc6 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.java @@@ -16,10 -16,8 +16,8 @@@ */ package org.apache.wicket.examples.bean.validation; - import java.util.Date; - import org.apache.wicket.bean.validation.PropertyValidator; -import org.apache.wicket.datetime.StyleDateConverter; +import org.apache.wicket.extensions.markup.html.form.datetime.StyleDateConverter; import org.apache.wicket.datetime.markup.html.form.DateTextField; import org.apache.wicket.examples.WicketExamplePage; import org.apache.wicket.feedback.ExactLevelFeedbackMessageFilter; http://git-wip-us.apache.org/repos/asf/wicket/blob/8019324c/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java -- http://git-wip-us.apache.org/repos/asf/wicket/blob/8019324c/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateLabel.java -- diff --cc wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateLabel.java index 6e39c3e,000..1ff3c31 mode 100644,00..100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateLabel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateLabel.java @@@ -1,317 -1,0 +1,289 @@@ +/* + * 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.extensions.markup.html.form.datetime; + +import java.time.LocalDate; +import java.time.format.FormatStyle; +import java.util.Date; + +import org.apache.wicket.IGenericComponent; +import org.apache.wicket.markup.ComponentTag; +import org.apache.wicket.markup.MarkupStream; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.model.IModel; +import org.apache.wicket.util.convert.IConverter; +import org.apache.wicket.util.lang.Args; + + +/** + * A label that is mapped to a {@link java.time.LocalDate} object and that uses + * {@link java.time.format.DateTimeFormatter} to format values. + * + * You can provide a date pattern in two of the constructors. When not provided, + * {@link java.time.format.FormatStyle#SHORT} will be used. + * + * + * A special option is applyTimeZoneDifference which is an option that says whether to correct for + * the difference between the client's time zone and server's time zone. This is true by default. + * + * + * @see java.time.LocalDate + * @see java.time.format.DateTimeFormatter + */ - public class DateLabel extends Label implements IGenericComponent ++public class DateLabel extends Label implements IGenericComponent +{ + private static final long serialVersionUID = 1L; + + /** + * Creates a new DateLabel defaulting to using a short date pattern + * + * @param id + *The id of the text field + * @param model + *The model + * @param datePattern + *The pattern to use. Must be not null. See + *{@link java.time.format.DateTimeFormatter} for available patterns. + * @return new instance + * + * @see org.apache.wicket.markup.html.form.TextField + */ + public static DateLabel forDatePattern(String id, IModel model, String datePattern) + { + return new DateLabel(id,
[02/50] [abbrv] wicket git commit: Merge branch 'pr-227-push_issue_fix'
Merge branch 'pr-227-push_issue_fix' Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5ec319ff Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5ec319ff Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5ec319ff Branch: refs/heads/WICKET-6105-java.time Commit: 5ec319ff46b862204f4c7fe56dc9b298fd495a8d Parents: 549ff63 8353b35 Author: Martin Tzvetanov Grigorov Authored: Sun Aug 6 14:58:36 2017 +0300 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 14:58:36 2017 +0300 -- pom.xml | 4 +- .../http2/markup/head/NoopPushBuilder.java | 2 +- .../wicket/http2/markup/head/PushBuilder.java | 6 +- .../http2/markup/head/PushHeaderItem.java | 59 +++--- .../wicket/http2/markup/head/PushItem.java | 117 +-- .../http2/markup/head/PushItemHeaderValue.java | 101 .../http2/markup/head/Jetty9PushBuilder.java| 19 ++- .../wicket-http2/wicket-http2-tomcat/pom.xml| 2 +- .../http2/markup/head/Tomcat85PushBuilder.java | 17 ++- .../http2/markup/head/UndertowPushBuilder.java | 17 ++- .../main/asciidoc/http2push/http2push_1.adoc| 4 +- 11 files changed, 303 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/5ec319ff/pom.xml -- diff --cc pom.xml index fdbc63e,fdbc63e..ac0df56 --- a/pom.xml +++ b/pom.xml @@@ -153,7 -153,7 +153,7 @@@ com.google.guava guava -- 22.0 ++ 23.0 javax.el @@@ -754,7 -754,7 +754,7 @@@ org.apache.maven.plugins maven-compiler-plugin -- 3.6.1 ++ 3.6.2 true
[46/50] [abbrv] wicket git commit: Wicket is compilable, tests are fails
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/dom/dom.js -- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/dom/dom.js b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/dom/dom.js deleted file mode 100644 index 1ce4b23..000 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/dom/dom.js +++ /dev/null @@ -1,1846 +0,0 @@ -/* -Copyright (c) 2011, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.com/yui/license.html -version: 2.9.0 -*/ -/** - * The dom module provides helper methods for manipulating Dom elements. - * @module dom - * - */ - -(function() { -// for use with generateId (global to save state if Dom is overwritten) -YAHOO.env._id_counter = YAHOO.env._id_counter || 0; - -// internal shorthand -var Y = YAHOO.util, -lang = YAHOO.lang, -UA = YAHOO.env.ua, -trim = YAHOO.lang.trim, -propertyCache = {}, // for faster hyphen converts -reCache = {}, // cache className regexes -RE_TABLE = /^t(?:able|d|h)$/i, // for _calcBorders -RE_COLOR = /color$/i, - -// DOM aliases -document = window.document, -documentElement = document.documentElement, - -// string constants -OWNER_DOCUMENT = 'ownerDocument', -DEFAULT_VIEW = 'defaultView', -DOCUMENT_ELEMENT = 'documentElement', -COMPAT_MODE = 'compatMode', -OFFSET_LEFT = 'offsetLeft', -OFFSET_TOP = 'offsetTop', -OFFSET_PARENT = 'offsetParent', -PARENT_NODE = 'parentNode', -NODE_TYPE = 'nodeType', -TAG_NAME = 'tagName', -SCROLL_LEFT = 'scrollLeft', -SCROLL_TOP = 'scrollTop', -GET_BOUNDING_CLIENT_RECT = 'getBoundingClientRect', -GET_COMPUTED_STYLE = 'getComputedStyle', -CURRENT_STYLE = 'currentStyle', -CSS1_COMPAT = 'CSS1Compat', -_BACK_COMPAT = 'BackCompat', -_CLASS = 'class', // underscore due to reserved word -CLASS_NAME = 'className', -EMPTY = '', -SPACE = ' ', -C_START = '(?:^|\\s)', -C_END = '(?= |$)', -G = 'g', -POSITION = 'position', -FIXED = 'fixed', -RELATIVE = 'relative', -LEFT = 'left', -TOP = 'top', -MEDIUM = 'medium', -BORDER_LEFT_WIDTH = 'borderLeftWidth', -BORDER_TOP_WIDTH = 'borderTopWidth', - -// brower detection -isOpera = UA.opera, -isSafari = UA.webkit, -isGecko = UA.gecko, -isIE = UA.ie; - -/** - * Provides helper methods for DOM elements. - * @namespace YAHOO.util - * @class Dom - * @requires yahoo, event - */ -Y.Dom = { -CUSTOM_ATTRIBUTES: (!documentElement.hasAttribute) ? { // IE < 8 -'for': 'htmlFor', -'class': CLASS_NAME -} : { // w3c -'htmlFor': 'for', -'className': _CLASS -}, - -DOT_ATTRIBUTES: { -checked: true -}, - -/** - * Returns an HTMLElement reference. - * @method get - * @param {String | HTMLElement |Array} el Accepts a string to use as an ID for getting a DOM reference, an actual DOM reference, or an Array of IDs and/or HTMLElements. - * @return {HTMLElement | Array} A DOM reference to an HTML element or an array of HTMLElements. - */ -get: function(el) { -var id, nodes, c, i, len, attr, ret = null; - -if (el) { -if (typeof el == 'string' || typeof el == 'number') { // id -id = el + ''; -el = document.getElementById(el); -attr = (el) ? el.attributes : null; -if (el && attr && attr.id && attr.id.value === id) { // IE: avoid false match on "name" attribute -return el; -} else if (el && document.all) { // filter by name -el = null; -nodes = document.all[id]; -if (nodes && nodes.length) { -for (i = 0, len = nodes.length; i < len; ++i) { -if (nodes[i].id === id) { -return nodes[i]; -} -} -} -} -} else if (Y.Element && el instanceof Y.Element) { -el = el.get('element'); -} else if (!el.nodeType && 'length' in el) { // array-like -c = []; -for (i = 0, len = el.length; i < len; ++i) { -c[c.length] = Y.Dom.get(el[i]); -} -
[23/50] [abbrv] wicket git commit: WICKET-6457: clear updating boolean when attribute is bound
WICKET-6457: clear updating boolean when attribute is bound Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/76460108 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/76460108 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/76460108 Branch: refs/heads/WICKET-6105-java.time Commit: 76460108ce7817d340d3e09c05d6bb279de84730 Parents: 411aa0e Author: Emond Papegaaij Authored: Tue Aug 29 16:25:43 2017 +0200 Committer: Emond Papegaaij Committed: Wed Aug 30 13:01:51 2017 +0200 -- .../src/main/java/org/apache/wicket/page/PageStoreManager.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/76460108/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java b/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java index df956cc..ae68138 100644 --- a/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java +++ b/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java @@ -330,6 +330,7 @@ public class PageStoreManager extends AbstractPageManager @Override public void valueBound(HttpSessionBindingEvent event) { + updating.set(false); } @Override
[14/50] [abbrv] wicket git commit: Revert "Reduced degree of nesting"
Revert "Reduced degree of nesting" This reverts commit 1cd2a953bcbf83e9c47d6a4ef3e3593645316d59. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f2a23b8d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f2a23b8d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f2a23b8d Branch: refs/heads/WICKET-6105-java.time Commit: f2a23b8de1934f121c366ec426ce1a76921ac30d Parents: 9bd66f6 Author: Domas Poliakas Authored: Thu Aug 3 09:02:30 2017 +0100 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 15:27:21 2017 +0300 -- .../wicket/util/tester/BaseWicketTester.java| 172 ++- 1 file changed, 87 insertions(+), 85 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/f2a23b8d/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 1fcd084..ce8bc08 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 @@ -297,9 +297,9 @@ public class BaseWicketTester } servletContext = servletCtx != null ? servletCtx - // If it's provided from the container it's not necessary to mock. - : !init && application.getServletContext() != null ? application.getServletContext() - : new MockServletContext(application, null); + // If it's provided from the container it's not necessary to mock. + : !init && application.getServletContext() != null ? application.getServletContext() + : new MockServletContext(application, null); // If using Arquillian and it's configured in a web.xml it'll be provided. If not, mock it. if(application.getWicketFilter() == null) @@ -342,15 +342,15 @@ public class BaseWicketTester // reconfigure application for the test environment application.setPageRendererProvider(new LastPageRecordingPageRendererProvider( - application.getPageRendererProvider())); + application.getPageRendererProvider())); application.setRequestCycleProvider(new TestRequestCycleProvider( - application.getRequestCycleProvider())); + application.getRequestCycleProvider())); // set a feedback message filter that will not remove any messages originalFeedbackMessageCleanupFilter = application.getApplicationSettings() - .getFeedbackMessageCleanupFilter(); + .getFeedbackMessageCleanupFilter(); application.getApplicationSettings().setFeedbackMessageCleanupFilter( - IFeedbackMessageFilter.NONE); + IFeedbackMessageFilter.NONE); IPageManagerProvider pageManagerProvider = newTestPageManagerProvider(); if (pageManagerProvider != null) { @@ -398,7 +398,7 @@ public class BaseWicketTester // assign protocol://host:port to next request unless the last request was ajax final boolean assignBaseLocation = lastRequest != null && - lastRequest.getHeader("Wicket-Ajax") == null; + lastRequest.getHeader("Wicket-Ajax") == null; // resume request processing with scheme://host:port from last request if (assignBaseLocation) @@ -462,7 +462,7 @@ public class BaseWicketTester ServletWebRequest servletWebRequest = newServletWebRequest(); requestCycle = application.createRequestCycle(servletWebRequest, - newServletWebResponse(servletWebRequest)); + newServletWebResponse(servletWebRequest)); ThreadContext.setRequestCycle(requestCycle); if (session == null) @@ -647,7 +647,7 @@ public class BaseWicketTester * @return true, if process was executed successfully */ public boolean processRequest(final MockHttpServletRequest request, - final IRequestHandler forcedRequestHandler) + final IRequestHandler forcedRequestHandler) { return processRequest(request, forcedRequestHandler, false);
[jira] [Commented] (WICKET-6440) SecuredRemoteAddressRequestWrapperFactory doesn't make request secure
[ https://issues.apache.org/jira/browse/WICKET-6440?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16176758#comment-16176758 ] ASF subversion and git services commented on WICKET-6440: - Commit 48f45809154558c1a6edba35f7211a0fd3f196ac in wicket's branch refs/heads/WICKET-6105-java.time from [~mgrigorov] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=48f4580 ] WICKET-6440 SecuredRemoteAddressRequestWrapperFactory doesn't make request secure Use the wrapped request in the logging of the new secure state (cherry picked from commit 18a1c2f9ea793a6707b30644f14a63a5edafcbc4) > SecuredRemoteAddressRequestWrapperFactory doesn't make request secure > - > > Key: WICKET-6440 > URL: https://issues.apache.org/jira/browse/WICKET-6440 > Project: Wicket > Issue Type: Bug > Components: wicket >Affects Versions: 7.8.0 >Reporter: Hendy Irawan >Priority: Minor > > I'm using SecuredRemoteAddressRequestWrapperFactory and what I get is: > {noformat} > 2017-08-08 09:07:53.460 DEBUG 3851 --- [nio-8080-exec-3] > ecuredRemoteAddressRequestWrapperFactory : Incoming request > uri=/id/cari-wanita/di/Kota%20Malang,%20Jawa%20Timur,%20Republic%20of%20Indonesia > with originalSecure='false', remoteAddr='127.0.0.1' will be seen with > newSecure='false' > {noformat} > Since remoteAddr is 127.* then it should be treated as secure, per > documentation. > This code in SecuredRemoteAddressRequestWrapperFactory is probably buggy: > (i.e. need to remove {{==false}}) > {code:java} > @Override > public boolean needsWrapper(final HttpServletRequest request) > { > return !request.isSecure() && > matchesOne(request.getRemoteAddr(), > config.securedRemoteAddresses) == false; > } > {code} > Additionally, newSecure = should be {{xRequest.isSecure()}} : > {code:java} > HttpServletRequest xRequest = super.getWrapper(request); > if (log.isDebugEnabled()) > { > log.debug("Incoming request uri=" + > request.getRequestURI() + " with originalSecure='" + > request.isSecure() + "', remoteAddr='" + > request.getRemoteAddr() + > "' will be seen with newSecure='" + > request.isSecure() + "'"); > } > {code} > Related to WICKET-3015. > Tag [~jdonnerstag] [~pete] -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[11/50] [abbrv] wicket git commit: Tests for new functionality
Tests for new functionality Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4158b8c5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4158b8c5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4158b8c5 Branch: refs/heads/WICKET-6105-java.time Commit: 4158b8c5f479bede43a413aca928d2e5d08255d8 Parents: 73d094b Author: Domas Poliakas Authored: Thu Jul 27 14:16:21 2017 +0100 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 15:27:21 2017 +0300 -- .../tester/MockPageWithLabelInEnclosure.html| 13 ++ .../tester/MockPageWithLabelInEnclosure.java| 26 .../wicket/util/tester/WicketTesterTest.java| 12 + 3 files changed, 51 insertions(+) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/4158b8c5/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.html -- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.html b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.html new file mode 100644 index 000..35dfab8 --- /dev/null +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.html @@ -0,0 +1,13 @@ + +http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +http://www.w3.org/1999/xhtml"; xmlns:wicket> + + +Insert title here + + + +[Something] + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/4158b8c5/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.java -- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.java new file mode 100644 index 000..b2f09f1 --- /dev/null +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.java @@ -0,0 +1,26 @@ +package org.apache.wicket.util.tester; + +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.ajax.markup.html.AjaxLink; +import org.apache.wicket.markup.html.WebPage; +import org.apache.wicket.markup.html.basic.Label; + +/** + * Created by dpoliakas on 27/07/2017. + */ +public class MockPageWithLabelInEnclosure extends WebPage { + +public MockPageWithLabelInEnclosure() { +// Clicking this link re-renders the link itself +this.add(new AjaxLink("testLink") { +@Override +public void onClick(AjaxRequestTarget target) { +target.add(this); +} +}); +} + +public AjaxLink getSelfRefreshingAjaxLink(){ +return (AjaxLink) get("testLink"); +} +} http://git-wip-us.apache.org/repos/asf/wicket/blob/4158b8c5/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java -- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java index ee32429..33ea646 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java @@ -1327,4 +1327,16 @@ public class WicketTesterTest extends WicketTestCase String secondId = tester.getSession().getId(); assertNotEquals(firstId, secondId); } + + @Test + public void assertComponentInEnclosureInAjaxResponse() + { + MockPageWithLabelInEnclosure page = new MockPageWithLabelInEnclosure(); + AjaxLink testLink = page.getSelfRefreshingAjaxLink(); + + tester.startPage(page); + tester.clickLink(testLink); + tester.assertComponentOnAjaxResponse(testLink); + + } }
[15/50] [abbrv] wicket git commit: Reduced degree of nesting
Reduced degree of nesting Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9bd66f67 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9bd66f67 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9bd66f67 Branch: refs/heads/WICKET-6105-java.time Commit: 9bd66f676a8db8e577d6bc114535d4a62dfe8f43 Parents: 717dc33 Author: Domas Poliakas Authored: Thu Jul 27 15:26:43 2017 +0100 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 15:27:21 2017 +0300 -- .../wicket/util/tester/BaseWicketTester.java| 396 +-- 1 file changed, 197 insertions(+), 199 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/9bd66f67/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 2f17a64..1fcd084 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 @@ -144,14 +144,14 @@ import junit.framework.AssertionFailedError; * A helper class to ease unit testing of Wicket applications without the need for a servlet * container. See javadoc of WicketTester for example usage. This class can be used as * is, but JUnit users should use derived class WicketTester. - * + * * @see WicketTester - * + * * @author Ingram Chen * @author Juergen Donnerstag * @author Frank Bille * @author Igor Vaynberg - * + * * @since 1.2.6 */ @SuppressWarnings("serial") @@ -211,7 +211,7 @@ public class BaseWicketTester /** * Creates WicketTester and automatically creates a WebApplication. -* +* * @param * @param homePage *a home page Class @@ -230,7 +230,7 @@ public class BaseWicketTester /** * Creates a WicketTester. -* +* * @param application *a WicketTester WebApplication object */ @@ -241,7 +241,7 @@ public class BaseWicketTester /** * Creates a WicketTester. -* +* * @param application *a WicketTester WebApplication object * @param servletContextBasePath @@ -255,7 +255,7 @@ public class BaseWicketTester /** * Creates a WicketTester. -* +* * @param application *a WicketTester WebApplication object * @param servletCtx @@ -265,10 +265,10 @@ public class BaseWicketTester { this(application, servletCtx, true); } - + /** * Creates a WicketTester. -* +* * @param application *a WicketTester WebApplication object * @param init @@ -278,10 +278,10 @@ public class BaseWicketTester { this(application, null, init); } - + /** * Creates a WicketTester. -* +* * @param application *a WicketTester WebApplication object * @param servletCtx @@ -297,10 +297,10 @@ public class BaseWicketTester } servletContext = servletCtx != null ? servletCtx - // If it's provided from the container it's not necessary to mock. - : !init && application.getServletContext() != null ? application.getServletContext() - : new MockServletContext(application, null); - + // If it's provided from the container it's not necessary to mock. + : !init && application.getServletContext() != null ? application.getServletContext() + : new MockServletContext(application, null); + // If using Arquillian and it's configured in a web.xml it'll be provided. If not, mock it. if(application.getWicketFilter() == null) { @@ -330,7 +330,7 @@ public class BaseWicketTester { application.setName("WicketTesterApplication-" + UUID.randomUUID()); } - + application.setServletContext(servletContext); // initialize the application application.initApplication(); @@ -342,15 +342,15 @@ public class BaseWicketTester // reconfigure application for the test environment application.setPageR
[35/50] [abbrv] wicket git commit: Merge remote-tracking branch 'origin/master' into WICKET-6105-java.time
Merge remote-tracking branch 'origin/master' into WICKET-6105-java.time Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8019324c Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8019324c Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8019324c Branch: refs/heads/WICKET-6105-java.time Commit: 8019324c27739a705205e1c499f4509c0dc3c194 Parents: b82bce9 72a5d31 Author: Maxim Solodovnik Authored: Wed Sep 13 21:38:57 2017 +0700 Committer: Maxim Solodovnik Committed: Wed Sep 13 21:38:57 2017 +0700 -- CHANGELOG-7.x | 384 - CHANGELOG-8.x | 419 + NOTICE |14 +- README | 285 - README.md | 275 + archetypes/quickstart/pom.xml |23 +- .../main/resources/archetype-resources/pom.xml |29 +- build-changelog.sh |22 +- build-versions.py | 2 +- patch-dashorst.sh | 283 - pom.xml | 213 +- release-dashorst.sh | 621 - release-igor.sh | 124 - release-milestone.sh| 408 - release.sh | 673 +- revert-release.sh |55 - testing/wicket-arquillian/pom.xml |27 +- .../src/main/resources/arquillian.xml |35 + .../src/test/resources/arquillian.xml |37 - testing/wicket-common-tests/pom.xml |10 - testing/wicket-js-tests/Gruntfile.js|25 +- testing/wicket-js-tests/package-lock.json | 1362 ++ testing/wicket-js-tests/package.json|18 +- testing/wicket-js-tests/pom.xml |28 +- .../testing/jstest/StartJavaScriptTests.java| 131 + .../wicket-js-tests/src/test/resources/keystore | Bin 0 -> 1481 bytes testing/wicket-threadtest/pom.xml | 2 +- wicket-auth-roles/pom.xml | 2 +- .../authentication/AuthenticatedWebSession.java |21 +- .../authentication/pages/SignInPage_de.html |12 + .../authentication/pages/SignInPage_pl.html |12 + .../authentication/pages/SignOutPage_de.html|25 + .../authentication/pages/SignOutPage_pl.html|25 + .../authentication/pages/SignOutPage_ru.html|25 + .../authentication/panel/SignInPanel_pl.html|42 + .../panel/SignInPanel_pl.properties |15 + .../strategies/role/IRoleCheckingStrategy.java | 1 + .../authorization/strategies/role/Roles.java| 9 + .../AnnotationsRoleAuthorizationStrategy.java |43 +- .../annotations/AuthorizeInstantiations.java|64 + .../AuthenticatedWebSessionTest.java| 106 + ...nnotationsRoleAuthorizationStrategyTest.java |30 + wicket-bean-validation/pom.xml | 1 + .../bean/validation/IPropertyResolver.java | 1 + .../wicket/bean/validation/ITagModifier.java| 1 + .../bean/validation/IViolationTranslator.java | 1 + wicket-cdi-1.1/pom.xml | 2 +- .../org/apache/wicket/cdi/AbstractInjector.java | 4 +- .../org/apache/wicket/cdi/CdiConfiguration.java | 2 +- .../apache/wicket/cdi/CdiShutdownCleaner.java | 8 +- .../wicket/cdi/ConversationExpiryChecker.java | 2 +- .../wicket/cdi/ConversationPropagator.java | 8 +- .../wicket/cdi/ConversationalComponent.java | 1 - .../apache/wicket/cdi/DetachEventEmitter.java | 4 +- .../cdi/ICdiAwareRequestCycleListener.java | 6 +- .../wicket/cdi/IConversationPropagation.java| 3 +- .../org/apache/wicket/cdi/NonContextual.java|13 + .../org/apache/wicket/cdi/SessionInjector.java | 5 - .../wicket/cdi/ConversationPropagatorTest.java |50 + .../cdi/testapp/TestConversationPage.java | 2 + wicket-cdi/pom.xml |31 +- .../apache/wicket/cdi/CdiShutdownCleaner.java | 8 +- .../wicket/cdi/ConversationExpiryChecker.java | 2 +- .../wicket/cdi/ConversationPropagator.java | 3 +- .../apache/wicket/cdi/DetachEventEmitter.java | 4 +- .../cdi/ICdiAwareRequestCycleListener.java | 6 +- .../wicket/cdi/IConversationPropagation.java| 4 +- .../org/apache/wicket/cdi/NonContextual.java|14 + .../apache/wicket/cdi/NonContextualManager.java | 6 +- .../org/apache/wicket/cdi/SessionInjector.java | 6 - wicket-core/EclipseCodeFormat.xml | 6 +- wicket-core/pom.xml |24 +- .../java/org/apache/wicket/Application.
[10/50] [abbrv] wicket git commit: Addressing pull request #224 comments
Addressing pull request #224 comments Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/717dc339 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/717dc339 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/717dc339 Branch: refs/heads/WICKET-6105-java.time Commit: 717dc339d8ef416c52f86a6af3b0a4ac53d5594e Parents: aeda988 Author: Domas Poliakas Authored: Thu Jul 27 14:58:48 2017 +0100 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 15:27:21 2017 +0300 -- .../wicket/util/tester/BaseWicketTester.java| 24 1 file changed, 15 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/717dc339/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 13c16fb..2f17a64 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 @@ -2328,21 +2328,27 @@ public class BaseWicketTester failMessage = "Component wasn't found in the AJAX response. " + componentInfo; result = isTrue(failMessage, isComponentInAjaxResponse); - // Check if the component has been included as part of an enclosure render - Enclosure enclosure = getLastRenderedPage().visitChildren(Enclosure.class, (Enclosure enc, IVisit visit) -> { - if (AjaxEnclosureListener.isControllerOfEnclosure(component, enc)){ - visit.stop(enc); + if (result.wasFailed()){ + // Check if the component has been included as part of an enclosure render + Enclosure enclosure = getLastRenderedPage().visitChildren(Enclosure.class, (Enclosure enc, IVisit visit) -> { + if (AjaxEnclosureListener.isControllerOfEnclosure(component, enc)){ + visit.stop(enc); + } + }); + + if (enclosure != null){ + failMessage = "Component's enclosure was not found in the AJAX response. " + enclosure; + boolean isEnclosureInAjaxResponse = !isComponentOnAjaxResponse(enclosure).wasFailed(); + return isTrue(failMessage, isEnclosureInAjaxResponse); + } else { + return result; } - }); - if (enclosure != null){ - failMessage = "Component's enclosure was not found in the AJAX response. " + enclosure.toString(); - boolean isEnclosureInAjaxResponse = !isComponentOnAjaxResponse(enclosure).wasFailed(); - return isTrue(failMessage, isEnclosureInAjaxResponse); } else { return result; } + } /**
[36/50] [abbrv] wicket git commit: WICKET-6465 prevent unbound during storeTouchedPages with ThreadLocal
WICKET-6465 prevent unbound during storeTouchedPages with ThreadLocal This closes #233 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/68b24aa7 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/68b24aa7 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/68b24aa7 Branch: refs/heads/WICKET-6105-java.time Commit: 68b24aa788b25a67cfb16bee08a85328dad7b91c Parents: 72a5d31 Author: Sven Meier Authored: Wed Sep 13 23:40:14 2017 +0200 Committer: Sven Meier Committed: Thu Sep 14 00:10:01 2017 +0200 -- .../apache/wicket/page/PageStoreManager.java| 63 ++-- 1 file changed, 44 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/68b24aa7/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java b/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java index ae68138..2db301f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java +++ b/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicBoolean; import javax.servlet.http.HttpSessionBindingEvent; import javax.servlet.http.HttpSessionBindingListener; @@ -65,8 +64,8 @@ public class PageStoreManager extends AbstractPageManager if (MANAGERS.containsKey(applicationName)) { - throw new IllegalStateException("Manager for application with key '" + applicationName - + "' already exists."); + throw new IllegalStateException( + "Manager for application with key '" + applicationName + "' already exists."); } MANAGERS.put(applicationName, this); } @@ -95,14 +94,23 @@ public class PageStoreManager extends AbstractPageManager private transient List afterReadObject; /** -* A flag indicating whether this session entry has been re-set in the Session. -* Web containers intercept {@link javax.servlet.http.HttpSession#setAttribute(String, Object)} -* to detect changes and replicate the session. If the attribute has been already -* bound in the session then it will be first unbound and then re-bound again. -* This flag helps us to detect update operations and skip the default behavior -* of {@link #valueUnbound(HttpSessionBindingEvent)}. +* A flag indicating whether this session entry is being re-set in the Session. +* +* Web containers intercept +* {@link javax.servlet.http.HttpSession#setAttribute(String, Object)} to detect changes and +* replicate the session. If the attribute has been already bound in the session then +* {@link #valueUnbound(HttpSessionBindingEvent)} might get called - this flag +* helps us to ignore the invocation in that case. +* +* @see #valueUnbound(HttpSessionBindingEvent) */ - private final AtomicBoolean updating = new AtomicBoolean(false); + private transient ThreadLocal storingTouchedPages = new ThreadLocal() + { + protected Boolean initialValue() + { + return Boolean.FALSE; + }; + }; /** * Construct. @@ -300,11 +308,19 @@ public class PageStoreManager extends AbstractPageManager * @throws ClassNotFoundException */ @SuppressWarnings("unchecked") - private void readObject(final ObjectInputStream s) throws IOException, - ClassNotFoundException + private void readObject(final ObjectInputStream s) + throws IOException, ClassNotFoundException { s.defaultReadObject(); + storingTouchedPages = new ThreadLocal() + { + protected Boolean initialValue() + { + return Boolean.FALSE; + }; + }; + afterReadObject = new ArrayList<>();
[21/50] [abbrv] wicket git commit: WICKET-6396 added default isPresent to IModel
WICKET-6396 added default isPresent to IModel Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/22a421a0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/22a421a0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/22a421a0 Branch: refs/heads/WICKET-6105-java.time Commit: 22a421a05afa53e3311ae05b0c1076047e43e344 Parents: 075d837 Author: Sven Meier Authored: Fri Aug 18 23:44:38 2017 +0200 Committer: Sven Meier Committed: Fri Aug 18 23:44:38 2017 +0200 -- .../java/org/apache/wicket/model/IModel.java| 21 .../org/apache/wicket/model/IModelTest.java | 12 +++ 2 files changed, 33 insertions(+) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/22a421a0/wicket-core/src/main/java/org/apache/wicket/model/IModel.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/model/IModel.java b/wicket-core/src/main/java/org/apache/wicket/model/IModel.java index d33d061..c9db790 100644 --- a/wicket-core/src/main/java/org/apache/wicket/model/IModel.java +++ b/wicket-core/src/main/java/org/apache/wicket/model/IModel.java @@ -348,6 +348,27 @@ public interface IModel extends IDetachable } }; } + + /** +* Returns a IModel, returning whether the contained object is non-null. +* +* @return a new IModel +*/ + default IModel isPresent() { + return new IModel() { + @Override + public Boolean getObject() + { + return IModel.this.getObject() != null; + } + + @Override + public void detach() + { + IModel.this.detach(); + } + }; + } /** * Suppresses generics warning when casting model types. http://git-wip-us.apache.org/repos/asf/wicket/blob/22a421a0/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java -- diff --git a/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java index c2efe29..8f7b585 100644 --- a/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java @@ -176,6 +176,18 @@ public class IModelTest extends Assert } @Test + public void isPresent() + { + assertThat(Model.of(person).isPresent().getObject(), is(equalTo(true))); + } + + @Test + public void isPresentNot() + { + assertThat(Model.of((Person)null).isPresent().getObject(), is(equalTo(false))); + } + + @Test public void serializableMethodReference() { Person p = new Person();
[29/50] [abbrv] wicket git commit: Update Log4j 2 and Mockito to 2.9.0
Update Log4j 2 and Mockito to 2.9.0 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a690aa06 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a690aa06 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a690aa06 Branch: refs/heads/WICKET-6105-java.time Commit: a690aa06321e1286cb093f2792cbd536517bac9d Parents: 2295939 Author: Martin Tzvetanov Grigorov Authored: Mon Sep 4 22:59:17 2017 +0300 Committer: Martin Tzvetanov Grigorov Committed: Mon Sep 4 23:24:29 2017 +0300 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/a690aa06/pom.xml -- diff --git a/pom.xml b/pom.xml index a415b0a..c2b4997 100644 --- a/pom.xml +++ b/pom.xml @@ -133,9 +133,9 @@ 3.1.0 2.10.4 2.20 - 2.8.47 + 2.9.0 1.7.25 - 2.8.2 + 2.9.0 2.0.0.0 2.6 1.8.10
[22/50] [abbrv] wicket git commit: WICKET-6455 AjaxFormSubmitBehavior doesn't submit inner forms
WICKET-6455 AjaxFormSubmitBehavior doesn't submit inner forms Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/411aa0ee Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/411aa0ee Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/411aa0ee Branch: refs/heads/WICKET-6105-java.time Commit: 411aa0ee38d45232f075549bf7212e78a0c626ce Parents: 22a421a Author: Andrea Del Bene Authored: Wed Aug 23 11:07:40 2017 +0200 Committer: Andrea Del Bene Committed: Wed Aug 23 11:24:43 2017 +0200 -- .../ajax/form/AjaxFormSubmitBehavior.java | 12 +++- .../ajax/form/AjaxFormSubmitBehaviorTest.java | 64 ++-- 2 files changed, 69 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/411aa0ee/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java -- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java index 0700d09..3c0fbbf 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java @@ -170,7 +170,17 @@ public abstract class AjaxFormSubmitBehavior extends AjaxEventBehavior @Override protected void onEvent(final AjaxRequestTarget target) { - getForm().getRootForm().onFormSubmitted(new AjaxFormSubmitBehavior.AjaxFormSubmitter(this, target)); + AjaxFormSubmitBehavior.AjaxFormSubmitter submitter = new AjaxFormSubmitBehavior.AjaxFormSubmitter(this, target); + Form form = getForm(); + + form.getRootForm().onFormSubmitted(submitter); + + //the target form might have wantSubmitOnParentFormSubmit returning "false" + //so it must be explicitly submitted. + if (!form.isSubmitted()) + { + form.onFormSubmitted(submitter); + } } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/411aa0ee/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java -- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java index 1fe4dad..48f55a9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java @@ -16,17 +16,20 @@ */ package org.apache.wicket.ajax.form; +import org.apache.wicket.ajax.markup.html.form.AjaxButton; +import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.util.tester.FormTester; +import org.apache.wicket.util.tester.NestedFormPage; import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; -/** - * Test case for WICKET-1743 - * - * @see https://issues.apache.org/jira/browse/WICKET-1743";>WICKET-1743 - */ public class AjaxFormSubmitBehaviorTest extends WicketTestCase { - /** */ + /** +* Test case for WICKET-1743 +* +* @see https://issues.apache.org/jira/browse/WICKET-1743";>WICKET-1743 +*/ @Test public void ajaxFormSubmitBehavior() { @@ -40,4 +43,53 @@ public class AjaxFormSubmitBehaviorTest extends WicketTestCase tester.executeAjaxEvent(testForm.getTextField(), "change"); assertTrue(testForm.isSubmitedByAjaxBehavior()); } + + /** +* https://issues.apache.org/jira/browse/WICKET-6455 +*/ + @Test + public void innerFormSubmit() + { + tester.startPage(NestedFormTestPage.class); + + NestedFormTestPage homePage = (NestedFormTestPage)tester.getLastRenderedPage(); + assertFalse(homePage.innerFormSubmitted); + + FormTester formTester = tester.newFormTester("outer:inner"); + formTester.submit("submit"); + + assertTrue(homePage.innerFormSubmitted); + } + + public static class NestedFormTestPage extends NestedFormPage + { + + public boolean innerFormSubmitted = false; + + public NestedFormTestPage() + { + Form outer = new Form("outer"); + replace(outer); + +
[47/50] [abbrv] wicket git commit: Wicket is compilable, tests are fails
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/icon1.gif -- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/icon1.gif b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/icon1.gif deleted file mode 100644 index c5e5c04..000 Binary files a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/icon1.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/icon2.gif -- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/icon2.gif b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/icon2.gif deleted file mode 100644 index b7d9077..000 Binary files a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/icon2.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/icon3.gif -- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/icon3.gif b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/icon3.gif deleted file mode 100644 index 45a2466..000 Binary files a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/icon3.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js -- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js deleted file mode 100644 index 9a84fc3..000 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js +++ /dev/null @@ -1,432 +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. - */ - -/* - * Wicket Date parse function for the Calendar/ Date picker component. - */ - -/*globals YAHOO: true */ - -;(function (undefined) { - 'use strict'; - - // Wicket Namespace - - if (typeof(Wicket) === "undefined") { - window.Wicket = {}; - } - - Wicket.DateTime = {}; - - /** -* Parses date from simple date pattern. -* -* Supports patterns built up from the following elements: -* yy OR for year -* M OR MM OR MMM OR for month -* d OR dd for day -* for weekday (optional) -*/ - Wicket.DateTime.parseDate = function(cfg, value) { - var numbers = value.match(/(\d+)/g); - var pattern = cfg.datePattern; - if (!numbers) { - return NaN; - } - - var day, month, year; - var arrayPos = 0; - for (var i = 0; i < pattern.length; i++) { - var c = pattern.charAt(i); - var len = 0; - while ((pattern.charAt(i) === c) && (i < pattern.length)) { - i++; - len++; - } - if (c === 'y') { - year = numbers[arrayPos++]; - } else if (c === 'M') { - var nameArray; - switch (len) { - case 3: - nameArray = cfg.calendarInit.MONTHS_SHORT; - break; - case 4: - nameArray = cfg.calendarInit.MONTHS_LONG; - break; - default: -
[03/50] [abbrv] wicket git commit: Fixes issue of pushing resources - review changes
Fixes issue of pushing resources - review changes Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ffeb024e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ffeb024e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ffeb024e Branch: refs/heads/WICKET-6105-java.time Commit: ffeb024eac595e19826f5d511555e98f1f823579 Parents: 50edbc4 Author: Tobias Soloschenko Authored: Thu Aug 3 12:57:59 2017 +0200 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 14:59:33 2017 +0300 -- .../apache/wicket/http2/markup/head/PushHeaderItem.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/ffeb024e/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java -- diff --git a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java index 94d55ad..cb7aa44 100644 --- a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java +++ b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java @@ -368,21 +368,21 @@ public class PushHeaderItem extends HeaderItem // The context path and the filter have to be applied to the URL, because otherwise // the resource is not pushed correctly - StringBuffer partialUrl = new StringBuffer(); + StringBuilder partialUrl = new StringBuilder(); String contextPath = WebApplication.get().getServletContext().getContextPath(); partialUrl.append(contextPath); - if (!contextPath.equals("/")) + if (!"/".equals(contextPath)) { - partialUrl.append("/"); + partialUrl.append('/'); } String filterPath = WebApplication.get().getWicketFilter().getFilterPath(); - if (filterPath.equals("/")) + if ("/".equals(filterPath)) { filterPath = ""; } else if (filterPath.endsWith("/")) { - filterPath = filterPath.replaceAll(".$", ""); + filterPath = filterPath.substring(0, filterPath.length() - 1); } partialUrl.append(filterPath); partialUrl.append(url.toString());
[19/50] [abbrv] wicket git commit: Start next development version
Start next development version Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2cb93c32 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2cb93c32 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2cb93c32 Branch: refs/heads/WICKET-6105-java.time Commit: 2cb93c3233e269b1647f17a56eaf08a66f71443c Parents: d851788 Author: Andrea Del Bene Authored: Sat Aug 12 17:05:55 2017 +0200 Committer: Andrea Del Bene Committed: Sat Aug 12 17:05:55 2017 +0200 -- pom.xml | 10 +- wicket-experimental/wicket-http2/pom.xml | 2 +- .../wicket-http2/wicket-http2-core/pom.xml| 2 +- .../wicket-http2/wicket-http2-jetty/pom.xml | 2 +- .../wicket-http2/wicket-http2-tomcat/pom.xml | 2 +- .../wicket-http2/wicket-http2-undertow/pom.xml| 2 +- wicket-experimental/wicket-metrics/pom.xml| 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/2cb93c32/pom.xml -- diff --git a/pom.xml b/pom.xml index ac0df56..a415b0a 100644 --- a/pom.xml +++ b/pom.xml @@ -398,31 +398,31 @@ org.apache.wicket.experimental.wicket8 wicket-metrics - 0.3-SNAPSHOT + 0.4-SNAPSHOT jar org.apache.wicket.experimental.wicket8 wicket-http2-core - 0.2-SNAPSHOT + 0.3-SNAPSHOT jar org.apache.wicket.experimental.wicket8 wicket-http2-jetty - 0.2-SNAPSHOT + 0.3-SNAPSHOT jar org.apache.wicket.experimental.wicket8 wicket-http2-tomcat - 0.2-SNAPSHOT + 0.3-SNAPSHOT jar org.apache.wicket.experimental.wicket8 wicket-http2-undertow - 0.2-SNAPSHOT + 0.3-SNAPSHOT jar http://git-wip-us.apache.org/repos/asf/wicket/blob/2cb93c32/wicket-experimental/wicket-http2/pom.xml -- diff --git a/wicket-experimental/wicket-http2/pom.xml b/wicket-experimental/wicket-http2/pom.xml index 72a30c2..e287d66 100644 --- a/wicket-experimental/wicket-http2/pom.xml +++ b/wicket-experimental/wicket-http2/pom.xml @@ -24,7 +24,7 @@ ../pom.xml wicket-http2 - 0.2-SNAPSHOT + 0.3-SNAPSHOT pom Wicket Http/2 http://git-wip-us.apache.org/repos/asf/wicket/blob/2cb93c32/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml -- diff --git a/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml index f5c50cd..d8f4f45 100644 --- a/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml +++ b/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml @@ -20,7 +20,7 @@ org.apache.wicket.experimental.wicket8 wicket-http2 - 0.2-SNAPSHOT + 0.3-SNAPSHOT ../pom.xml wicket-http2-core http://git-wip-us.apache.org/repos/asf/wicket/blob/2cb93c32/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml -- diff --git a/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml index 00e313e..792ebe4 100644 --- a/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml +++ b/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml @@ -20,7 +20,7 @@ org.apache.wicket.experimental.wicket8 wicket-http2 - 0.2-SNAPSHOT + 0.3-SNAPSHOT ../pom.xml wicket-http2-jetty http://git-wip-us.apach
[33/50] [abbrv] wicket git commit: WICKET-6462 added regression test
WICKET-6462 added regression test Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/72a5d312 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/72a5d312 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/72a5d312 Branch: refs/heads/WICKET-6105-java.time Commit: 72a5d312a1dfe63349a8ab963d9126cab5525a20 Parents: 48f4580 Author: Andrea Del Bene Authored: Tue Sep 5 12:53:08 2017 +0200 Committer: Andrea Del Bene Committed: Tue Sep 5 12:53:08 2017 +0200 -- .../ajax/form/AjaxFormSubmitBehaviorTest.java | 44 +- .../org/apache/wicket/ajax/form/PanelEdit.html | 47 +++ .../org/apache/wicket/ajax/form/PanelEdit.java | 60 3 files changed, 136 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/72a5d312/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java -- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java index 48f55a9..a0cab5d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.ajax.form; +import org.apache.wicket.Component; +import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.util.tester.FormTester; @@ -53,43 +55,55 @@ public class AjaxFormSubmitBehaviorTest extends WicketTestCase tester.startPage(NestedFormTestPage.class); NestedFormTestPage homePage = (NestedFormTestPage)tester.getLastRenderedPage(); - assertFalse(homePage.innerFormSubmitted); + assertFalse(homePage.innerSubmitted); FormTester formTester = tester.newFormTester("outer:inner"); formTester.submit("submit"); - assertTrue(homePage.innerFormSubmitted); + assertTrue(homePage.innerSubmitted); } + /** +* https://issues.apache.org/jira/browse/WICKET-6462 +* +* onSubmit must be called once. +*/ + @Test + public void formReplacement() + { + PanelEdit panelEdit = tester.startComponentInPage(PanelEdit.class); + FormTester formTester = tester.newFormTester(panelEdit.getId() + ":form"); + //AjaxFormSubmitBehavior onSubmit must not be called when form is removed + formTester.submit("submit"); + } + public static class NestedFormTestPage extends NestedFormPage { - public boolean innerFormSubmitted = false; + /** +* +*/ + private static final long serialVersionUID = -515262294201762225L; + public NestedFormTestPage() { - Form outer = new Form("outer"); - replace(outer); - - Form inner = new Form("inner") - { + Form inner = new Form("inner") { @Override - protected boolean wantSubmitOnParentFormSubmit() - { + protected boolean wantSubmitOnParentFormSubmit() { return false; } @Override - protected void onSubmit() - { + protected void onSubmit() { super.onSubmit(); - innerFormSubmitted = true; + innerSubmitted = true; } }; - outer.add(inner); - inner.add(new AjaxButton("submit", inner) {}); + + get("outer:inner").replaceWith(inner); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/72a5d312/wicket-core/src/test/java/org/apache/wicket/ajax/form/PanelEdit.html ---
[jira] [Commented] (WICKET-6462) When an Ajax Button is submitted, AjaxFormSubmitBehavior # onSubmit is called twice
[ https://issues.apache.org/jira/browse/WICKET-6462?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16176759#comment-16176759 ] ASF subversion and git services commented on WICKET-6462: - Commit 72a5d312a1dfe63349a8ab963d9126cab5525a20 in wicket's branch refs/heads/WICKET-6105-java.time from [~bitstorm] [ https://git-wip-us.apache.org/repos/asf?p=wicket.git;h=72a5d31 ] WICKET-6462 added regression test > When an Ajax Button is submitted, AjaxFormSubmitBehavior # onSubmit is called > twice > --- > > Key: WICKET-6462 > URL: https://issues.apache.org/jira/browse/WICKET-6462 > Project: Wicket > Issue Type: Bug > Components: wicket >Affects Versions: 8.0.0-M7 > Environment: 8.0.0-SNAPSHOT - 2017 08 31 >Reporter: francois >Assignee: Andrea Del Bene >Priority: Critical > Fix For: 7.9.0, 8.0.0-M8 > > Attachments: wicket_quickstart.zip > > > When an Ajax Button is submitted, AjaxFormSubmitBehavior # onSubmit is called > twice > The appears after WICKET-6455. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[04/50] [abbrv] wicket git commit: Fixes issue of pushing resources
Fixes issue of pushing resources Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/50edbc4c Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/50edbc4c Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/50edbc4c Branch: refs/heads/WICKET-6105-java.time Commit: 50edbc4c01a8ed0e4e1f2394b9db4156d7332620 Parents: 620081b Author: Tobias Soloschenko Authored: Tue Aug 1 07:32:47 2017 +0200 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 14:59:33 2017 +0300 -- .../http2/markup/head/NoopPushBuilder.java | 2 +- .../wicket/http2/markup/head/PushBuilder.java | 6 +- .../http2/markup/head/PushHeaderItem.java | 59 +++--- .../wicket/http2/markup/head/PushItem.java | 117 +-- .../http2/markup/head/PushItemHeaderValue.java | 101 .../http2/markup/head/Jetty9PushBuilder.java| 19 ++- .../wicket-http2/wicket-http2-tomcat/pom.xml| 2 +- .../http2/markup/head/Tomcat85PushBuilder.java | 17 ++- .../http2/markup/head/UndertowPushBuilder.java | 17 ++- .../main/asciidoc/http2push/http2push_1.adoc| 4 +- 10 files changed, 301 insertions(+), 43 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/50edbc4c/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/NoopPushBuilder.java -- diff --git a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/NoopPushBuilder.java b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/NoopPushBuilder.java index b9042a2..eb6dd4d 100644 --- a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/NoopPushBuilder.java +++ b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/NoopPushBuilder.java @@ -52,7 +52,7 @@ public class NoopPushBuilder implements PushBuilder * */ @Override - public void push(HttpServletRequest httpServletRequest, String... paths) + public void push(HttpServletRequest httpServletRequest, PushItem... pushItems) { LOG.warn( "This PushBuilder does nothing. Please use one of the other implementations - Jetty9 or Tomcat8.5+"); http://git-wip-us.apache.org/repos/asf/wicket/blob/50edbc4c/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushBuilder.java -- diff --git a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushBuilder.java b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushBuilder.java index 7f1eccd..c651899 100644 --- a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushBuilder.java +++ b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushBuilder.java @@ -28,8 +28,8 @@ public interface PushBuilder * * @param httpServletRequest *the http servlet request to get the push builder from -* @param paths -*the paths of the resources to be pushed +* @param pushItems +*the pushItems of the resources to be pushed */ - void push(HttpServletRequest httpServletRequest, String... paths); + void push(HttpServletRequest httpServletRequest, PushItem... pushItems); } http://git-wip-us.apache.org/repos/asf/wicket/blob/50edbc4c/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java -- diff --git a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java index 1660ef7..94d55ad 100644 --- a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java +++ b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java @@ -36,6 +36,7 @@ import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.http2.Http2Settings; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.html.WebPage; +import org.apache.wicket.protocol.http.WebApplication; import
[44/50] [abbrv] wicket git commit: Wicket is compilable, tests are fails
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yahoo/yahoo-min.js -- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yahoo/yahoo-min.js b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yahoo/yahoo-min.js deleted file mode 100644 index 4f18140..000 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yahoo/yahoo-min.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2011, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.com/yui/license.html -version: 2.9.0 -*/ -if(typeof YAHOO=="undefined"||!YAHOO){var YAHOO={};}YAHOO.namespace=function(){var b=arguments,g=null,e,c,f;for(e=0;e":">",'"':""","'":"'","/":"/","`":"`"},d=["to String","valueOf"],e={isArray:function(j){return a.toString.apply(j)===c;},isBoolean:function(j){return typeof j==="boolean";},isFunction:function(j){return(typeof j==="function")||a.toString.apply(j)===h;},isNull:function(j){return j===null;},isNumber:function(j){return typeof j==="number"&&isFinite(j);},isObject:function(j){return(j&&(typeof j==="object"||f.isFunction(j)))||false;},isString:function(j){return typeof j==="string";},isUndefined:function(j){return typeof j==="undefined";},_IEEnumFix:(YAHOO.env.ua.ie)?function(l,k){var j,n,m;for(j=0;j"'\/`]/g,function(k){return g[k];});},extend:function(m,n,l){if(!n||!m){throw new Error("extend failed, please check that "+"all dependencies are included.");}var k=function(){},j;k.prototype=n.prototype;m.prototype=new k();m.prototype.constructor=m;m.superclass=n.prototype;if(n.prototype.constructor==a.construc tor){n.prototype.constructor=n;}if(l){for(j in l){if(f.hasOwnProperty(l,j)){m.prototype[j]=l[j];}}f._IEEnumFix(m.prototype,l);}},augmentObject:function(n,m){if(!m||!n){throw new Error("Absorb failed, verify dependencies.");}var j=arguments,l,o,k=j[2];if(k&&k!==true){for(l=2;l0)?f.dump(j[l],p-1):t);}else{r.push(j[l]);}r.push(q);}if(r.l ength>1){r.pop();}r.push("]");}else{r.push("{");for(l in j){if(f.hasOwnProperty(j,l)){r.push(l+m);if(f.isObject(j[l])){r.push((p>0)?f.dump(j[l],p-1):t);}else{r.push(j[l]);}r.push(q);}}if(r.length>1){r.pop();}r.push("}");}return r.join("");},substitute:function(x,y,E,l){var D,C,B,G,t,u,F=[],p,z=x.length,A="dump",r=" ",q="{",m="}",n,w;for(;;){D=x.lastIndexOf(q,z);if(D<0){break;}C=x.indexOf(m,D);if(D+1>C){break;}p=x.substring(D+1,C);G=p;u=null;B=G.indexOf(r);if(B>-1){u=G.substring(B+1);G=G.substring(0,B);}t=y[G];if(E){t=E(G,t,u);}if(f.isObject(t)){if(f.isArray(t)){t=f.dump(t,parseInt(u,10));}else{u=u||"";n=u.indexOf(A);if(n>-1){u=u.substring(4);}w=t.toString();if(w===i||n>-1){t=f.dump(t,parseInt(u,10));}else{t=w;}}}else{if(!f.isString(t)&&!f.isNumber(t)){t="~-"+F.length+"-~";F[F.length]=p;}}x=x.substring(0,D)+t+x.substring(C+1);if(l===false){z=D-1;}}for(D=F.length-1;D>=0;D=D-1){x=x.replace(new RegExp("~-"+D+"-~"),"{"+F[D]+"}","g");}return x;},trim:function(j){try{return j.replace(/^\s+ |\s+$/g,"");}catch(k){return j; -}},merge:function(){var n={},k=arguments,j=k.length,m;for(m=0;mhttp://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yahoo/yahoo.js -- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yahoo/yahoo.js b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yahoo/yahoo.js deleted file mode 100644 index 6e33609..000 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yahoo/yahoo.js +++ /dev/null @@ -1,1229 +0,0 @@ -/* -Copyright (c) 2011, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.com/yui/license.html -version: 2.9.0 -*/ -/** - * The YAHOO object is the single global object used by YUI Library. It - * contains utility function for setting up namespaces, inheritance, and - * logging. YAHOO.util, YAHOO.widget, and YAHOO.example are namespaces - * created automatically for and used by the library. - * @module yahoo - * @title YAHOO Global - */ - -/** - * YAHOO_config is not included as part of the library. Instead it is an - * object that can be defined by the implementer immediately before - * including the YUI library. The properties included in this object - * will be used to configure global properties needed as soon as the - * library begins to load. - * @class YAHOO_config - * @static - */ - -/** - * A reference to a function that will be executed every time a YAHOO module - * is loaded. As parameter, this function will receive the version - * information for the module. See - * YAHOO.env.getVersion for the description of the version data structure. - * @property listener - * @type Function - * @static - * @default undefined - */ - -/** - * Set to true if the libra
[50/50] [abbrv] wicket git commit: Wicket is compilable, tests are fails
Wicket is compilable, tests are fails Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/11ef5c48 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/11ef5c48 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/11ef5c48 Branch: refs/heads/WICKET-6105-java.time Commit: 11ef5c48962bb42e9e823d428b3fffb1d8b126b9 Parents: a9b06ca Author: Maxim Solodovnik Authored: Sat Sep 23 00:20:26 2017 +0700 Committer: Maxim Solodovnik Committed: Sat Sep 23 00:20:26 2017 +0700 -- NOTICE |6 - README.md |4 - pom.xml |7 - testing/wicket-common-tests/pom.xml |5 - testing/wicket-js-tests/Gruntfile.js|4 - .../markup/html/form/FormComponentPanel.java|3 +- wicket-datetime/pom.xml |6 +- .../org/apache/wicket/extensions/yui/VERSION|2 - .../apache/wicket/extensions/yui/YuiLib.java| 71 - .../extensions/yui/assets/skins/sam/sprite.png | Bin 3745 -> 0 bytes .../yui/calendar/AbstractCalendar.java | 260 - .../extensions/yui/calendar/DatePicker.java | 890 --- .../extensions/yui/calendar/DatePicker.js | 21 - .../extensions/yui/calendar/DatePickerInit.js | 57 - .../extensions/yui/calendar/TimeField.java | 71 - .../yui/calendar/assets/skins/sam/calendar.css |8 - .../extensions/yui/calendar/calendar-min.js | 18 - .../wicket/extensions/yui/calendar/calendar.js | 7390 -- .../wicket/extensions/yui/calendar/icon1.gif| Bin 970 -> 0 bytes .../wicket/extensions/yui/calendar/icon2.gif| Bin 1083 -> 0 bytes .../wicket/extensions/yui/calendar/icon3.gif| Bin 1086 -> 0 bytes .../extensions/yui/calendar/wicket-date.js | 432 - .../apache/wicket/extensions/yui/dom/dom-min.js |9 - .../org/apache/wicket/extensions/yui/dom/dom.js | 1846 - .../wicket/extensions/yui/event/event-min.js| 11 - .../apache/wicket/extensions/yui/event/event.js | 2537 -- .../wicket/extensions/yui/yahoo/yahoo-min.js|8 - .../apache/wicket/extensions/yui/yahoo/yahoo.js | 1229 --- .../yui/yahoodomevent/yahoo-dom-event.js| 14 - .../extensions/yui/yuiloader/yuiloader-min.js | 11 - .../extensions/yui/yuiloader/yuiloader.js | 4065 -- .../src/main/resources/META-INF/NOTICE |3 - .../wicket/datetime/DateConverterTest.java | 86 - .../extensions/yui/calendar/DatePickerTest.java | 763 -- .../yui/calendar/DateTimeFieldTest.java | 71 - .../extensions/yui/calendar/DatesPage1.html | 25 - .../extensions/yui/calendar/DatesPage1.java | 201 - .../yui/calendar/DatesPage1_ExpectedResult.html | 142 - .../extensions/yui/calendar/DatesPage2.html | 11 - .../extensions/yui/calendar/DatesPage2.java | 53 - wicket-examples/.tomcatplugin |2 - wicket-examples/pom.xml |4 - .../bean/validation/BeanValidationPage.java |6 +- .../wicket/examples/bean/validation/Person.java | 12 +- .../wicket/examples/dates/DatesApplication.java | 32 - .../apache/wicket/examples/dates/DatesPage.html | 47 - .../apache/wicket/examples/dates/DatesPage.java | 217 - .../src/main/resources/META-INF/NOTICE |3 - .../markup/html/form/datetime/DateField.java|2 +- .../markup/html/form/datetime/DateLabel.java|2 +- .../html/form/datetime/DateTextField.java |2 +- .../html/form/datetime/DateTimeField.java | 15 +- .../form/datetime/PatternDateConverter.java |2 +- .../html/form/datetime/StyleDateConverter.java |8 +- .../html/form/datetime/DateConverterTest.java | 109 + .../main/asciidoc/helloWorld/helloWorld_1.adoc |1 - 56 files changed, 143 insertions(+), 20661 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/NOTICE -- diff --git a/NOTICE b/NOTICE index c2b4544..7cc91f9 100644 --- a/NOTICE +++ b/NOTICE @@ -59,9 +59,6 @@ src/./wicket-examples This product includes ASM, released under a BSD style license (http://asm.objectweb.org). Copyright (c) 2000-2005 INRIA, France Telecom - This product includes software developed by - Joda.org (http://www.joda.org/). - This product includes jhighlight (https://jhighlight.dev.java.net/) which is released under CDDL 1.0 license (http://www.opensource.org/licenses/cddl1.php). @@ -114,9 +111,6 @@ src/./wicket-datetime http://developer.yahoo.net/yui/license.txt Copyright (c) 2010, Yahoo! Inc. - This product includes software developed by - Joda.org (http://www.joda.org/). -
[12/50] [abbrv] wicket git commit: isComponentOnAjaxResponse now checks whether a component's enclosure is on ajax response
isComponentOnAjaxResponse now checks whether a component's enclosure is on ajax response Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/73d094b6 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/73d094b6 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/73d094b6 Branch: refs/heads/WICKET-6105-java.time Commit: 73d094b60a691b2f07d7900e78bcf76ac45ea28a Parents: 5f2809c Author: Domas Poliakas Authored: Thu Jul 27 12:19:42 2017 +0100 Committer: Martin Tzvetanov Grigorov Committed: Sun Aug 6 15:27:21 2017 +0300 -- .../protocol/http/AjaxEnclosureListener.java| 5 +++-- .../wicket/util/tester/BaseWicketTester.java| 20 +++- 2 files changed, 22 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/wicket/blob/73d094b6/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 63e493f..b966580 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 @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.markup.html.internal.Enclosure; import org.apache.wicket.markup.html.internal.InlineEnclosure; import org.apache.wicket.markup.parser.filter.InlineEnclosureHandler; import org.apache.wicket.util.visit.IVisit; @@ -107,8 +108,8 @@ public class AjaxEnclosureListener implements AjaxRequestTarget.IListener * @param enclosure * @return true if the given component is the controlling child of the given InlineEnclosure */ - private boolean isControllerOfEnclosure(final Component component, - final InlineEnclosure enclosure) + public static boolean isControllerOfEnclosure(final Component component, + final Enclosure enclosure) { return (enclosure.get(enclosure.getChildId()) == component || // #queue() enclosure.getParent().get(enclosure.getChildId()) == component); // #add() http://git-wip-us.apache.org/repos/asf/wicket/blob/73d094b6/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 ddcffb6..13c16fb 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 @@ -82,6 +82,7 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.markup.html.form.SubmitLink; +import org.apache.wicket.markup.html.internal.Enclosure; import org.apache.wicket.markup.html.link.AbstractLink; import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.html.link.ExternalLink; @@ -96,6 +97,7 @@ import org.apache.wicket.mock.MockRequestParameters; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.page.IPageManager; import org.apache.wicket.page.IPageManagerContext; +import org.apache.wicket.protocol.http.AjaxEnclosureListener; import org.apache.wicket.protocol.http.IMetaDataBufferingWebResponse; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.protocol.http.WicketFilter; @@ -2324,7 +2326,23 @@ public class BaseWicketTester boolean isComponentInAjaxResponse = ajaxResponse.matches("(?s).*]*?>.*"); failMessage = "Component wasn't found in the AJAX response. " + componentInfo; - return isTrue(failMessage, isComponentInAjaxResponse); + result = isTrue(failMessage, isComponentInAjaxResponse); + + // Check if the component has been included as part of an enclosure render + Enclosure enclosure = getLastRenderedPage().visitChildren(Enclosure.class, (Enclosure enc, IVisit visit) -> { + if (AjaxEnclosureListener.isControllerOfEnclosure(component, enc)){ + visit.stop(enc); + } + }); + + if (enclosure != null){ + failMessage =
[jira] [Commented] (WICKET-6471) FileSystemResource file descriptor leak
[ https://issues.apache.org/jira/browse/WICKET-6471?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16176354#comment-16176354 ] Tobias Soloschenko commented on WICKET-6471: Until 7.10.0 or 8.0.0 is released you can override the method to fix it. > FileSystemResource file descriptor leak > --- > > Key: WICKET-6471 > URL: https://issues.apache.org/jira/browse/WICKET-6471 > Project: Wicket > Issue Type: Bug > Components: wicket >Affects Versions: 7.9.0 >Reporter: Boris Goldowsky >Assignee: Sven Meier > Fix For: 8.0.0-M8, 7.10.0 > > Attachments: frquickstart.zip > > > FileSystemResource does not appear to close the InputStream that it creates. > I believe it should call setClose(true) on the PartWriterCallback. > To verify the problem, see the attached quick start. Change the filename in > HomePage.java to point to some valid image file on your system. After viewing > the home page in a browser, check for files that the jetty process has open, > eg: > {noformat} > lsof -p PID | grep logo > {noformat} > If you load the home page a few more times, using Shift-reload to avoid > simply loading from cache, you can see many file descriptors pointing to the > image file are kept open: > {noformat} > java87278 borisgoldowsky txt REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 175r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 180r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 181r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > {noformat} -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (WICKET-6471) FileSystemResource file descriptor leak
[ https://issues.apache.org/jira/browse/WICKET-6471?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16176300#comment-16176300 ] Boris Goldowsky commented on WICKET-6471: - Thanks for the immediate fix! > FileSystemResource file descriptor leak > --- > > Key: WICKET-6471 > URL: https://issues.apache.org/jira/browse/WICKET-6471 > Project: Wicket > Issue Type: Bug > Components: wicket >Affects Versions: 7.9.0 >Reporter: Boris Goldowsky >Assignee: Sven Meier > Fix For: 8.0.0-M8, 7.10.0 > > Attachments: frquickstart.zip > > > FileSystemResource does not appear to close the InputStream that it creates. > I believe it should call setClose(true) on the PartWriterCallback. > To verify the problem, see the attached quick start. Change the filename in > HomePage.java to point to some valid image file on your system. After viewing > the home page in a browser, check for files that the jetty process has open, > eg: > {noformat} > lsof -p PID | grep logo > {noformat} > If you load the home page a few more times, using Shift-reload to avoid > simply loading from cache, you can see many file descriptors pointing to the > image file are kept open: > {noformat} > java87278 borisgoldowsky txt REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 175r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 180r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 181r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > {noformat} -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Comment Edited] (WICKET-6471) FileSystemResource file descriptor leak
[ https://issues.apache.org/jira/browse/WICKET-6471?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16176226#comment-16176226 ] Tobias Soloschenko edited comment on WICKET-6471 at 9/22/17 10:17 AM: -- Thanks from me, too. [~svenmeier] - is the fix version 7.9.0 or 7.10.0? Edit: I changed it to 7.10.0 was (Author: klopfdreh): Thanks from me, too. [~svenmeier] - is the fix version 7.9.0 or 7.10.0? > FileSystemResource file descriptor leak > --- > > Key: WICKET-6471 > URL: https://issues.apache.org/jira/browse/WICKET-6471 > Project: Wicket > Issue Type: Bug > Components: wicket >Affects Versions: 7.9.0 >Reporter: Boris Goldowsky >Assignee: Sven Meier > Fix For: 8.0.0-M8, 7.10.0 > > Attachments: frquickstart.zip > > > FileSystemResource does not appear to close the InputStream that it creates. > I believe it should call setClose(true) on the PartWriterCallback. > To verify the problem, see the attached quick start. Change the filename in > HomePage.java to point to some valid image file on your system. After viewing > the home page in a browser, check for files that the jetty process has open, > eg: > {noformat} > lsof -p PID | grep logo > {noformat} > If you load the home page a few more times, using Shift-reload to avoid > simply loading from cache, you can see many file descriptors pointing to the > image file are kept open: > {noformat} > java87278 borisgoldowsky txt REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 175r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 180r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 181r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > {noformat} -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Updated] (WICKET-6471) FileSystemResource file descriptor leak
[ https://issues.apache.org/jira/browse/WICKET-6471?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Tobias Soloschenko updated WICKET-6471: --- Fix Version/s: (was: 7.9.0) 7.10.0 > FileSystemResource file descriptor leak > --- > > Key: WICKET-6471 > URL: https://issues.apache.org/jira/browse/WICKET-6471 > Project: Wicket > Issue Type: Bug > Components: wicket >Affects Versions: 7.9.0 >Reporter: Boris Goldowsky >Assignee: Sven Meier > Fix For: 8.0.0-M8, 7.10.0 > > Attachments: frquickstart.zip > > > FileSystemResource does not appear to close the InputStream that it creates. > I believe it should call setClose(true) on the PartWriterCallback. > To verify the problem, see the attached quick start. Change the filename in > HomePage.java to point to some valid image file on your system. After viewing > the home page in a browser, check for files that the jetty process has open, > eg: > {noformat} > lsof -p PID | grep logo > {noformat} > If you load the home page a few more times, using Shift-reload to avoid > simply loading from cache, you can see many file descriptors pointing to the > image file are kept open: > {noformat} > java87278 borisgoldowsky txt REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 175r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 180r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 181r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > {noformat} -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Comment Edited] (WICKET-6471) FileSystemResource file descriptor leak
[ https://issues.apache.org/jira/browse/WICKET-6471?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16176226#comment-16176226 ] Tobias Soloschenko edited comment on WICKET-6471 at 9/22/17 10:16 AM: -- Thanks from me, too. [~svenmeier] - is the fix version 7.9.0 or 7.10.0? was (Author: klopfdreh): Thanks from me, too. > FileSystemResource file descriptor leak > --- > > Key: WICKET-6471 > URL: https://issues.apache.org/jira/browse/WICKET-6471 > Project: Wicket > Issue Type: Bug > Components: wicket >Affects Versions: 7.9.0 >Reporter: Boris Goldowsky >Assignee: Sven Meier > Fix For: 7.9.0, 8.0.0-M8 > > Attachments: frquickstart.zip > > > FileSystemResource does not appear to close the InputStream that it creates. > I believe it should call setClose(true) on the PartWriterCallback. > To verify the problem, see the attached quick start. Change the filename in > HomePage.java to point to some valid image file on your system. After viewing > the home page in a browser, check for files that the jetty process has open, > eg: > {noformat} > lsof -p PID | grep logo > {noformat} > If you load the home page a few more times, using Shift-reload to avoid > simply loading from cache, you can see many file descriptors pointing to the > image file are kept open: > {noformat} > java87278 borisgoldowsky txt REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 175r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 180r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 181r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > {noformat} -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (WICKET-6471) FileSystemResource file descriptor leak
[ https://issues.apache.org/jira/browse/WICKET-6471?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16176226#comment-16176226 ] Tobias Soloschenko commented on WICKET-6471: Thanks from me, too. > FileSystemResource file descriptor leak > --- > > Key: WICKET-6471 > URL: https://issues.apache.org/jira/browse/WICKET-6471 > Project: Wicket > Issue Type: Bug > Components: wicket >Affects Versions: 7.9.0 >Reporter: Boris Goldowsky >Assignee: Sven Meier > Fix For: 7.9.0, 8.0.0-M8 > > Attachments: frquickstart.zip > > > FileSystemResource does not appear to close the InputStream that it creates. > I believe it should call setClose(true) on the PartWriterCallback. > To verify the problem, see the attached quick start. Change the filename in > HomePage.java to point to some valid image file on your system. After viewing > the home page in a browser, check for files that the jetty process has open, > eg: > {noformat} > lsof -p PID | grep logo > {noformat} > If you load the home page a few more times, using Shift-reload to avoid > simply loading from cache, you can see many file descriptors pointing to the > image file are kept open: > {noformat} > java87278 borisgoldowsky txt REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 175r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 180r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > java87278 borisgoldowsky 181r REG1,4 12244 > 103583676 /Users/borisgoldowsky/idea/frquickstart/src/main/webapp/logo.png > {noformat} -- This message was sent by Atlassian JIRA (v6.4.14#64029)