Return-Path: Delivered-To: apmail-wicket-dev-archive@www.apache.org Received: (qmail 20917 invoked from network); 29 Dec 2007 14:11:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Dec 2007 14:11:21 -0000 Received: (qmail 58049 invoked by uid 500); 29 Dec 2007 14:11:09 -0000 Delivered-To: apmail-wicket-dev-archive@wicket.apache.org Received: (qmail 58028 invoked by uid 500); 29 Dec 2007 14:11:09 -0000 Mailing-List: contact dev-help@wicket.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@wicket.apache.org Delivered-To: mailing list dev@wicket.apache.org Received: (qmail 58019 invoked by uid 99); 29 Dec 2007 14:11:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Dec 2007 06:11:09 -0800 X-ASF-Spam-Status: No, hits=4.0 required=10.0 tests=HTML_MESSAGE,SPF_PASS,URIBL_BLACK X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of frank.bille@gmail.com designates 209.85.198.186 as permitted sender) Received: from [209.85.198.186] (HELO rv-out-0910.google.com) (209.85.198.186) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Dec 2007 14:10:46 +0000 Received: by rv-out-0910.google.com with SMTP id k20so2410285rvb.32 for ; Sat, 29 Dec 2007 06:10:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:references:x-google-sender-auth; bh=Z8BvGOtOVZX2sgnHhoVNhYpWyq6RmOVzaQWb6xO/Gjs=; b=dhI824KsTnP0qSrT3xSkno7XgBroooqaEXb1TVEbGjf7l5SVXNrLNMxDXyKqfLnHho2sL91AabPJkTDdFvY+MRfgjDMLAk739IIGCibCbxWpEn7FOhgeon6GHIgsWl0voGvUKcBSECh02LElwOruKJF93MtwXsOcO04mRQgQL4w= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:references:x-google-sender-auth; b=onZqoj1ncWsKJ6SQ//oq8y94sA2QoqnaghH+ppuQE0WjqMwKUfxN+pUSGBxEdPN2TCeKrhEEF6qowX3xEb2ZSOi2EWq1kqxYRCcoeIbS126NqlsoZwBf3qC3uHatYo/ZecYSWiq/Lq1lMxQEWAvzE/jWtgdlN4yz+P8w+kgSVB8= Received: by 10.142.131.18 with SMTP id e18mr3323580wfd.207.1198937450651; Sat, 29 Dec 2007 06:10:50 -0800 (PST) Received: by 10.142.72.9 with HTTP; Sat, 29 Dec 2007 06:10:50 -0800 (PST) Message-ID: <2e1739530712290610s1f4e2d45k620605532e9a3a8e@mail.gmail.com> Date: Sat, 29 Dec 2007 15:10:50 +0100 From: "Frank Bille" Sender: frank.bille@gmail.com To: dev@wicket.apache.org Subject: Re: 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 In-Reply-To: <918312fe0712290607o3f080a1cr7a59f0ced16f4f49@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_29744_18808593.1198937450652" References: <918312fe0712290607o3f080a1cr7a59f0ced16f4f49@mail.gmail.com> X-Google-Sender-Auth: 81b3a623a0fad17b X-Virus-Checked: Checked by ClamAV on apache.org ------=_Part_29744_18808593.1198937450652 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline Thx, I will revert remaining pages. Frank On Dec 29, 2007 3:07 PM, Martijn Dashorst wrote: > @frank: this is the first commit > Martijn > > On Dec 2, 2007 10:54 AM, wrote: > > > 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)* > + private static final Pattern CONDITIONAL_COMMENT = > Pattern.compile("\\[if > > .+\\]>(.|\n|\r)* > > > /** 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. 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. > > "); > > + } > > + } > > + > > 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 @@ > > + > >