Author: ivaynberg
Date: Sat Feb 9 11:55:41 2008
New Revision: 620181
URL: http://svn.apache.org/viewvc?rev=620181&view=rev
Log:
WICKET-1317 add support for *wicket.*configuration params in web.xml
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=620181&r1=620180&r2=620181&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
Sat Feb 9 11:55:41 2008
@@ -504,6 +504,21 @@
// Ignore - we're not allowed to read system properties.
}
+ /*
+ * FIXME 1.4: roll in 'wicket.' into Application.CONFIGURATION,
we should only support a
+ * namespaced param. see WICKET-1317
+ */
+
+ // If no system parameter check filter/servert initparam and
context param
+ if (result == null)
+ {
+ result = getInitParameter("wicket." +
Application.CONFIGURATION);
+ }
+ if (result == null)
+ {
+ result = getServletContext().getInitParameter("wicket."
+ Application.CONFIGURATION);
+ }
+
// If no system parameter check filter/servlet specific
<init-param>
if (result == null)
{
