[jira] Assigned: (WICKET-3147) Servlet 3 Annotation @WebFilter is not supported
[
https://issues.apache.org/jira/browse/WICKET-3147?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Martin Grigorov reassigned WICKET-3147:
---
Assignee: Martin Grigorov (was: Igor Vaynberg)
Servlet 3 Annotation @WebFilter is not supported
Key: WICKET-3147
URL: https://issues.apache.org/jira/browse/WICKET-3147
Project: Wicket
Issue Type: Improvement
Components: wicket
Affects Versions: 1.4.9, 1.4.10, 1.4.13
Environment: Glassfish 3
Reporter: Zeti
Assignee: Martin Grigorov
Fix For: 1.6.0
Attachments: wicket.tgz
Trying to run my application this way:
@WebFilter(value=/*, urlPatterns=/*, initParams = {
@WebInitParam(
name=applicationClassName,
value=de.logviewer.HomeApp
)
}
)
public class HomeFilter extends WicketFilter{ }
results in the follwing exception:
Servlet.service() for servlet default threw exception
java.lang.IllegalArgumentException: Error initializing WicketFilter - you
have no filter-mapping element with a url-pattern that uses filter:
de.logviewer.HomeFilter at
org.apache.wicket.protocol.http.WicketFilter.getFilterPath(WicketFilter.java:930)
at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:677)
at
org.apache.catalina.core.ApplicationFilterConfig.getFilter(ApplicationFilterConfig.java:259)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:237)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:215)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:277)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:188)
at
org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:641)
at com.sun.enterprise.web.WebPipeline.invoke(WebPipeline.java:97) at
com.sun.enterprise.web.PESessionLockingStandardPipeline.invoke(PESessionLockingStandardPipeline.java:85)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:185)
at
org.apache.catalina.connector.CoyoteAdapter.doService(CoyoteAdapter.java:325)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:226)
at
com.sun.enterprise.v3.services.impl.ContainerMapper.service(ContainerMapper.java:165)
at com.sun.grizzly.http.ProcessorTask.invokeAdapter(ProcessorTask.java:791)
at com.sun.grizzly.http.ProcessorTask.doProcess(ProcessorTask.java:693) at
com.sun.grizzly.http.ProcessorTask.process(ProcessorTask.java:954) at
com.sun.grizzly.http.DefaultProtocolFilter.execute(DefaultProtocolFilter.java:170)
at
com.sun.grizzly.DefaultProtocolChain.executeProtocolFilter(DefaultProtocolChain.java:135)
at
com.sun.grizzly.DefaultProtocolChain.execute(DefaultProtocolChain.java:102)
at com.sun.grizzly.DefaultProtocolChain.execute(DefaultProtocolChain.java:88)
at com.sun.grizzly.http.HttpProtocolChain.execute(HttpProtocolChain.java:76)
at
com.sun.grizzly.ProtocolChainContextTask.doCall(ProtocolChainContextTask.java:53)
at
com.sun.grizzly.SelectionKeyContextTask.call(SelectionKeyContextTask.java:57)
at com.sun.grizzly.ContextTask.run(ContextTask.java:69) at
com.sun.grizzly.util.AbstractThreadPool$Worker.doWork(AbstractThreadPool.java:330)
at
com.sun.grizzly.util.AbstractThreadPool$Worker.run(AbstractThreadPool.java:309)
at java.lang.Thread.run(Thread.java:662)
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
svn commit: r1031979 - /wicket/trunk/pom.xml
Author: mgrigorov
Date: Sat Nov 6 09:19:40 2010
New Revision: 1031979
URL: http://svn.apache.org/viewvc?rev=1031979view=rev
Log:
WICKET-3147 Servlet 3 Annotation @WebFilter is not supported
Revert the changes in pom.xml so that Wicket depends on Servlet API 2.3 again
Modified:
wicket/trunk/pom.xml
Modified: wicket/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=1031979r1=1031978r2=1031979view=diff
==
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Sat Nov 6 09:19:40 2010
@@ -417,9 +417,9 @@
scopetest/scope
/dependency
dependency
- groupIdorg.mortbay.jetty/groupId
+ groupIdjavax.servlet/groupId
artifactIdservlet-api/artifactId
- version3.0.20100224/version
+ version2.3/version
scopeprovided/scope
/dependency
dependency
@@ -460,12 +460,12 @@
version${jetty.version}/version
scopeprovided/scope
/dependency
- !--dependency
+ dependency
groupIdorg.mortbay.jetty/groupId
artifactIdservlet-api-2.5/artifactId
version${jetty.version}/version
scopeprovided/scope
- /dependency--
+ /dependency
dependency
groupIdmx4j/groupId
artifactIdmx4j/artifactId
@@ -551,7 +551,7 @@
scopetest/scope
/dependency
dependency
- groupIdorg.mortbay.jetty/groupId
+ groupIdjavax.servlet/groupId
artifactIdservlet-api/artifactId
scopeprovided/scope
/dependency
svn commit: r1031986 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
Author: mgrigorov
Date: Sat Nov 6 09:37:08 2010
New Revision: 1031986
URL: http://svn.apache.org/viewvc?rev=1031986view=rev
Log:
WICKET-3147 Servlet 3 Annotation @WebFilter is not supported
Allow 'filterPath' to be .
Both
org.apache.wicket.protocol.http.WicketFilter.getFilterPathFromConfig(FilterConfig)
and
org.apache.wicket.protocol.http.WicketFilter.getFilterPathFromWebXml(boolean,
FilterConfig) could return .
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=1031986r1=1031985r2=1031986view=diff
==
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
Sat Nov 6 09:37:08 2010
@@ -117,7 +117,7 @@ public class WicketFilter implements Fil
// Make sure getFilterPath() gets called before
checkIfRedirectRequired()
String filterPath = getFilterPath(httpServletRequest);
- if (Strings.isEmpty(filterPath))
+ if (filterPath == null)
{
throw new IllegalStateException(filter path
was not configured);
}
@@ -407,19 +407,22 @@ public class WicketFilter implements Fil
protected String getFilterPathFromConfig(FilterConfig filterConfig)
{
String result =
filterConfig.getInitParameter(FILTER_MAPPING_PARAM);
- if (result == null || result.equals(/*))
+ if (result != null)
{
- filterPath = ;
- }
- else if (!result.startsWith(/) || !result.endsWith(/*))
- {
- throw new WicketRuntimeException(Your +
FILTER_MAPPING_PARAM +
-must start with \/\ and end with \/*\. It
is: + result);
- }
- else
- {
- // remove leading / and trailing *
- filterPath = result.substring(1, result.length() - 1);
+ if (result.equals(/*))
+ {
+ filterPath = ;
+ }
+ else if (!result.startsWith(/) ||
!result.endsWith(/*))
+ {
+ throw new WicketRuntimeException(Your +
FILTER_MAPPING_PARAM +
+must start with \/\ and end with
\/*\. It is: + result);
+ }
+ else
+ {
+ // remove leading / and trailing *
+ filterPath = result.substring(1,
result.length() - 1);
+ }
}
return filterPath;
}
[jira] Commented: (WICKET-3147) Servlet 3 Annotation @WebFilter is not supported
[
https://issues.apache.org/jira/browse/WICKET-3147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12928949#action_12928949
]
Hudson commented on WICKET-3147:
Integrated in Apache Wicket 1.5.x #488 (See
[https://hudson.apache.org/hudson/job/Apache%20Wicket%201.5.x/488/])
WICKET-3147 Servlet 3 Annotation @WebFilter is not supported
Allow 'filterPath' to be .
Both
org.apache.wicket.protocol.http.WicketFilter.getFilterPathFromConfig(FilterConfig)
and
org.apache.wicket.protocol.http.WicketFilter.getFilterPathFromWebXml(boolean,
FilterConfig) could return .
WICKET-3147 Servlet 3 Annotation @WebFilter is not supported
Revert the changes in pom.xml so that Wicket depends on Servlet API 2.3 again
Servlet 3 Annotation @WebFilter is not supported
Key: WICKET-3147
URL: https://issues.apache.org/jira/browse/WICKET-3147
Project: Wicket
Issue Type: Improvement
Components: wicket
Affects Versions: 1.4.9, 1.4.10, 1.4.13
Environment: Glassfish 3
Reporter: Zeti
Assignee: Martin Grigorov
Fix For: 1.6.0
Attachments: wicket.tgz
Trying to run my application this way:
@WebFilter(value=/*, urlPatterns=/*, initParams = {
@WebInitParam(
name=applicationClassName,
value=de.logviewer.HomeApp
)
}
)
public class HomeFilter extends WicketFilter{ }
results in the follwing exception:
Servlet.service() for servlet default threw exception
java.lang.IllegalArgumentException: Error initializing WicketFilter - you
have no filter-mapping element with a url-pattern that uses filter:
de.logviewer.HomeFilter at
org.apache.wicket.protocol.http.WicketFilter.getFilterPath(WicketFilter.java:930)
at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:677)
at
org.apache.catalina.core.ApplicationFilterConfig.getFilter(ApplicationFilterConfig.java:259)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:237)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:215)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:277)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:188)
at
org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:641)
at com.sun.enterprise.web.WebPipeline.invoke(WebPipeline.java:97) at
com.sun.enterprise.web.PESessionLockingStandardPipeline.invoke(PESessionLockingStandardPipeline.java:85)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:185)
at
org.apache.catalina.connector.CoyoteAdapter.doService(CoyoteAdapter.java:325)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:226)
at
com.sun.enterprise.v3.services.impl.ContainerMapper.service(ContainerMapper.java:165)
at com.sun.grizzly.http.ProcessorTask.invokeAdapter(ProcessorTask.java:791)
at com.sun.grizzly.http.ProcessorTask.doProcess(ProcessorTask.java:693) at
com.sun.grizzly.http.ProcessorTask.process(ProcessorTask.java:954) at
com.sun.grizzly.http.DefaultProtocolFilter.execute(DefaultProtocolFilter.java:170)
at
com.sun.grizzly.DefaultProtocolChain.executeProtocolFilter(DefaultProtocolChain.java:135)
at
com.sun.grizzly.DefaultProtocolChain.execute(DefaultProtocolChain.java:102)
at com.sun.grizzly.DefaultProtocolChain.execute(DefaultProtocolChain.java:88)
at com.sun.grizzly.http.HttpProtocolChain.execute(HttpProtocolChain.java:76)
at
com.sun.grizzly.ProtocolChainContextTask.doCall(ProtocolChainContextTask.java:53)
at
com.sun.grizzly.SelectionKeyContextTask.call(SelectionKeyContextTask.java:57)
at com.sun.grizzly.ContextTask.run(ContextTask.java:69) at
com.sun.grizzly.util.AbstractThreadPool$Worker.doWork(AbstractThreadPool.java:330)
at
com.sun.grizzly.util.AbstractThreadPool$Worker.run(AbstractThreadPool.java:309)
at java.lang.Thread.run(Thread.java:662)
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[jira] Commented: (WICKET-3148) Dropped support for Servlet 2.5 inadvertently
[ https://issues.apache.org/jira/browse/WICKET-3148?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12928950#action_12928950 ] Hudson commented on WICKET-3148: Integrated in Apache Wicket 1.5.x #488 (See [https://hudson.apache.org/hudson/job/Apache%20Wicket%201.5.x/488/]) Dropped support for Servlet 2.5 inadvertently - Key: WICKET-3148 URL: https://issues.apache.org/jira/browse/WICKET-3148 Project: Wicket Issue Type: Bug Components: wicket Affects Versions: 1.5-M3 Reporter: Dominik Drzewiecki Assignee: Igor Vaynberg Priority: Critical Fix For: 1.5-M4 Fixing 3146 in r1031086 resulted in introducing a dependency on javax.servlet.annotation.* thus rendering WicketFilter unusable in pre-3.0 servlet containers. If pruning the large base of 2.5-compatible containers was intentional then I'd also suggest switching to java 6 (Although servlet 3.0 specs does not explicitly indicate java 6 as a requirement, all 3.0 compliant containers that I'm aware of - namely Jetty 8, Websphere 8, tomcat 7, glassfish 3 - require java 6). Not to mention that this should be spoken out loud (https://cwiki.apache.org/WICKET/migration-to-wicket-15.html does not mention anything about container compliance) -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.
[jira] Commented: (WICKET-3138) Wicket 1.5 and GAE
[ https://issues.apache.org/jira/browse/WICKET-3138?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12928960#action_12928960 ] Peter Ertl commented on WICKET-3138: since there is org.apache.wicket.session.HttpSessionStore in current 1.5.x now we could probably close this Wicket 1.5 and GAE -- Key: WICKET-3138 URL: https://issues.apache.org/jira/browse/WICKET-3138 Project: Wicket Issue Type: New Feature Components: wicket Affects Versions: 1.5-M2.1 Reporter: Alexandru Objelean Assignee: Martin Grigorov Create a http session based store to make wicket 1.5 work with GAE -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.
svn commit: r1032027 - in /wicket/trunk: wicket-jmx/src/main/java/org/apache/wicket/jmx/ wicket/src/main/java/org/apache/wicket/settings/
Author: pete
Date: Sat Nov 6 12:39:23 2010
New Revision: 1032027
URL: http://svn.apache.org/viewvc?rev=1032027view=rev
Log:
WICKET-3068 remove obsolete settings:
[removed] SessionSettings#setMaxPageMaps()
Modified:
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettingsMBean.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
Modified:
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java?rev=1032027r1=1032026r2=1032027view=diff
==
---
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java
(original)
+++
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java
Sat Nov 6 12:39:23 2010
@@ -50,13 +50,4 @@ public class SessionSettings implements
{
return Stringz.className(application.getSessionStore());
}
-
- /**
-* @see org.apache.wicket.jmx.SessionSettingsMBean#setMaxPageMaps(int)
-*/
- public void setMaxPageMaps(int maxPageMaps)
- {
- application.getSessionSettings().setMaxPageMaps(maxPageMaps);
- }
-
}
Modified:
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettingsMBean.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettingsMBean.java?rev=1032027r1=1032026r2=1032027view=diff
==
---
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettingsMBean.java
(original)
+++
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettingsMBean.java
Sat Nov 6 12:39:23 2010
@@ -37,12 +37,4 @@ public interface SessionSettingsMBean
* @return the session store implementation
*/
String getSessionStore();
-
- /**
-* Sets maximum number of page maps allowed in this session
-*
-* @param maxPageMaps
-*Maximum number of page maps
-*/
- void setMaxPageMaps(int maxPageMaps);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java?rev=1032027r1=1032026r2=1032027view=diff
==
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java
Sat Nov 6 12:39:23 2010
@@ -42,14 +42,6 @@ public interface ISessionSettings
IPageFactory getPageFactory();
/**
-* Sets maximum number of page maps allowed in this session
-*
-* @param maxPageMaps
-*Maximum number of page maps
-*/
- void setMaxPageMaps(int maxPageMaps);
-
- /**
* Sets the factory to be used when creating pages.
*
* @param pageFactory
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java?rev=1032027r1=1032026r2=1032027view=diff
==
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
Sat Nov 6 12:39:23 2010
@@ -186,9 +186,6 @@ public final class Settings
/** if true than throw an exception if the xml declaration is missing
from the markup file */
private boolean throwExceptionOnMissingXmlDeclaration = false;
- /** To help prevent denial of service attacks */
- private int maxPageMaps = 5;
-
/** Map to look up resource factories by name */
private final MapString, IResourceFactory nameToResourceFactory = new
HashMapString, IResourceFactory();
@@ -932,14 +929,6 @@ public final class Settings
}
/**
-* @see org.apache.wicket.settings.ISessionSettings#setMaxPageMaps(int)
-*/
- public final void setMaxPageMaps(int maxPageMaps)
- {
- this.maxPageMaps = maxPageMaps;
- }
-
- /**
* @see
org.apache.wicket.settings.IResourceSettings#setPackageResourceGuard(org.apache.wicket.markup.html.IPackageResourceGuard)
*/
public void setPackageResourceGuard(IPackageResourceGuard
[CONF] Apache Wicket Companies that provide services
Companies that provide services Page edited by jWeekend Changes (4) ... * [Jonathan Locke|http://web.mac.com/jonathan.locke/iWeb/JonathanLocke/Consulting.html] originated Wicket and provides consulting services. * [JTeam|http://www.jteam.nl] is a leading Dutch solutions company and sister company of SpringSource, offering Wicket training courses in Holland and Belgium in partnership with [jWeekend|http://www.jWeekend.com]. * [Zenika|http://www.zenika.com] is a leading French training company, offering Wicket courses in Paris in partnership with [jWeekend|http://jWeekend.co.uk]. [jWeekend|http://www.jWeekend.com]. * [Wicket Support|http://www.wicket-support.com] is a company that provides training, consultations and commercial support for Wicket. * [Wicket Training|http://www.wickettraining.com] provides training classes, on-site training, and consulting for Wicket (US-Based). ... * [Skillsmatter|http://skillsmatter.com/wicket-training-course]is a leading provider of training, mentoring and project based skills transfer. Amongst other things, they provide Wicket courses. * [Anyware Technologies|http://www.anyware-tech.com/en/st/Training/frameworks/wicket.html] is a french company that provides many training courses, including Wicket. * [jWeekend|http://jWeekend.co.uk] provides weekday and _weekend_, expert training in Java, OO Wicket (co-developed and co-presented by Al Maw). London Brighton. * [jWeekend|http://www.jWeekend.com] provides consultancy, product development and weekday/weekend, expert training globally, in Java technologies, Scala, OO also in Wicket, since 2007. * [comSysto GmbH|http://blog.comsysto.com] provides Wicket consulting and training in Germany in cooperation with jWeekend. Furthermore they provide consulting services in Spring and Oracle BI. * [Doculibre Inc.|http://www.doculibre.com] is a Canadian company that provides Wicket support and development. ... Full Content List of companies that provide commercial services for Wicket. Wicket Support Services Jonathan Locke originated Wicket and provides consulting services. JTeam is a leading Dutch solutions company and sister company of SpringSource, offering Wicket training courses in Holland and Belgium in partnership with jWeekend. Zenika is a leading French training company, offering Wicket courses in Paris in partnership with jWeekend. Wicket Support is a company that provides training, consultations and commercial support for Wicket. Wicket Training provides training classes, on-site training, and consulting for Wicket (US-Based). Jaywayis a premier Java consulting group that via its Malaysian subsidiary provides services for Wicket development, especially running Wicket in OSGi environments. Jayway DKis a premier Java consulting group located in Denmark provides services for Wicket development, course etc. Skillsmatteris a leading provider of training, mentoring and project based skills transfer. Amongst other things, they provide Wicket courses. Anyware Technologies is a french company that provides many training courses, including Wicket. jWeekend provides consultancy, product development and weekday/weekend, expert training globally, in Java technologies, Scala, OO also in Wicket, since 2007. comSysto GmbH provides Wicket consulting and training in Germany in cooperation with jWeekend. Furthermore they provide consulting services in Spring and Oracle BI. Doculibre Inc. is a Canadian company that provides Wicket support and development. Xavier Hanin is a french independent consultant who provides services for Wicket development and training. Curalia is Java consulting company that provides services for Wicket development. The Macau Productivity and Technology Transfer Center is a non-profit organization that is including Wicket in its extensive training programs. Reaktor Innovations is a Finnish company that provides Wicket development and training. Ralf Ebert is a German independent consultant who provides services for Wicket development and German Wicket training courses. JointEffort is a small Dutch company that provides training, consultations and services for Wicket development. Leverage IT is a small South African IT Consulting and Development company that specializes in the use of Java Open Source Technologies, Platforms and Frameworks, including Wicket. XENTUM is a Polish company that provides Wicket development and support. automação.info is a Brazilian company that provides Wicket development. Genuco Systems is a company with offices in Hong Kong and Canada that provide leading edge Wicket development solutions as well as financial services. Devotek IT is the
svn commit: r1032029 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket: SystemMapper.java protocol/http/RequestUtils.java request/handler/EmptyAjaxRequestHandler.java request/resource/Abstract
Author: pete Date: Sat Nov 6 12:52:20 2010 New Revision: 1032029 URL: http://svn.apache.org/viewvc?rev=1032029view=rev Log: remove unused imports Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java?rev=1032029r1=1032028r2=1032029view=diff == --- wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java Sat Nov 6 12:52:20 2010 @@ -24,7 +24,6 @@ import org.apache.wicket.request.mapper. import org.apache.wicket.request.mapper.ResourceReferenceMapper; import org.apache.wicket.request.mapper.parameter.PageParametersEncoder; import org.apache.wicket.util.IProvider; -import org.apache.wicket.util.ValueProvider; /** * Mapper that encapsulates mappers that are necessary for Wicket to function. Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java?rev=1032029r1=1032028r2=1032029view=diff == --- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java Sat Nov 6 12:52:20 2010 @@ -28,7 +28,6 @@ import org.apache.wicket.request.UrlDeco import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.string.Strings; -import org.apache.wicket.util.time.Duration; /** * Wicket Http specific utilities class. Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java?rev=1032029r1=1032028r2=1032029view=diff == --- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/EmptyAjaxRequestHandler.java Sat Nov 6 12:52:20 2010 @@ -17,7 +17,6 @@ package org.apache.wicket.request.handler; import org.apache.wicket.Application; -import org.apache.wicket.protocol.http.RequestUtils; import org.apache.wicket.request.IRequestCycle; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.http.WebResponse; Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java?rev=1032029r1=1032028r2=1032029view=diff == --- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java Sat Nov 6 12:52:20 2010 @@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletRes import org.apache.wicket.Application; import org.apache.wicket.WicketRuntimeException; -import org.apache.wicket.protocol.http.RequestUtils; import org.apache.wicket.request.Response; import org.apache.wicket.request.http.WebRequest; import org.apache.wicket.request.http.WebResponse;
svn commit: r1032031 - in /wicket/trunk: wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java wicket/src/test/java/org/apache/wicket/util/tester/MockPag
Author: pete
Date: Sat Nov 6 12:54:47 2010
New Revision: 1032031
URL: http://svn.apache.org/viewvc?rev=1032031view=rev
Log:
replaced deprecated method with current one
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageAjaxSubmitLinkSubmitsWholeForm.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=1032031r1=1032030r2=1032031view=diff
==
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Sat Nov 6 12:54:47 2010
@@ -24,7 +24,6 @@ import org.apache.wicket.ajax.AbstractDe
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.IAjaxCallDecorator;
import org.apache.wicket.ajax.calldecorator.CancelEventIfNoAjaxDecorator;
-import
org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow.PageCreator;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -355,7 +354,7 @@ public class ModalWindow extends Panel
getContent().setVisible(false);
if (isCustomComponent())
{
- target.addComponent(getContent());
+ target.add(getContent());
}
target.appendJavascript(getCloseJavacript());
shown = false;
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageAjaxSubmitLinkSubmitsWholeForm.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageAjaxSubmitLinkSubmitsWholeForm.java?rev=1032031r1=1032030r2=1032031view=diff
==
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageAjaxSubmitLinkSubmitsWholeForm.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageAjaxSubmitLinkSubmitsWholeForm.java
Sat Nov 6 12:54:47 2010
@@ -71,7 +71,7 @@ public class MockPageAjaxSubmitLinkSubmi
protected void onSubmit(AjaxRequestTarget target,
Form? form)
{
text = Hello + name;
- target.addComponent(label);
+ target.add(label);
}
@Override
@@ -90,7 +90,7 @@ public class MockPageAjaxSubmitLinkSubmi
protected void onSubmit(AjaxRequestTarget target,
Form? form)
{
text = Goodbye + name;
- target.addComponent(label);
+ target.add(label);
}
@Override
svn commit: r1032035 - in /wicket/trunk/wicket/src: main/java/org/apache/wicket/protocol/http/ main/java/org/apache/wicket/protocol/http/mock/ main/java/org/apache/wicket/protocol/http/request/ test/j
Author: pete
Date: Sat Nov 6 13:05:05 2010
New Revision: 1032035
URL: http://svn.apache.org/viewvc?rev=1032035view=rev
Log:
fixed a few broken javadoc links
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestHandler.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/https/HttpsRequestCheckerTest.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java?rev=1032035r1=1032034r2=1032035view=diff
==
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java
Sat Nov 6 13:05:05 2010
@@ -562,7 +562,7 @@ class BufferedHttpServletResponse implem
}
/**
-* @see javax.servlet.http.HttpServletResponse#getStatus()
+* @see javax.servlet.http.HttpServletResponse#setStatus(int)
*/
public int getStatus()
{
@@ -570,7 +570,7 @@ class BufferedHttpServletResponse implem
}
/**
-* @see
javax.servlet.http.HttpServletResponse#getHeader(java.lang.String)
+* @see
javax.servlet.http.HttpServletRequest#getHeader(java.lang.String)
*/
public String getHeader(String name)
{
@@ -583,7 +583,7 @@ class BufferedHttpServletResponse implem
}
/**
-* @see
javax.servlet.http.HttpServletResponse#getHeaders(java.lang.String)
+* @see
javax.servlet.http.HttpServletRequest#getHeaders(java.lang.String)
*/
public CollectionString getHeaders(String name)
{
@@ -601,7 +601,7 @@ class BufferedHttpServletResponse implem
}
/**
-* @see javax.servlet.http.HttpServletResponse#getHeaderNames()
+* @see javax.servlet.http.HttpServletRequest#getHeaderNames()
*/
public CollectionString getHeaderNames()
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java?rev=1032035r1=1032034r2=1032035view=diff
==
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
Sat Nov 6 13:05:05 2010
@@ -518,7 +518,7 @@ public class MockHttpServletResponse imp
/**
* @return url
-* @see org.apache.wicket.request.Request#getURL()
+* @see org.apache.wicket.request.Request#getUrl()
*/
private String getURL()
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestHandler.java?rev=1032035r1=1032034r2=1032035view=diff
==
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestHandler.java
Sat Nov 6 13:05:05 2010
@@ -69,7 +69,7 @@ public class WebExternalResourceRequestH
}
/**
-* @see
org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
+* @see
org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.IRequestCycle)
*/
@Override
public void detach(IRequestCycle requestCycle)
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/https/HttpsRequestCheckerTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/https/HttpsRequestCheckerTest.java?rev=1032035r1=1032034r2=1032035view=diff
==
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/https/HttpsRequestCheckerTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/https/HttpsRequestCheckerTest.java
Sat Nov 6 13:05:05 2010
@@ -36,7 +36,8 @@ public
[jira] Commented: (WICKET-3068) remove application settings which are no longer needed
[ https://issues.apache.org/jira/browse/WICKET-3068?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12928966#action_12928966 ] Hudson commented on WICKET-3068: Integrated in Apache Wicket 1.5.x #489 (See [https://hudson.apache.org/hudson/job/Apache%20Wicket%201.5.x/489/]) WICKET-3068 remove obsolete settings: [removed] SessionSettings#setMaxPageMaps() remove application settings which are no longer needed -- Key: WICKET-3068 URL: https://issues.apache.org/jira/browse/WICKET-3068 Project: Wicket Issue Type: Task Affects Versions: 1.5-M2.1 Reporter: Peter Ertl Remove all properties from org.apache.wicket.settings.Settings which are no longer needed. Remove the methods in wicket-jmx as well. Feel free to list obsolete properties here... -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.
svn commit: r1032050 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket/settings: IRequestCycleSettings.java IResourceSettings.java Settings.java
Author: pete
Date: Sat Nov 6 13:30:23 2010
New Revision: 1032050
URL: http://svn.apache.org/viewvc?rev=1032050view=rev
Log:
cleanup wicket settings:
- removed field 'automaticMultiWindowSupport'
- fixed some broken javadoc
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java?rev=1032050r1=1032049r2=1032050view=diff
==
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
Sat Nov 6 13:30:23 2010
@@ -127,13 +127,13 @@ public interface IRequestCycleSettings
* instances of RequestCycle are created and processed.
* /p
* p
-* Also, even with this strategy set, it is ignored for
-* {...@link BookmarkableListenerInterfaceRequestTarget}s,
because otherwise they wouldn't be
-* bookmarkable.
+* Also, even with this strategy set, it is ignored for
instances of
+* {...@link
org.apache.wicket.request.handler.BookmarkableListenerInterfaceRequestHandler},
+* because otherwise they wouldn't be bookmarkable.
* /p
*/
REDIRECT_TO_RENDER
- };
+ }
/**
* Adds a response filter to the list. Filters are evaluated in the
order they have been added.
@@ -285,8 +285,6 @@ public interface IRequestCycleSettings
void setTimeout(Duration timeout);
/**
-* @see
org.apache.wicket.settings.IExceptionSettings#setUnexpectedExceptionDisplay(org.apache.wicket.settings.Settings.UnexpectedExceptionDisplay)
-*
* @param unexpectedExceptionDisplay
*/
void setUnexpectedExceptionDisplay(final UnexpectedExceptionDisplay
unexpectedExceptionDisplay);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java?rev=1032050r1=1032049r2=1032050view=diff
==
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
Sat Nov 6 13:30:23 2010
@@ -204,8 +204,6 @@ public interface IResourceSettings
ListIStringResourceLoader getStringResourceLoaders();
/**
-* @see
org.apache.wicket.settings.IExceptionSettings#getThrowExceptionOnMissingResource()
-*
* @return boolean
*/
boolean getThrowExceptionOnMissingResource();
@@ -224,7 +222,7 @@ public interface IResourceSettings
*default cache duration in seconds
*
* @see org.apache.wicket.util.time.Duration#NONE
-* @see org.apache.wicket.protocol.http.RequestUtils#MAX_CACHE_DURATION
+* @see org.apache.wicket.request.http.WebResponse#MAX_CACHE_DURATION
*/
void setDefaultCacheDuration(Duration defaultDuration);
@@ -297,8 +295,6 @@ public interface IResourceSettings
void setResourceWatcher(IModificationWatcher watcher);
/**
-* @see
org.apache.wicket.settings.IExceptionSettings#setThrowExceptionOnMissingResource(boolean)
-*
* @param throwExceptionOnMissingResource
*/
void setThrowExceptionOnMissingResource(final boolean
throwExceptionOnMissingResource);
@@ -349,8 +345,8 @@ public interface IResourceSettings
* Wicket-1992). In case you really need it, a good value for
placeholder would e.g. be $up$.
* Resources additionally are protected by a
* {...@link org.apache.wicket.markup.html.IPackageResourceGuard
IPackageResourceGuard}
-* implementation such as {...@link
org.apache.wicket.resource.resourceGuard.PackageResourceGuard
-* PackageResourceGuard} which you may use or extend based on your
needs.
+* implementation such as {...@link
org.apache.wicket.markup.html.PackageResourceGuard}
+* which you may use or extend based on your needs.
*
* @see #getParentFolderPlaceholder()
*
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL:
svn commit: r1032057 - /wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java
Author: pete
Date: Sat Nov 6 13:58:34 2010
New Revision: 1032057
URL: http://svn.apache.org/viewvc?rev=1032057view=rev
Log:
since wicket-1.5 required java 1.5 we can replace all these occurences of
IOUtils.closeQuietly(...) with one single IOUtils.closeQuietly(Closeable) will
will not only reduce code duplication but also make it more versatile
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java?rev=1032057r1=1032056r2=1032057view=diff
==
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java
Sat Nov 6 13:58:34 2010
@@ -16,18 +16,7 @@
*/
package org.apache.wicket.util.io;
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.Writer;
-
+import java.io.*;
/**
* General IO Stream manipulation.
@@ -82,95 +71,24 @@ public final class IOUtils
{
}
- //
---
/**
-* Unconditionally close an codeReader/code.
+* Unconditionally close a codeCloseable/code.
* p
-* Equivalent to {...@link Reader#close()}, except any exceptions will
be ignored. This is
+* closeables can be input or output streams, reader, writers, and much
more.
+*
+* Equivalent to {...@link Closeable#close()}, except any exceptions
will be ignored. This is
* typically used in finally blocks.
*
-* @param input
-*the Reader to close, may be null or already closed
-*/
- public static void closeQuietly(Reader input)
- {
- if (input != null)
- {
- try
- {
- input.close();
- }
- catch (Exception e)
- {
- // ignore
- }
- }
- }
-
- /**
-* Unconditionally close a codeWriter/code.
-* p
-* Equivalent to {...@link Writer#close()}, except any exceptions will
be ignored. This is
-* typically used in finally blocks.
-*
-* @param output
-*the Writer to close, may be null or already closed
-*/
- public static void closeQuietly(Writer output)
- {
- if (output != null)
- {
- try
- {
- output.close();
- }
- catch (Exception e)
- {
- // ignore
- }
- }
- }
-
- /**
-* Unconditionally close an codeInputStream/code.
-* p
-* Equivalent to {...@link InputStream#close()}, except any exceptions
will be ignored. This is
-* typically used in finally blocks.
-*
-* @param input
-*the InputStream to close, may be null or already closed
-*/
- public static void closeQuietly(InputStream input)
- {
- if (input != null)
- {
- try
- {
- input.close();
- }
- catch (Exception e)
- {
- // ignore
- }
- }
- }
-
- /**
-* Unconditionally close an codeOutputStream/code.
-* p
-* Equivalent to {...@link OutputStream#close()}, except any exceptions
will be ignored. This is
-* typically used in finally blocks.
-*
-* @param output
-*the OutputStream to close, may be null or already closed
+* @param closeable
+*the Closeable to close, may be null or already closed
*/
- public static void closeQuietly(OutputStream output)
+ public static void closeQuietly(Closeable closeable)
{
- if (output != null)
+ if (closeable != null)
{
try
{
- output.close();
+ closeable.close();
svn commit: r1032058 - /wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java
Author: pete Date: Sat Nov 6 14:01:31 2010 New Revision: 1032058 URL: http://svn.apache.org/viewvc?rev=1032058view=rev Log: fixed doc for IOUtils.closeQuietly Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java?rev=1032058r1=1032057r2=1032058view=diff == --- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java (original) +++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/IOUtils.java Sat Nov 6 14:01:31 2010 @@ -23,7 +23,8 @@ import java.io.*; * p * This class provides static utility methods for input/output operations. * ul - * licloseQuietly - these methods close a stream ignoring nulls and exceptions + * licloseQuietly - these method closes any kind of closeable resource, e.g. an input/output stream + * or reader/writer ignoring nulls and exceptions * litoXxx - these methods read data from a stream * liwrite - these methods write data to a stream * licopy - these methods copy all the data from one stream to another
svn commit: r1032060 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
Author: pete
Date: Sat Nov 6 14:07:17 2010
New Revision: 1032060
URL: http://svn.apache.org/viewvc?rev=1032060view=rev
Log:
make digest functionality in FileUpload more versatile
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java?rev=1032060r1=1032059r2=1032060view=diff
==
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
Sat Nov 6 14:07:17 2010
@@ -22,13 +22,14 @@ import java.io.InputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.wicket.IClusterable;
import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.util.file.Files;
+import org.apache.wicket.util.io.IOUtils;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.upload.FileItem;
@@ -69,18 +70,9 @@ public class FileUpload implements IClus
{
if (inputStreamsToClose != null)
{
- for (IteratorInputStream inputStreamsIterator =
inputStreamsToClose.iterator(); inputStreamsIterator.hasNext();)
+ for (InputStream inputStream : inputStreamsToClose)
{
- InputStream inputStream =
inputStreamsIterator.next();
-
- try
- {
- inputStream.close();
- }
- catch (IOException e)
- {
- // We don't care aobut the exceptions
thrown here.
- }
+ IOUtils.closeQuietly(inputStream);
}
// Reset the list
@@ -107,58 +99,62 @@ public class FileUpload implements IClus
/**
* Get the MD5 checksum.
*
-* @return The MD5 checksum of the file
+* @param algorithm the digest algorithm, e.g. MD5, SHA-1, SHA-256,
SHA-512
+*
+* @return The cryptographic digest of the file
*/
- public byte[] getMD5()
+ public byte[] getDigest(String algorithm)
{
- MessageDigest digest;
try
{
- digest = java.security.MessageDigest.getInstance(MD5);
- }
- catch (NoSuchAlgorithmException ex)
- {
- throw new WicketRuntimeException(
- Your java runtime does not support MD5
digests. Please see java.security.MessageDigest.getInstance(\MD5\,
- ex);
- }
+ Args.notEmpty(algorithm, algorithm);
+ MessageDigest digest =
java.security.MessageDigest.getInstance(algorithm);
- if (item.isInMemory())
- {
- digest.update(getBytes());
- return digest.digest();
- }
-
- InputStream in = null;
- try
- {
- in = item.getInputStream();
- byte[] buf = new byte[Math.min((int)item.getSize(),
4096 * 10)];
- int len;
- while (-1 != (len = in.read(buf)))
+ if (item.isInMemory())
{
- digest.update(buf, 0, len);
+ digest.update(getBytes());
+ return digest.digest();
}
- return digest.digest();
- }
- catch (IOException ex)
- {
- throw new WicketRuntimeException(Error while reading
input data for MD5 checksum, ex);
- }
- finally
- {
- if (in != null)
+
+ InputStream in = null;
+
+ try
{
- try
+ in = item.getInputStream();
+ byte[] buf = new byte[Math.min((int)
item.getSize(), 4096 * 10)];
+ int len;
+ while (-1 != (len = in.read(buf)))
{
-
[jira] Commented: (WICKET-3138) Wicket 1.5 and GAE
[ https://issues.apache.org/jira/browse/WICKET-3138?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12928979#action_12928979 ] Martin Grigorov commented on WICKET-3138: - No, it is not the same. New IDataStore is needed. Recently we discussed this with Igor in IRC and we decide that it may be added after 1.5.0. Wicket 1.5 and GAE -- Key: WICKET-3138 URL: https://issues.apache.org/jira/browse/WICKET-3138 Project: Wicket Issue Type: New Feature Components: wicket Affects Versions: 1.5-M2.1 Reporter: Alexandru Objelean Assignee: Martin Grigorov Create a http session based store to make wicket 1.5 work with GAE -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.
[jira] Commented: (WICKET-3147) Servlet 3 Annotation @WebFilter is not supported
[
https://issues.apache.org/jira/browse/WICKET-3147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12929041#action_12929041
]
Martin Grigorov commented on WICKET-3147:
-
The project in wicketstuff is:
https://wicket-stuff.svn.sourceforge.net/svnroot/wicket-stuff/trunk/wicketstuff-core/jdk-1.6-parent/wicket-servlet3-parent
The example is successfully tested with Tomcat 7.0.4.
I wasn't able to run it with Jetty 8 M1.
Please test with Glassfish3 and let us know if there is a problem.
Servlet 3 Annotation @WebFilter is not supported
Key: WICKET-3147
URL: https://issues.apache.org/jira/browse/WICKET-3147
Project: Wicket
Issue Type: Improvement
Components: wicket
Affects Versions: 1.4.9, 1.4.10, 1.4.13
Environment: Glassfish 3
Reporter: Zeti
Assignee: Martin Grigorov
Fix For: 1.6.0
Attachments: wicket.tgz
Trying to run my application this way:
@WebFilter(value=/*, urlPatterns=/*, initParams = {
@WebInitParam(
name=applicationClassName,
value=de.logviewer.HomeApp
)
}
)
public class HomeFilter extends WicketFilter{ }
results in the follwing exception:
Servlet.service() for servlet default threw exception
java.lang.IllegalArgumentException: Error initializing WicketFilter - you
have no filter-mapping element with a url-pattern that uses filter:
de.logviewer.HomeFilter at
org.apache.wicket.protocol.http.WicketFilter.getFilterPath(WicketFilter.java:930)
at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:677)
at
org.apache.catalina.core.ApplicationFilterConfig.getFilter(ApplicationFilterConfig.java:259)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:237)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:215)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:277)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:188)
at
org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:641)
at com.sun.enterprise.web.WebPipeline.invoke(WebPipeline.java:97) at
com.sun.enterprise.web.PESessionLockingStandardPipeline.invoke(PESessionLockingStandardPipeline.java:85)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:185)
at
org.apache.catalina.connector.CoyoteAdapter.doService(CoyoteAdapter.java:325)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:226)
at
com.sun.enterprise.v3.services.impl.ContainerMapper.service(ContainerMapper.java:165)
at com.sun.grizzly.http.ProcessorTask.invokeAdapter(ProcessorTask.java:791)
at com.sun.grizzly.http.ProcessorTask.doProcess(ProcessorTask.java:693) at
com.sun.grizzly.http.ProcessorTask.process(ProcessorTask.java:954) at
com.sun.grizzly.http.DefaultProtocolFilter.execute(DefaultProtocolFilter.java:170)
at
com.sun.grizzly.DefaultProtocolChain.executeProtocolFilter(DefaultProtocolChain.java:135)
at
com.sun.grizzly.DefaultProtocolChain.execute(DefaultProtocolChain.java:102)
at com.sun.grizzly.DefaultProtocolChain.execute(DefaultProtocolChain.java:88)
at com.sun.grizzly.http.HttpProtocolChain.execute(HttpProtocolChain.java:76)
at
com.sun.grizzly.ProtocolChainContextTask.doCall(ProtocolChainContextTask.java:53)
at
com.sun.grizzly.SelectionKeyContextTask.call(SelectionKeyContextTask.java:57)
at com.sun.grizzly.ContextTask.run(ContextTask.java:69) at
com.sun.grizzly.util.AbstractThreadPool$Worker.doWork(AbstractThreadPool.java:330)
at
com.sun.grizzly.util.AbstractThreadPool$Worker.run(AbstractThreadPool.java:309)
at java.lang.Thread.run(Thread.java:662)
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[jira] Commented: (WICKET-3147) Servlet 3 Annotation @WebFilter is not supported
[
https://issues.apache.org/jira/browse/WICKET-3147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12929098#action_12929098
]
Zeti commented on WICKET-3147:
--
Hi Martin,
which Wicket version should I use for your extended WebFilter?
@ both of you:Thanks for resolving this issue so quickly.
Servlet 3 Annotation @WebFilter is not supported
Key: WICKET-3147
URL: https://issues.apache.org/jira/browse/WICKET-3147
Project: Wicket
Issue Type: Improvement
Components: wicket
Affects Versions: 1.4.9, 1.4.10, 1.4.13
Environment: Glassfish 3
Reporter: Zeti
Assignee: Martin Grigorov
Fix For: 1.6.0
Attachments: wicket.tgz
Trying to run my application this way:
@WebFilter(value=/*, urlPatterns=/*, initParams = {
@WebInitParam(
name=applicationClassName,
value=de.logviewer.HomeApp
)
}
)
public class HomeFilter extends WicketFilter{ }
results in the follwing exception:
Servlet.service() for servlet default threw exception
java.lang.IllegalArgumentException: Error initializing WicketFilter - you
have no filter-mapping element with a url-pattern that uses filter:
de.logviewer.HomeFilter at
org.apache.wicket.protocol.http.WicketFilter.getFilterPath(WicketFilter.java:930)
at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:677)
at
org.apache.catalina.core.ApplicationFilterConfig.getFilter(ApplicationFilterConfig.java:259)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:237)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:215)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:277)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:188)
at
org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:641)
at com.sun.enterprise.web.WebPipeline.invoke(WebPipeline.java:97) at
com.sun.enterprise.web.PESessionLockingStandardPipeline.invoke(PESessionLockingStandardPipeline.java:85)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:185)
at
org.apache.catalina.connector.CoyoteAdapter.doService(CoyoteAdapter.java:325)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:226)
at
com.sun.enterprise.v3.services.impl.ContainerMapper.service(ContainerMapper.java:165)
at com.sun.grizzly.http.ProcessorTask.invokeAdapter(ProcessorTask.java:791)
at com.sun.grizzly.http.ProcessorTask.doProcess(ProcessorTask.java:693) at
com.sun.grizzly.http.ProcessorTask.process(ProcessorTask.java:954) at
com.sun.grizzly.http.DefaultProtocolFilter.execute(DefaultProtocolFilter.java:170)
at
com.sun.grizzly.DefaultProtocolChain.executeProtocolFilter(DefaultProtocolChain.java:135)
at
com.sun.grizzly.DefaultProtocolChain.execute(DefaultProtocolChain.java:102)
at com.sun.grizzly.DefaultProtocolChain.execute(DefaultProtocolChain.java:88)
at com.sun.grizzly.http.HttpProtocolChain.execute(HttpProtocolChain.java:76)
at
com.sun.grizzly.ProtocolChainContextTask.doCall(ProtocolChainContextTask.java:53)
at
com.sun.grizzly.SelectionKeyContextTask.call(SelectionKeyContextTask.java:57)
at com.sun.grizzly.ContextTask.run(ContextTask.java:69) at
com.sun.grizzly.util.AbstractThreadPool$Worker.doWork(AbstractThreadPool.java:330)
at
com.sun.grizzly.util.AbstractThreadPool$Worker.run(AbstractThreadPool.java:309)
at java.lang.Thread.run(Thread.java:662)
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
svn commit: r1032118 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Author: mgrigorov
Date: Sat Nov 6 17:28:55 2010
New Revision: 1032118
URL: http://svn.apache.org/viewvc?rev=1032118view=rev
Log:
WICKET-3144 Extra client-side scripting before closing modalwindow
Add the possibility to modify the javascript used for closing the modal window
(i.e. provide custom IAjaxCallDecorator for CloseButtonBehavior)
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=1032118r1=1032117r2=1032118view=diff
==
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Sat Nov 6 17:28:55 2010
@@ -149,7 +149,7 @@ public class ModalWindow extends Panel
private String cookieName;
private IModelString title = null;
private MaskType maskType = MaskType.SEMI_TRANSPARENT;
- private boolean autoSize = false;
+ private boolean autoSize = false;
private PageCreator pageCreator = null;
private CloseButtonCallback closeButtonCallback = null;
@@ -249,7 +249,7 @@ public class ModalWindow extends Panel
add(empty = new WebMarkupContainer(getContentId()));
- add(new CloseButtonBehavior());
+ add(newCloseButtonBehavior());
add(new WindowClosedBehavior());
}
@@ -911,12 +911,16 @@ public class ModalWindow extends Panel
/**
* @author Matej Knopp
*/
- private class CloseButtonBehavior extends AbstractDefaultAjaxBehavior
+ protected class CloseButtonBehavior extends AbstractDefaultAjaxBehavior
{
private static final long serialVersionUID = 1L;
+ public CloseButtonBehavior()
+ {
+ }
+
@Override
- protected void respond(AjaxRequestTarget target)
+ protected final void respond(AjaxRequestTarget target)
{
if (closeButtonCallback == null ||
closeButtonCallback.onCloseButtonClicked(target) == true)
@@ -938,7 +942,7 @@ public class ModalWindow extends Panel
* @see
org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#getCallbackScript()
*/
@Override
- protected CharSequence getCallbackScript()
+ protected final CharSequence getCallbackScript()
{
return super.getCallbackScript();
}
@@ -1051,7 +1055,7 @@ public class ModalWindow extends Panel
{
buffer.append(settings.mask=\semi-transparent\;\n);
}
-
+
appendAssignment(buffer, settings.autoSize, autoSize);
@@ -1171,4 +1175,13 @@ public class ModalWindow extends Panel
return autoSize;
}
+ /**
+* Gives the possibility to provide custom {...@link IAjaxCallDecorator}
+*
+* @return the behavior that should be used for the window close button
+*/
+ protected CloseButtonBehavior newCloseButtonBehavior()
+ {
+ return new CloseButtonBehavior();
+ }
}
[jira] Commented: (WICKET-3147) Servlet 3 Annotation @WebFilter is not supported
[
https://issues.apache.org/jira/browse/WICKET-3147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12929104#action_12929104
]
Martin Grigorov commented on WICKET-3147:
-
You need 1.5-SNAPSHOT.
You can either build it or get it from :
https://repository.apache.org/index.html#nexus-search;gav~org.apache.wicket~wicketkw,versionexpand
Servlet 3 Annotation @WebFilter is not supported
Key: WICKET-3147
URL: https://issues.apache.org/jira/browse/WICKET-3147
Project: Wicket
Issue Type: Improvement
Components: wicket
Affects Versions: 1.4.9, 1.4.10, 1.4.13
Environment: Glassfish 3
Reporter: Zeti
Assignee: Martin Grigorov
Fix For: 1.6.0
Attachments: wicket.tgz
Trying to run my application this way:
@WebFilter(value=/*, urlPatterns=/*, initParams = {
@WebInitParam(
name=applicationClassName,
value=de.logviewer.HomeApp
)
}
)
public class HomeFilter extends WicketFilter{ }
results in the follwing exception:
Servlet.service() for servlet default threw exception
java.lang.IllegalArgumentException: Error initializing WicketFilter - you
have no filter-mapping element with a url-pattern that uses filter:
de.logviewer.HomeFilter at
org.apache.wicket.protocol.http.WicketFilter.getFilterPath(WicketFilter.java:930)
at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:677)
at
org.apache.catalina.core.ApplicationFilterConfig.getFilter(ApplicationFilterConfig.java:259)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:237)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:215)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:277)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:188)
at
org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:641)
at com.sun.enterprise.web.WebPipeline.invoke(WebPipeline.java:97) at
com.sun.enterprise.web.PESessionLockingStandardPipeline.invoke(PESessionLockingStandardPipeline.java:85)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:185)
at
org.apache.catalina.connector.CoyoteAdapter.doService(CoyoteAdapter.java:325)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:226)
at
com.sun.enterprise.v3.services.impl.ContainerMapper.service(ContainerMapper.java:165)
at com.sun.grizzly.http.ProcessorTask.invokeAdapter(ProcessorTask.java:791)
at com.sun.grizzly.http.ProcessorTask.doProcess(ProcessorTask.java:693) at
com.sun.grizzly.http.ProcessorTask.process(ProcessorTask.java:954) at
com.sun.grizzly.http.DefaultProtocolFilter.execute(DefaultProtocolFilter.java:170)
at
com.sun.grizzly.DefaultProtocolChain.executeProtocolFilter(DefaultProtocolChain.java:135)
at
com.sun.grizzly.DefaultProtocolChain.execute(DefaultProtocolChain.java:102)
at com.sun.grizzly.DefaultProtocolChain.execute(DefaultProtocolChain.java:88)
at com.sun.grizzly.http.HttpProtocolChain.execute(HttpProtocolChain.java:76)
at
com.sun.grizzly.ProtocolChainContextTask.doCall(ProtocolChainContextTask.java:53)
at
com.sun.grizzly.SelectionKeyContextTask.call(SelectionKeyContextTask.java:57)
at com.sun.grizzly.ContextTask.run(ContextTask.java:69) at
com.sun.grizzly.util.AbstractThreadPool$Worker.doWork(AbstractThreadPool.java:330)
at
com.sun.grizzly.util.AbstractThreadPool$Worker.run(AbstractThreadPool.java:309)
at java.lang.Thread.run(Thread.java:662)
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
svn commit: r1032124 - /wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Author: mgrigorov
Date: Sat Nov 6 17:46:37 2010
New Revision: 1032124
URL: http://svn.apache.org/viewvc?rev=1032124view=rev
Log:
WICKET-3144 Extra client-side scripting before closing modalwindow
Add the possibility to modify the javascript used for closing the modal window
(i.e. provide custom IAjaxCallDecorator for CloseButtonBehavior)
merge r1032118 from trunk
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=1032124r1=1032123r2=1032124view=diff
==
---
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Sat Nov 6 17:46:37 2010
@@ -257,7 +257,7 @@ public class ModalWindow extends Panel
add(empty = new WebMarkupContainer(getContentId()));
- add(new CloseButtonBehavior());
+ add(newCloseButtonBehavior());
add(new WindowClosedBehavior());
add(JavascriptPackageResource.getHeaderContribution(JAVASCRIPT));
@@ -974,12 +974,16 @@ public class ModalWindow extends Panel
/**
* @author Matej Knopp
*/
- private class CloseButtonBehavior extends AbstractDefaultAjaxBehavior
+ protected class CloseButtonBehavior extends AbstractDefaultAjaxBehavior
{
private static final long serialVersionUID = 1L;
+ public CloseButtonBehavior()
+ {
+ }
+
@Override
- protected void respond(AjaxRequestTarget target)
+ protected final void respond(AjaxRequestTarget target)
{
if (closeButtonCallback == null ||
closeButtonCallback.onCloseButtonClicked(target) == true)
@@ -1001,7 +1005,7 @@ public class ModalWindow extends Panel
* @see
org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#getCallbackScript()
*/
@Override
- protected CharSequence getCallbackScript()
+ protected final CharSequence getCallbackScript()
{
return super.getCallbackScript();
}
@@ -1217,4 +1221,14 @@ public class ModalWindow extends Panel
title.detach();
}
}
+
+ /**
+* Gives the possibility to provide custom {...@link IAjaxCallDecorator}
+*
+* @return the behavior that should be used for the window close button
+*/
+ protected CloseButtonBehavior newCloseButtonBehavior()
+ {
+ return new CloseButtonBehavior();
+ }
}
[jira] Resolved: (WICKET-3144) Extra client-side scripting before closing modalwindow
[
https://issues.apache.org/jira/browse/WICKET-3144?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Martin Grigorov resolved WICKET-3144.
-
Resolution: Fixed
Improved with r1032118 in trunk and 1032124 in 1.4.x.
To do what you need:
{code}
new ModalWindow(modal)
{
/**
* @see
org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow#newCloseButtonBehavior()
*/
@Override
protected CloseButtonBehavior newCloseButtonBehavior()
{
return new CloseButtonBehavior()
{
/**
* @see
org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow.CloseButtonBehavior#getAjaxCallDecorator()
*/
@Override
protected IAjaxCallDecorator getAjaxCallDecorator()
{
return new
AjaxPreprocessingCallDecorator(super.getAjaxCallDecorator())
{
@Override
public CharSequence
preDecorateScript(CharSequence script)
{
return console.log('Test');
+ script;
}
};
}
};
}
}
{code}
Extra client-side scripting before closing modalwindow
--
Key: WICKET-3144
URL: https://issues.apache.org/jira/browse/WICKET-3144
Project: Wicket
Issue Type: New Feature
Components: wicket-extensions
Affects Versions: 1.4.12, 1.5-M2.1
Reporter: Marieke Vandamme
Assignee: Martin Grigorov
I would like to add extra client-side scripting that is executed before the
modalwindow is closed.
Now you can already add server-side with overriding onCloseButtonClicked, but
then the window is already closing.
I need this because I want to show a confirm-box to the user, so that he can
confirm that he wants to close the window.
Thanks, Marieke Vandamme
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[jira] Updated: (WICKET-3144) Extra client-side scripting before closing modalwindow
[ https://issues.apache.org/jira/browse/WICKET-3144?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Martin Grigorov updated WICKET-3144: Affects Version/s: 1.4.12 1.5-M2.1 Fix Version/s: 1.5-M4 1.4.14 Extra client-side scripting before closing modalwindow -- Key: WICKET-3144 URL: https://issues.apache.org/jira/browse/WICKET-3144 Project: Wicket Issue Type: New Feature Components: wicket-extensions Affects Versions: 1.4.12, 1.5-M2.1 Reporter: Marieke Vandamme Assignee: Martin Grigorov Fix For: 1.4.14, 1.5-M4 I would like to add extra client-side scripting that is executed before the modalwindow is closed. Now you can already add server-side with overriding onCloseButtonClicked, but then the window is already closing. I need this because I want to show a confirm-box to the user, so that he can confirm that he wants to close the window. Thanks, Marieke Vandamme -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.
[jira] Commented: (WICKET-3144) Extra client-side scripting before closing modalwindow
[ https://issues.apache.org/jira/browse/WICKET-3144?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12929129#action_12929129 ] Hudson commented on WICKET-3144: Integrated in Apache Wicket 1.4.x #252 (See [https://hudson.apache.org/hudson/job/Apache%20Wicket%201.4.x/252/]) WICKET-3144 Extra client-side scripting before closing modalwindow Add the possibility to modify the javascript used for closing the modal window (i.e. provide custom IAjaxCallDecorator for CloseButtonBehavior) merge r1032118 from trunk Extra client-side scripting before closing modalwindow -- Key: WICKET-3144 URL: https://issues.apache.org/jira/browse/WICKET-3144 Project: Wicket Issue Type: New Feature Components: wicket-extensions Affects Versions: 1.4.12, 1.5-M2.1 Reporter: Marieke Vandamme Assignee: Martin Grigorov Fix For: 1.4.14, 1.5-M4 I would like to add extra client-side scripting that is executed before the modalwindow is closed. Now you can already add server-side with overriding onCloseButtonClicked, but then the window is already closing. I need this because I want to show a confirm-box to the user, so that he can confirm that he wants to close the window. Thanks, Marieke Vandamme -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.
[CONF] Apache Wicket Migration to Wicket 1.5
Migration to Wicket 1.5
Page edited by Martin Grigorov
Comment:
Add API change entry for Application.addComponentInstantiationListener()
Changes (1)
...
| org.apache.wicket.IResponseFilter (and all default implementations) | org.apache.wicket.response.filter.IResponseFilter | | org.apache.wicket.markup.html.form.Form.process() | org.apache.wicket.markup.html.form.Form.process(IFormSubmittingComponent) |
| org.apache.wicket.Application.addComponentInstantiationListener() | org.apache.wicket.Application.getComponentInstantiationListeners().add() |
Full Content
Migrating to Wicket 1.5
Environment
Upgraded to JUNIT4
Removed deprecated method, class and interface definitions
Removed FormComponent.setPersistence()
Removed IComponentBorder
Component.getStyle() implementation changed
Removed magic from Border Component
Component rendering
UTF-8 encoded property files
XML based property files
TabbedPanel
MarkupContainer.isTransparentResolver() removed
IComponentResolver.resolve API has changed
Wicket-IOC changes
Visitors
Component Initialization - Component#onInitialize
Request parameters
Switching to/from secured communication over https
HeaderContribution
Component and IBehavior implement IHeaderContributor
Removed HeaderContributor and friends.
RequestCycle
Exception handling
ImageMap removed
getResourceSettings().setAddLastModifiedTimeToResourceReferenceUrl() has been replaced
Inter-component events
List of renamed classes and methods
Environment
Wicket 1.5 requires at least Java 5
Upgraded to JUNIT4
We changed the root pom.xml to use junit4 (4.7)
Removed deprecated method, class and interface definitions
In order to keep the code clean, we removed all methods, classes and interfaces which were marked deprecated in Wicket 1.4. Before migrating to Wicket 1.5 you should replace all deprecated invocations.
Removed FormComponent.setPersistence()
WICKET-2213: At the very beginning of Wicket we introduced FormComponent.setPersistence() with the idea to make creating Login panels very easy. Basically Wicket would deal with the Cookie handling for the login details. Now some years later it is evident that this feature is not very useful:
It basically is used for login panels only
Even in our examples Password.setPersistence is false which means that "rememberMe" doesn't really work. Only the user name is stored in a Cookie
Forcing formComponent.getPageRelativePath() as the Cookie name is too restrictive
You can not combine username and password into a single Cookie and e.g. decrypt it for safety reasons
So we removed that feature and introduced IAuthenticationStrategy. A default implementation has been provided and the examples have been updated. As usual it gets registered with ISecuritySettings.
In case you want to implement your own IAuthenticationStrategy, a utility class org.apache.wicket.util.cookies.CookieUtils has been added.
Removed IComponentBorder
The interface has been removed since IBehavior can do exactly the same. MarkupComponentBorder has been migrated, which means you can add associated markup to the behavior. Markup which will surround the behavior's component.
Component.getStyle() implementation changed
getStyle() used to return Component.getVariation() + "_" + style. That eventually caused issue such as mentioned in WICKET-2298.
We changed that to getStyle() now returning style only which as a consequence required us to change all resource related APIs to add variation. To migrate your code you might either provide component.getVariation() or null where not relevant.
Removed magic from Border Component
We had several issues with Border such as WICKET-2494 and the fact that all over core you could find code such as "if (comp instanceof Border) {}" . That is now all fixed, though at a (low) price. Because the magic is now gone, we think it is even clearer than is was before. The difference is you have to tell Border where to add the child component. Whether it will be added to wicket:border../wicket:border which is called the "border", or span wicket:id="myBorder"../span which called the "border body". And because the body can be wrapped by a container such as a Form, you need to add (move) the body to the wrapper component via wrapper.add(getBodyContainer()) if needed. By doing so you create a clean component hierarchy with no more magic and ambiguities and transparent resolvers.
border.addToBorder() and border.addToBorderBody() can be used to explicitly tell where to add the child. border.add() will add it the body.
see Border javadoc as well
Component rendering
We used to have different entry points to
[jira] Created: (WICKET-3150) Autolink already rendered problem
Autolink already rendered problem - Key: WICKET-3150 URL: https://issues.apache.org/jira/browse/WICKET-3150 Project: Wicket Issue Type: Bug Components: wicket Affects Versions: 1.5-M3 Reporter: Martin Grigorov Trying to migrate my application from 1.4 to 1.5 I experience the following problem: org.apache.wicket.markup.MarkupException: The component [AutolinkExternalLink [Component id = _autolink_2]] was rendered already. You can render it only once during a render phase. Class relative path: org.apache.wicket.markup.resolver.AutoLinkResolver$AutolinkExternalLink:p:_link11:_autolink_2 at org.apache.wicket.Page.componentRendered(Page.java:361) at org.apache.wicket.Component.rendered(Component.java:2580) at org.apache.wicket.Component.render_(Component.java:2384) at org.apache.wicket.Component.render(Component.java:2307) See the attached quickstart. The content of MyPanel.html is the minimal version of the complete html in our application that reproduces the problem. If I move the content from the panel to the page .html then everything is OK. To reproduce the problem just run TestHomePage. -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.
[jira] Updated: (WICKET-3150) Autolink already rendered problem
[ https://issues.apache.org/jira/browse/WICKET-3150?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Martin Grigorov updated WICKET-3150: Attachment: wicket-3150.tgz Autolink already rendered problem - Key: WICKET-3150 URL: https://issues.apache.org/jira/browse/WICKET-3150 Project: Wicket Issue Type: Bug Components: wicket Affects Versions: 1.5-M3 Reporter: Martin Grigorov Attachments: wicket-3150.tgz Trying to migrate my application from 1.4 to 1.5 I experience the following problem: org.apache.wicket.markup.MarkupException: The component [AutolinkExternalLink [Component id = _autolink_2]] was rendered already. You can render it only once during a render phase. Class relative path: org.apache.wicket.markup.resolver.AutoLinkResolver$AutolinkExternalLink:p:_link11:_autolink_2 at org.apache.wicket.Page.componentRendered(Page.java:361) at org.apache.wicket.Component.rendered(Component.java:2580) at org.apache.wicket.Component.render_(Component.java:2384) at org.apache.wicket.Component.render(Component.java:2307) See the attached quickstart. The content of MyPanel.html is the minimal version of the complete html in our application that reproduces the problem. If I move the content from the panel to the page .html then everything is OK. To reproduce the problem just run TestHomePage. -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.
[jira] Updated: (WICKET-3150) Autolink already rendered problem
[ https://issues.apache.org/jira/browse/WICKET-3150?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Martin Grigorov updated WICKET-3150: Description: Trying to migrate my application from 1.4 to 1.5 I experience the following problem: org.apache.wicket.markup.MarkupException: The component [AutolinkExternalLink [Component id = _autolink_2]] was rendered already. You can render it only once during a render phase. Class relative path: org.apache.wicket.markup.resolver.AutoLinkResolver$AutolinkExternalLink:p:_link11:_autolink_2 at org.apache.wicket.Page.componentRendered(Page.java:361) at org.apache.wicket.Component.rendered(Component.java:2580) at org.apache.wicket.Component.render_(Component.java:2384) at org.apache.wicket.Component.render(Component.java:2307) See the attached quickstart. The content of MyPanel.html is the minimal version of the complete html in our application that reproduces the problem. If I move the content from the panel to the page .html then everything is OK. Removing *any* of wicket:links in the panel solves the problem. To reproduce the problem just run TestHomePage. was: Trying to migrate my application from 1.4 to 1.5 I experience the following problem: org.apache.wicket.markup.MarkupException: The component [AutolinkExternalLink [Component id = _autolink_2]] was rendered already. You can render it only once during a render phase. Class relative path: org.apache.wicket.markup.resolver.AutoLinkResolver$AutolinkExternalLink:p:_link11:_autolink_2 at org.apache.wicket.Page.componentRendered(Page.java:361) at org.apache.wicket.Component.rendered(Component.java:2580) at org.apache.wicket.Component.render_(Component.java:2384) at org.apache.wicket.Component.render(Component.java:2307) See the attached quickstart. The content of MyPanel.html is the minimal version of the complete html in our application that reproduces the problem. If I move the content from the panel to the page .html then everything is OK. To reproduce the problem just run TestHomePage. Autolink already rendered problem - Key: WICKET-3150 URL: https://issues.apache.org/jira/browse/WICKET-3150 Project: Wicket Issue Type: Bug Components: wicket Affects Versions: 1.5-M3 Reporter: Martin Grigorov Attachments: wicket-3150.tgz Trying to migrate my application from 1.4 to 1.5 I experience the following problem: org.apache.wicket.markup.MarkupException: The component [AutolinkExternalLink [Component id = _autolink_2]] was rendered already. You can render it only once during a render phase. Class relative path: org.apache.wicket.markup.resolver.AutoLinkResolver$AutolinkExternalLink:p:_link11:_autolink_2 at org.apache.wicket.Page.componentRendered(Page.java:361) at org.apache.wicket.Component.rendered(Component.java:2580) at org.apache.wicket.Component.render_(Component.java:2384) at org.apache.wicket.Component.render(Component.java:2307) See the attached quickstart. The content of MyPanel.html is the minimal version of the complete html in our application that reproduces the problem. If I move the content from the panel to the page .html then everything is OK. Removing *any* of wicket:links in the panel solves the problem. To reproduce the problem just run TestHomePage. -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.
[jira] Commented: (WICKET-3144) Extra client-side scripting before closing modalwindow
[ https://issues.apache.org/jira/browse/WICKET-3144?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12929309#action_12929309 ] Hudson commented on WICKET-3144: Integrated in Apache Wicket 1.5.x #493 (See [https://hudson.apache.org/hudson/job/Apache%20Wicket%201.5.x/493/]) Extra client-side scripting before closing modalwindow -- Key: WICKET-3144 URL: https://issues.apache.org/jira/browse/WICKET-3144 Project: Wicket Issue Type: New Feature Components: wicket-extensions Affects Versions: 1.4.12, 1.5-M2.1 Reporter: Marieke Vandamme Assignee: Martin Grigorov Fix For: 1.4.14, 1.5-M4 I would like to add extra client-side scripting that is executed before the modalwindow is closed. Now you can already add server-side with overriding onCloseButtonClicked, but then the window is already closing. I need this because I want to show a confirm-box to the user, so that he can confirm that he wants to close the window. Thanks, Marieke Vandamme -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.
svn commit: r1032204 - /wicket/releases/wicket-1.5-M3/
Author: jrthomerson Date: Sun Nov 7 03:01:43 2010 New Revision: 1032204 URL: http://svn.apache.org/viewvc?rev=1032204view=rev Log: tag 1.5-M3 release Added: wicket/releases/wicket-1.5-M3/ (props changed) - copied from r1032203, wicket/branches/wicket-1.5-M3/ Propchange: wicket/releases/wicket-1.5-M3/ -- --- subclipse:tags (added) +++ subclipse:tags Sun Nov 7 03:01:43 2010 @@ -0,0 +1,5 @@ +550610,wicket-1.3.0-beta2,/wicket/tags/wicket-1.3.0-beta2,tag +567792,wicket-1.3.0-beta3,/wicket/tags/wicket-1.3.0-beta3,tag +582590,wicket-1.3.0-beta4,/wicket/tags/wicket-1.3.0-beta4,tag +591745,wicket-1.3.0-rc1,/wicket/tags/wicket-1.3.0-rc1,tag +601799,wicket-1.3.0-rc2,/wicket/tags/wicket-1.3.0-rc2,tag Propchange: wicket/releases/wicket-1.5-M3/ -- --- svn:ignore (added) +++ svn:ignore Sun Nov 7 03:01:43 2010 @@ -0,0 +1,4 @@ +target +.metadata +.project +velocity.log Propchange: wicket/releases/wicket-1.5-M3/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Nov 7 03:01:43 2010 @@ -0,0 +1,3 @@ +/wicket/branches/wicket-1.4.x:963681,1027877 +/wicket/sandbox/jthomerson/experimental/wicket-devutils:760296-760351,760353-760355 +/wicket/trunk/wicket-devutils:760352
svn commit: r1032206 - in /wicket/common/site/trunk: _config.yml _posts/2010-11-05-wicket-1.5-M3-released.md _site/2010/11/05/ _site/2010/11/05/wicket-1.5-M3-released.html _site/atom.xml _site/index.h
Author: jrthomerson
Date: Sun Nov 7 03:09:09 2010
New Revision: 1032206
URL: http://svn.apache.org/viewvc?rev=1032206view=rev
Log:
site announcement for 1.5-M3 release
Added:
wicket/common/site/trunk/_posts/2010-11-05-wicket-1.5-M3-released.md
(with props)
wicket/common/site/trunk/_site/2010/11/05/
wicket/common/site/trunk/_site/2010/11/05/wicket-1.5-M3-released.html
Modified:
wicket/common/site/trunk/_config.yml
wicket/common/site/trunk/_site/atom.xml
wicket/common/site/trunk/_site/index.html
wicket/common/site/trunk/_site/start/quickstart.html
Modified: wicket/common/site/trunk/_config.yml
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/_config.yml?rev=1032206r1=1032205r2=1032206view=diff
==
--- wicket/common/site/trunk/_config.yml (original)
+++ wicket/common/site/trunk/_config.yml Sun Nov 7 03:09:09 2010
@@ -15,4 +15,4 @@ exclude:readme.md
wicket:
version:1.4.13
released: 2010-11-01
-versions: [1.4.12, 1.4.13, 1.4-SNAPSHOT, 1.5-M2.1, 1.5-SNAPSHOT]
+versions: [1.4.12, 1.4.13, 1.4-SNAPSHOT, 1.5-M3, 1.5-SNAPSHOT]
Added: wicket/common/site/trunk/_posts/2010-11-05-wicket-1.5-M3-released.md
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2010-11-05-wicket-1.5-M3-released.md?rev=1032206view=auto
==
--- wicket/common/site/trunk/_posts/2010-11-05-wicket-1.5-M3-released.md (added)
+++ wicket/common/site/trunk/_posts/2010-11-05-wicket-1.5-M3-released.md Sun
Nov 7 03:09:09 2010
@@ -0,0 +1,18 @@
+---
+layout: post
+title: Wicket 1.5-M3 released
+---
+
+This is another milestone release from trunk (in-development branch). This
release includes several enhancments and fixes, which can be seen in the
changelog (linked below).
+
+* [Subversion
tag](http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M3)
+*
[Changelog](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561styleName=Htmlversion=12315329)
+* To use in Maven:
+{% highlight xml %}
+dependency
+groupIdorg.apache.wicket/groupId
+artifactIdwicket/artifactId
+version1.5-M3/version
+/dependency
+{% endhighlight %}
+* Download the [full
distribution](http://www.apache.org/dyn/closer.cgi/wicket/1.5-M3) (including
source)
Propchange: wicket/common/site/trunk/_posts/2010-11-05-wicket-1.5-M3-released.md
--
svn:executable = *
Added: wicket/common/site/trunk/_site/2010/11/05/wicket-1.5-M3-released.html
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2010/11/05/wicket-1.5-M3-released.html?rev=1032206view=auto
==
--- wicket/common/site/trunk/_site/2010/11/05/wicket-1.5-M3-released.html
(added)
+++ wicket/common/site/trunk/_site/2010/11/05/wicket-1.5-M3-released.html Sun
Nov 7 03:09:09 2010
@@ -0,0 +1,178 @@
+!DOCTYPE html
+html
+head
+titleApache Wicket - Wicket 1.5-M3 released/title
+
+ link rel=stylesheet href=/css/screen.css type=text/css
media=screen /
+
+!--[if lt ie 7]
+ link rel=stylesheet href=/css/ie.css type=text/css
media=screen /
+![endif]--
+link rel=shortcut icon href=/favicon.ico
type=image/vnd.microsoft.icon /
+ link rel=alternate type=application/atom+xml href=/atom.xml /
+ meta http-equiv=content-type content=text/html;charset=utf-8 /
+/head
+body
+div id=container
+div id=content
+div id=headera href=/h1 id=logospanApache
Wicket/span/h1/a/div
+ div id=navigation
+ h5a name=Navigation-Wicket/aMeet Wicket/h5
+ ul
+ li
+ a href=/ title=IndexHome/a
+ /li
+ li
+ a href=/meet/introduction.html
title=IntroductionIntroduction/a
+ /li
+ li
+ a href=/meet/features.html
title=FeaturesFeatures/a
+ /li
+ li
+ a href=/meet/buzz.html title=BuzzBuzz/a
+ /li
+ li
+ a href=/meet/vision.html title=VisionVision/a
+ /li
+ li
+ a href=/meet/blogs.html title=BlogsBlogs/a
+ /li
+ /ul
+ h5
+ a name=Navigation-GettingStarted
id=Navigation-GettingStarted/aGet Started
+ /h5
+ ul
+ li
+ a href=/start/download.html title=Download
WicketDownload Wicket/a
+ /li
+ li
+ a href=/start/quickstart.html title=Getting started
via a Maven ArchetypeQuickstart/a
+ /li
+ li
+ a href=http://www.jweekend.com/dev/LegUp;
rel=nofollowMore archetypes/a
+ /li
+
