You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2007/12/02 10:54:23 UTC
svn commit: r600263 - in
/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket: markup/
markup/html/debug/ markup/html/form/validation/ markup/html/link/
markup/html/navigation/paging/ markup/html/pages/ markup/html/panel/
markup/html/tree/ sett...
Author: jdonnerstag
Date: Sun Dec 2 01:54:21 2007
New Revision: 600263
URL: http://svn.apache.org/viewvc?rev=600263&view=rev
Log:
fixed wicket-1139: Wicket html files do not have xml prolog
- added the prolog to all markup files where is was missing
- a setting (disabled by default) to enforce the xml prolog (throws an exception). A log.info() otherwise
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupCloseLink$ClosePopupPage.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/EmptyPanel.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkIconPanel.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IMarkupSettings.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.html
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.html
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java Sun Dec 2 01:54:21 2007
@@ -43,6 +43,8 @@
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.string.AppendingStringBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is a Wicket MarkupParser specifically for (X)HTML. It makes use of a streaming XML parser to
@@ -62,9 +64,11 @@
*/
public class MarkupParser
{
+ /** Log for reporting. */
+ private static final Logger log = LoggerFactory.getLogger(MarkupParser.class);
+
/** Conditional comment section, which is NOT treated as a comment section */
- private static final Pattern CONDITIONAL_COMMENT = Pattern
- .compile("\\[if .+\\]>(.|\n|\r)*<!\\[endif\\]");
+ private static final Pattern CONDITIONAL_COMMENT = Pattern.compile("\\[if .+\\]>(.|\n|\r)*<!\\[endif\\]");
/** The XML parser to use */
private final IXmlPullParser xmlParser;
@@ -258,8 +262,8 @@
MarkupResourceData markupResourceData = markup.getMarkupResourceData();
// Initialize the xml parser
- xmlParser.parse(markupResourceData.getResource().getInputStream(), markupSettings
- .getDefaultMarkupEncoding());
+ xmlParser.parse(markupResourceData.getResource().getInputStream(),
+ markupSettings.getDefaultMarkupEncoding());
// parse the xml markup and tokenize it into wicket relevant markup
// elements
@@ -268,6 +272,22 @@
markupResourceData.setEncoding(xmlParser.getEncoding());
markupResourceData.setXmlDeclaration(xmlParser.getXmlDeclaration());
+ if (xmlParser.getXmlDeclaration() == null)
+ {
+ if (markupSettings.getThrowExceptionOnMissingXmlDeclaration())
+ {
+ throw new MarkupException(markupResourceData.getResource(),
+ "The markup file does not have a XML declaration prolog. "
+ + ". E.g. <?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
+ }
+ else
+ {
+ log.debug("The markup file does not have a XML declaration prolog: " +
+ markupResourceData.getResource() +
+ ". It is more save to use it. E.g. <?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
+ }
+ }
+
return markup;
}
@@ -422,8 +442,8 @@
while (true)
{
boolean matched = m.find();
- String nonPre = matched ? rawMarkup.substring(lastend, m.start()) : rawMarkup
- .substring(lastend);
+ String nonPre = matched ? rawMarkup.substring(lastend, m.start())
+ : rawMarkup.substring(lastend);
nonPre = nonPre.replaceAll("[ \\t]+", " ");
nonPre = nonPre.replaceAll("( ?[\\r\\n] ?)+", "\n");
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupCloseLink$ClosePopupPage.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupCloseLink%24ClosePopupPage.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupCloseLink$ClosePopupPage.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupCloseLink$ClosePopupPage.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/EmptyPanel.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/EmptyPanel.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/EmptyPanel.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/EmptyPanel.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkIconPanel.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkIconPanel.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkIconPanel.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkIconPanel.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IMarkupSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IMarkupSettings.java?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IMarkupSettings.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IMarkupSettings.java Sun Dec 2 01:54:21 2007
@@ -99,6 +99,12 @@
boolean getStripXmlDeclarationFromOutput();
/**
+ * @since 1.3
+ * @return if true, an exception is thrown if the markup file does not contain a xml declaration
+ */
+ boolean getThrowExceptionOnMissingXmlDeclaration();
+
+ /**
* Application default for automatic link resolution. Please
*
* @see org.apache.wicket.markup.resolver.AutoLinkResolver and
@@ -189,4 +195,12 @@
* if true, xml declaration will be stripped from output
*/
void setStripXmlDeclarationFromOutput(final boolean strip);
+
+ /**
+ * If true, an exception is thrown if the markup file does not contain a xml declaration
+ *
+ * @since 1.3
+ * @param throwException
+ */
+ void setThrowExceptionOnMissingXmlDeclaration(final boolean throwException);
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java Sun Dec 2 01:54:21 2007
@@ -78,18 +78,18 @@
* @author Martijn Dashorst
*/
public final class Settings
- implements
- IApplicationSettings,
- IDebugSettings,
- IExceptionSettings,
- IMarkupSettings,
- IPageSettings,
- IRequestCycleSettings,
- IResourceSettings,
- ISecuritySettings,
- ISessionSettings,
- IFrameworkSettings,
- IRequestLoggerSettings
+ implements
+ IApplicationSettings,
+ IDebugSettings,
+ IExceptionSettings,
+ IMarkupSettings,
+ IPageSettings,
+ IRequestCycleSettings,
+ IResourceSettings,
+ ISecuritySettings,
+ ISessionSettings,
+ IFrameworkSettings,
+ IRequestLoggerSettings
{
/** Class of access denied page. */
private WeakReference/* <Class<? extends Page> */accessDeniedPage;
@@ -181,6 +181,9 @@
/** A markup cache which will load the markup if required. */
private IMarkupCache markupCache;
+ /** 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;
@@ -201,7 +204,7 @@
/** The eviction strategy. */
private IPageMapEvictionStrategy pageMapEvictionStrategy = new LeastRecentlyAccessedEvictionStrategy(
- 5);
+ 5);
/** The factory to be used for the property files */
private org.apache.wicket.resource.IPropertiesFactory propertiesFactory;
@@ -349,7 +352,7 @@
if (!(finder instanceof IResourcePath))
{
throw new IllegalArgumentException(
- "To add a resource folder, the application's resource finder must be an instance of IResourcePath");
+ "To add a resource folder, the application's resource finder must be an instance of IResourcePath");
}
// Cast to resource path and add folder
@@ -891,7 +894,7 @@
* @see org.apache.wicket.settings.ISecuritySettings#setCookieValuePersisterSettings(org.apache.wicket.markup.html.form.persistence.CookieValuePersisterSettings)
*/
public void setCookieValuePersisterSettings(
- CookieValuePersisterSettings cookieValuePersisterSettings)
+ CookieValuePersisterSettings cookieValuePersisterSettings)
{
this.cookieValuePersisterSettings = cookieValuePersisterSettings;
}
@@ -1132,7 +1135,7 @@
* @see org.apache.wicket.settings.ISecuritySettings#setUnauthorizedComponentInstantiationListener(org.apache.wicket.authorization.IUnauthorizedComponentInstantiationListener)
*/
public void setUnauthorizedComponentInstantiationListener(
- IUnauthorizedComponentInstantiationListener unauthorizedComponentInstantiationListener)
+ IUnauthorizedComponentInstantiationListener unauthorizedComponentInstantiationListener)
{
this.unauthorizedComponentInstantiationListener = unauthorizedComponentInstantiationListener;
}
@@ -1141,7 +1144,7 @@
* @see org.apache.wicket.settings.IRequestCycleSettings#setUnexpectedExceptionDisplay(org.apache.wicket.settings.Settings.UnexpectedExceptionDisplay)
*/
public void setUnexpectedExceptionDisplay(
- final UnexpectedExceptionDisplay unexpectedExceptionDisplay)
+ final UnexpectedExceptionDisplay unexpectedExceptionDisplay)
{
this.unexpectedExceptionDisplay = unexpectedExceptionDisplay;
}
@@ -1178,7 +1181,7 @@
if (!Page.class.isAssignableFrom(pageClass))
{
throw new IllegalArgumentException("argument " + pageClass +
- " must be a subclass of Page");
+ " must be a subclass of Page");
}
}
@@ -1334,5 +1337,21 @@
public boolean getAddLastModifiedTimeToResourceReferenceUrl()
{
return addLastModifiedTimeToResourceReferenceUrl;
+ }
+
+ /**
+ * @see org.apache.wicket.settings.IMarkupSettings#getThrowExceptionOnMissingXmlDeclaration()
+ */
+ public boolean getThrowExceptionOnMissingXmlDeclaration()
+ {
+ return throwExceptionOnMissingXmlDeclaration;
+ }
+
+ /**
+ * @see org.apache.wicket.settings.IMarkupSettings#setThrowExceptionOnMissingXmlDeclaration(boolean)
+ */
+ public void setThrowExceptionOnMissingXmlDeclaration(boolean throwException)
+ {
+ throwExceptionOnMissingXmlDeclaration = throwException;
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.html?rev=600263&r1=600262&r2=600263&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.html Sun Dec 2 01:54:21 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with