Menu
▾
▴
jtidy-cvs — JTidy mailing list for CVS commits
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(46) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(1) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
(1) |
Jul
(15) |
Aug
(24) |
Sep
(14) |
Oct
(2) |
Nov
(1) |
Dec
(18) |
| 2002 |
Jan
(12) |
Feb
(5) |
Mar
(3) |
Apr
(1) |
May
(1) |
Jun
(10) |
Jul
(3) |
Aug
(4) |
Sep
|
Oct
(1) |
Nov
|
Dec
(5) |
| 2003 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
(1) |
May
(2) |
Jun
(4) |
Jul
(2) |
Aug
(4) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2004 |
Jan
(141) |
Feb
(79) |
Mar
(85) |
Apr
(38) |
May
(1) |
Jun
|
Jul
(78) |
Aug
(223) |
Sep
(107) |
Oct
(158) |
Nov
(136) |
Dec
|
| 2005 |
Jan
(7) |
Feb
(4) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(2) |
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(100) |
Dec
(22) |
|
From: Vlad S. <vl...@us...> - 2005-12-01 00:23:06
|
Update of /cvsroot/jtidy/jtidyservlet-webapp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19767 Modified Files: project.xml Log Message: fix for maven 1.1 Index: project.xml =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet-webapp/project.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- project.xml 29 Apr 2005 21:23:58 -0000 1.9 +++ project.xml 1 Dec 2005 00:22:57 -0000 1.10 @@ -259,7 +259,7 @@ <dependency> <groupId>maven-plugins</groupId> <artifactId>maven-findbugs-plugin</artifactId> - <version>0.8.4</version> + <version>0.9.2</version> <type>plugin</type> <properties> <comment>maven plugin for the findbug report</comment> |
|
From: Vlad S. <vl...@us...> - 2005-12-01 00:22:19
|
Update of /cvsroot/jtidy/jtidyservlet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19603 Modified Files: project.xml Log Message: fix for maven 1.1 Index: project.xml =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet/project.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- project.xml 27 Nov 2004 19:04:48 -0000 1.10 +++ project.xml 1 Dec 2005 00:22:11 -0000 1.11 @@ -192,7 +192,7 @@ <dependency> <groupId>maven-plugins</groupId> <artifactId>maven-findbugs-plugin</artifactId> - <version>0.8.4</version> + <version>0.9.2</version> <type>plugin</type> <properties> <comment>maven plugin for the findbug report</comment> |
Update of /cvsroot/jtidy/jtidyservlet/src/java/org/w3c/tidy/servlet/filter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2984/src/java/org/w3c/tidy/servlet/filter Modified Files: BufferedServletOutputStream.java BufferedServletResponse.java JTidyFilter.java Added Files: BufferedServletPrintWriter.java Log Message: New filter params isCommittedFix and defferedStreamClose --- NEW FILE --- /* * Java HTML Tidy - JTidy * HTML parser and pretty printer * * Copyright (c) 1998-2000 World Wide Web Consortium (Massachusetts * Institute of Technology, Institut National de Recherche en * Informatique et en Automatique, Keio University). All Rights * Reserved. * * Contributing Author(s): * * Dave Raggett <ds...@w3...> * Andy Quick <ac....@sy...> (translation to Java) * Gary L Peskin <ga...@fi...> (Java development) * Sami Lempinen <sa...@le...> (release management) * Fabrizio Giustina <fgiust at users.sourceforge.net> * Vlad Skarzhevskyy <vlads at users.sourceforge.net> (JTidy servlet development) * * The contributing author(s) would like to thank all those who * helped with testing, bug fixes, and patience. This wouldn't * have been possible without all of you. * * COPYRIGHT NOTICE: * * This software and documentation is provided "as is," and * the copyright holders and contributing author(s) make no * representations or warranties, express or implied, including * but not limited to, warranties of merchantability or fitness * for any particular purpose or that the use of the software or * documentation will not infringe any third party patents, * copyrights, trademarks or other rights. * * The copyright holders and contributing author(s) will not be * liable for any direct, indirect, special or consequential damages * arising out of any use of the software or documentation, even if * advised of the possibility of such damage. * * Permission is hereby granted to use, copy, modify, and distribute * this source code, or portions hereof, documentation and executables, * for any purpose, without fee, subject to the following restrictions: * * 1. The origin of this source code must not be misrepresented. * 2. Altered versions must be plainly marked as such and must * not be misrepresented as being the original source. * 3. This Copyright notice may not be removed or altered from any * source or altered source distribution. * * The copyright holders and contributing author(s) specifically * permit, without fee, and encourage the use of this source code * as a component for supporting the Hypertext Markup Language in * commercial products. If you use this source code in a product, * acknowledgment is not required but would be appreciated. * */ package org.w3c.tidy.servlet.filter; import java.io.OutputStream; import java.io.PrintWriter; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** * Buffers the response. * * @author Vlad Skarzhevskyy <a href="mailto:ska...@gm...">ska...@gm...</a> * @version $Revision: 1.1 $ ($Author: vlads $) */ public class BufferedServletPrintWriter extends PrintWriter { private boolean defferedStreamClose; /** * Logger. */ private static Log log = LogFactory.getLog(BufferedServletPrintWriter.class); public BufferedServletPrintWriter(OutputStream out) { super(out); } public BufferedServletPrintWriter(Writer out) { super(out); } public void close() { if (log.isDebugEnabled()) { log.debug("called close() from", new Throwable()); } if (this.defferedStreamClose) { log.debug("PrintWriter close() deffered"); return; } super.close(); } protected void doClose() { super.close(); } public void setDefferedStreamClose(boolean defferedStreamClose) { this.defferedStreamClose = defferedStreamClose; } } Index: BufferedServletOutputStream.java =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet/src/java/org/w3c/tidy/servlet/filter/BufferedServletOutputStream.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- BufferedServletOutputStream.java 29 Apr 2005 21:20:45 -0000 1.5 +++ BufferedServletOutputStream.java 2 Nov 2005 22:43:16 -0000 1.6 @@ -71,7 +71,7 @@ /** * Substitute ServletOutputStream. * - * @author Vlad Skarzhevskyy <a href="mailto:ska...@gm...">ska...@gm...</a> + * @author Vlad Skarzhevskyy <a href="mailto:ska...@gm...">ska...@gm...</a> * @version $Revision$ ($Author$) */ public class BufferedServletOutputStream extends ServletOutputStream @@ -90,11 +90,13 @@ * Disabe processing for binary output. */ protected boolean binary; - + private int originalContentLength = -1; + + private boolean defferedStreamClose; protected TidyProcessor processor; - + /** * Logger. */ @@ -104,14 +106,14 @@ * Has this stream been closed? */ protected boolean closed; - + /** * Original OutputStream. If in tee configuration */ private ServletOutputStream origOutputStream; - - /** + + /** * Create a regular buffer. */ BufferedServletOutputStream(HttpServletResponse httpServletResponse, TidyProcessor tidyProcessor) @@ -149,20 +151,37 @@ } /** - * Used by BufferedServletResponse.isCommitted + * Used by BufferedServletResponse.isCommitted * @return */ - public boolean hasNonemptyBuffer() + public boolean hasNonemptyBuffer() { return (this.buffer.size() != 0); } - + /** * Close this output stream, causing any buffered data to be flushed and * any further output data to throw an IOException. */ + public void close() throws IOException { + if (this.defferedStreamClose) + { + log.debug("stream close() deffered"); + return; + } + + doClose(); + } + + protected void doClose() throws IOException + { + + if (log.isDebugEnabled()) + { + log.debug("called close() from", new Throwable()); + } if (closed) { @@ -225,7 +244,7 @@ } /** * @param Intended size of the output. - */ + */ protected void setOriginalContentLength(int len) { this.originalContentLength = len; @@ -237,4 +256,9 @@ { return closed; } + + public void setDefferedStreamClose(boolean defferedStreamClose) + { + this.defferedStreamClose = defferedStreamClose; + } } Index: BufferedServletResponse.java =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet/src/java/org/w3c/tidy/servlet/filter/BufferedServletResponse.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- BufferedServletResponse.java 29 Apr 2005 21:20:45 -0000 1.5 +++ BufferedServletResponse.java 2 Nov 2005 22:43:16 -0000 1.6 @@ -57,8 +57,8 @@ * Created on 02.10.2004 */ import java.io.IOException; -import java.io.PrintWriter; import java.io.OutputStreamWriter; +import java.io.PrintWriter; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; @@ -93,14 +93,20 @@ * any. */ - protected PrintWriter writer = null; + protected BufferedServletPrintWriter writer = null; /** * Do not buffer the output, Preform validation only */ private boolean tee = false; + protected boolean binary = false; + private int originalContentLength = -1; + + private boolean defferedStreamClose; + + private boolean isCommittedFix = true; protected TidyProcessor processor; @@ -138,6 +144,7 @@ } stream.setBinary(this.binary); stream.setOriginalContentLength(originalContentLength); + stream.setDefferedStreamClose(this.defferedStreamClose); return stream; } @@ -224,13 +231,15 @@ // according the spec, so feel free to remove that "if" if (charEnc != null) { - this.writer = new PrintWriter(new OutputStreamWriter(this.stream, charEnc)); + this.writer = new BufferedServletPrintWriter(new OutputStreamWriter(this.stream, charEnc)); } else { - this.writer = new PrintWriter(this.stream); + this.writer = new BufferedServletPrintWriter(this.stream); } - + + this.writer.setDefferedStreamClose(this.defferedStreamClose); + return (this.writer); } @@ -242,28 +251,41 @@ */ public boolean isCommitted() { - return /*(stream != null && stream.hasNonemptyBuffer()) ||*/ super.isCommitted(); + return (this.isCommittedFix && stream != null && stream.hasNonemptyBuffer()) || super.isCommitted(); } /** * Finish a response. */ - public void finishResponse() + protected void finishResponse() { try { log.debug("finishResponse"); if (this.writer != null) { - log.debug("close writer"); - this.writer.close(); + if (this.defferedStreamClose) { + log.debug("deffered close writer"); + this.writer.doClose(); + if (this.stream != null) { + log.debug("deffered close stream"); + this.stream.doClose(); + } + } else { + log.debug("close writer"); + this.writer.close(); + } } else if (this.stream != null) { - log.debug("close stream"); - this.stream.close(); + if (this.defferedStreamClose) { + log.debug("deffered close stream"); + this.stream.doClose(); + } else { + log.debug("close stream"); + this.stream.close(); + } } - } catch (IOException e) { @@ -278,4 +300,17 @@ { this.tee = tee; } + + /** + * @param defferedStreamClose The defferedStreamClose to set. + */ + public void setDefferedStreamClose(boolean defferedStreamClose) + { + this.defferedStreamClose = defferedStreamClose; + } + + public void setIsCommittedFix(boolean isCommittedFix) + { + this.isCommittedFix = isCommittedFix; + } } \ No newline at end of file Index: JTidyFilter.java =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet/src/java/org/w3c/tidy/servlet/filter/JTidyFilter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- JTidyFilter.java 1 Nov 2004 23:38:04 -0000 1.5 +++ JTidyFilter.java 2 Nov 2005 22:43:16 -0000 1.6 @@ -131,6 +131,24 @@ * */ public static final String CONFIG_COMMENTS_SUBST = "commentsSubst"; + + /** + * name of the parameter <code>defferedStreamClose</code>. + * + * Do not close BufferedServletOutputStream + * To avoid java.io.IOException: Stream closed after RequestProcessor.doForward + */ + public static final String CONFIG_DEFFERED_STREAM_CLOSE = "defferedStreamClose"; + + /** + * name of the parameter <code>isCommittedFix</code>. + * + * An exception is thrown when using JTidyFilter with a JSP that has a dynamic include which points to a Struts action that forwards to a Tiles definition. + * The fix is to override isCommitted() in BufferedServletResponse, to make sure this method correctly reports the "committed" status with our custom output stream + * + */ + public static final String CONFIG_IS_COMMITTED_FIX = "isCommittedFix"; + /** * Logger. */ @@ -160,6 +178,16 @@ * @see #CONFIG_COMMENTS_SUBST. */ private boolean commentsSubst; + + /** + * @see #CONFIG_DEFFERED_STREAM_CLOSE. + */ + private boolean defferedStreamClose; + + /** + * @see #CONFIG_IS_COMMITTED_FIX. + */ + private boolean isCommittedFix; /** * Convert String to beelean. @@ -188,11 +216,13 @@ JTidyServletProperties.getInstance().loadFile(filterConfig.getInitParameter(CONFIG_PROPERTIES_FILE_NAME)); - tee = getBoolean(filterConfig.getInitParameter(CONFIG_TEE), false); - doubleValidation = getBoolean(filterConfig.getInitParameter(CONFIG_DOUBLE_VALIDATION), false); - validateOnly = getBoolean(filterConfig.getInitParameter(CONFIG_VALIDATE_ONLY), false); - config = filterConfig.getInitParameter(CONFIG_CONFIG); - commentsSubst = getBoolean(filterConfig.getInitParameter(CONFIG_COMMENTS_SUBST), false); + this.tee = getBoolean(filterConfig.getInitParameter(CONFIG_TEE), false); + this.doubleValidation = getBoolean(filterConfig.getInitParameter(CONFIG_DOUBLE_VALIDATION), false); + this.validateOnly = getBoolean(filterConfig.getInitParameter(CONFIG_VALIDATE_ONLY), false); + this.config = filterConfig.getInitParameter(CONFIG_CONFIG); + this.commentsSubst = getBoolean(filterConfig.getInitParameter(CONFIG_COMMENTS_SUBST), false); + this.defferedStreamClose = getBoolean(filterConfig.getInitParameter(CONFIG_DEFFERED_STREAM_CLOSE), false); + this.isCommittedFix = getBoolean(filterConfig.getInitParameter(CONFIG_IS_COMMITTED_FIX), false); } /** @@ -232,7 +262,9 @@ BufferedServletResponse wrappedResponse = new BufferedServletResponse( (HttpServletResponse) servletResponse, tidyProcessor); - wrappedResponse.setTee(tee); + wrappedResponse.setTee(this.tee); + wrappedResponse.setDefferedStreamClose(this.defferedStreamClose); + wrappedResponse.setIsCommittedFix(this.isCommittedFix); try { |
|
From: Vlad S. <vl...@us...> - 2005-11-02 22:43:24
|
Update of /cvsroot/jtidy/jtidyservlet/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2984/xdocs Modified Files: filter.xml Log Message: New filter params isCommittedFix and defferedStreamClose Index: filter.xml =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet/xdocs/filter.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- filter.xml 25 Oct 2004 19:13:22 -0000 1.2 +++ filter.xml 2 Nov 2005 22:43:16 -0000 1.3 @@ -96,6 +96,14 @@ <param-name>doubleValidation</param-name> <param-value>false</param-value> </init-param> + <init-param> + <param-name>defferedStreamClose</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>isCommittedFix</param-name> + <param-value>false</param-value> + </init-param> </filter> ... </web-app> @@ -148,6 +156,23 @@ <td>Custom properties file path. See: <a href="./configuration.html">Configuration</a> </td> </tr> + <tr> + <td>defferedStreamClose</td> + <td>false</td> + <td>true, false</td> + <td> + Do not close BufferedServletOutputStream to avoid java.io.IOException: Stream closed after RequestProcessor.doForward + </td> + </tr> + <tr> + <td>isCommittedFix</td> + <td>false</td> + <td>true, false</td> + <td> + An exception is thrown when using JTidyFilter with a JSP that has a dynamic include which points to a Struts action that forwards to a Tiles definition. + The fix is to override isCommitted() in BufferedServletResponse, to make sure this method correctly reports the "committed" status with our custom output stream + </td> + </tr> </tbody> </table> |
|
From: fabrizio g. <fg...@us...> - 2005-10-17 21:18:36
|
Update of /cvsroot/jtidy/jtidy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27147 Modified Files: maven.xml project.xml Log Message: fix for maven 1.1 Index: maven.xml =================================================================== RCS file: /cvsroot/jtidy/jtidy/maven.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- maven.xml 7 Nov 2004 21:33:32 -0000 1.11 +++ maven.xml 17 Oct 2005 21:18:27 -0000 1.12 @@ -1,39 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns:j="jelly:core" xmlns:u="jelly:util" default="rebuild-all"> - - <goal name="rebuild-all" prereqs="pom,clean,ant,dist" /> - - <goal name="nightly" - prereqs="multiproject:clean,multiproject:install,dist,multiproject:site,copy-snapshots, site:sshdeploy" /> - - <preGoal name="dist:prepare-src-filesystem"> - <attainGoal name="ant" /> - </preGoal> - - <postGoal name="dist:prepare-src-filesystem"> - <copy todir="${maven.dist.src.assembly.dir}"> - <fileset dir="."> - <include name="checkstyle.xml" /> - </fileset> - </copy> - </postGoal> - - <goal name="copy-snapshots"> - <mkdir dir="${maven.build.dir}/docs/nightly" /> - <copy todir="${maven.build.dir}/docs/nightly"> - <fileset dir="${maven.build.dir}/distributions" /> - <fileset dir="../jtidyservlet/target"> - <include name="*.jar" /> - </fileset> - <fileset dir="../jtidyservlet-webapp/target"> - <include name="*.war" /> - </fileset> - <fileset dir="${maven.build.dir}/distributions" /> - </copy> - <mkdir dir="${maven.build.dir}/docs/maven" /> - <copy file="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar" - todir="${maven.build.dir}/docs/maven/${pom.groupId}/jars" /> - </goal> - +<project xmlns:j="jelly:core" xmlns:u="jelly:util"> + <goal name="rebuild-all" prereqs="pom,clean,ant,dist" /> + <goal name="nightly" prereqs="multiproject:clean,multiproject:install,dist,multiproject:site,copy-snapshots, site:sshdeploy" /> + <preGoal name="dist:prepare-src-filesystem"> + <attainGoal name="ant" /> + </preGoal> + <postGoal name="dist:prepare-src-filesystem"> + <copy todir="${maven.dist.src.assembly.dir}"> + <fileset dir="."> + <include name="checkstyle.xml" /> + </fileset> + </copy> + </postGoal> + <goal name="copy-snapshots"> + <mkdir dir="${maven.build.dir}/docs/nightly" /> + <copy todir="${maven.build.dir}/docs/nightly"> + <fileset dir="${maven.build.dir}/distributions" /> + <fileset dir="../jtidyservlet/target"> + <include name="*.jar" /> + </fileset> + <fileset dir="../jtidyservlet-webapp/target"> + <include name="*.war" /> + </fileset> + <fileset dir="${maven.build.dir}/distributions" /> + </copy> + <mkdir dir="${maven.build.dir}/docs/maven" /> + <copy file="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar" todir="${maven.build.dir}/docs/maven/${pom.groupId}/jars" /> + </goal> </project> - Index: project.xml =================================================================== RCS file: /cvsroot/jtidy/jtidy/project.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- project.xml 7 Nov 2004 18:22:38 -0000 1.27 +++ project.xml 17 Oct 2005 21:18:27 -0000 1.28 @@ -1,266 +1,253 @@ -<project> - <pomVersion>3</pomVersion> - <id>jtidy</id> - <name>JTidy</name> - <groupId>jtidy</groupId> - <currentVersion>r8-SNAPSHOT</currentVersion> - <organization> - <name>sourceforge</name> - <url>http://sourceforge.net</url> - <logo>http://sourceforge.net/sflogo.php?group_id=${maven.sourceforge.project.groupId}&type=2</logo> - </organization> - <inceptionYear>2000</inceptionYear> - <package>org.w3c.tidy</package> - <logo>/images/logo.png</logo> - <description>JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty printer. -Like its non-Java cousin, JTidy can be used as a tool for cleaning up malformed and faulty HTML. -In addition, JTidy provides a DOM interface to the document that is being processed, which effectively makes you able to use JTidy as a DOM parser for real-world HTML.</description> - <shortDescription>JTidy - HTML syntax checker and pretty printer</shortDescription> - <url>http://${pom.groupId}.sourceforge.net</url> - <issueTrackingUrl>http://sourceforge.net/tracker/?group_id=${maven.sourceforge.project.groupId}</issueTrackingUrl> - <siteAddress>shell.sourceforge.net</siteAddress> - <siteDirectory>/home/groups/j/jt/jtidy/htdocs</siteDirectory> - <distributionDirectory>http://sourceforge.net/project/showfiles.php?group_id=${maven.sourceforge.project.groupId}</distributionDirectory> - <repository> - <connection>scm:cvs:pserver:ano...@cv...:/cvsroot/${pom.groupId}:${pom.groupId}</connection> - <developerConnection> - scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/${pom.groupId}:${pom.groupId} - </developerConnection> - <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/${pom.groupId}/${pom.groupId}/</url> - </repository> - <versions> - <version> - <id>04aug2000r2</id> - <name>04aug2000r2</name> - <tag></tag> - </version> - <version> - <id>04aug2000r3</id> - <name>04aug2000r3</name> - <tag></tag> - </version> - <version> - <id>04aug2000r4</id> - <name>04aug2000r4</name> - <tag></tag> - </version> - <version> - <id>04aug2000r5</id> - <name>04aug2000r5</name> - <tag></tag> - </version> - <version> - <id>04aug2000r6</id> - <name>04aug2000r6</name> - <tag></tag> - </version> - <version> - <id>04aug2000r7-dev</id> - <name>04aug2000r7-dev</name> - <tag></tag> - </version> - </versions> - <mailingLists> - <mailingList> - <name>${pom.name} User Mailing list</name> - <subscribe>http://lists.sourceforge.net/lists/listinfo/${pom.groupId}-user</subscribe> - <unsubscribe>http://lists.sourceforge.net/lists/listinfo/${pom.groupId}-user</unsubscribe> - <archive>http://sourceforge.net/mailarchive/forum.php?forum=${pom.groupId}-user</archive> - </mailingList> - <mailingList> - <name>${pom.name} Developer Mailing list</name> - <subscribe>http://lists.sourceforge.net/lists/listinfo/${pom.groupId}-devel</subscribe> - <unsubscribe>http://lists.sourceforge.net/lists/listinfo/${pom.groupId}-devel</unsubscribe> - <archive>http://sourceforge.net/mailarchive/forum.php?forum=${pom.groupId}-devel</archive> - </mailingList> - <mailingList> - <name>${pom.name} Cvs Mailing list</name> - <subscribe>http://lists.sourceforge.net/lists/listinfo/${pom.groupId}-cvs</subscribe> - <unsubscribe>http://lists.sourceforge.net/lists/listinfo/${pom.groupId}-cvs</unsubscribe> - <archive>http://sourceforge.net/mailarchive/forum.php?forum=${pom.groupId}-cvs</archive> - </mailingList> - </mailingLists> - <developers> - <developer> - <name>Fabrizio Giustina</name> - <id>fgiust</id> - <email>fgiust AT users.sourceforge.net</email> - <organization>Sourceforge</organization> - <roles> - <role>Current project admin and developer</role> - </roles> - <timezone>+1</timezone> - </developer> - <developer> - <name>Andy Tripp</name> - <id>atripp</id> - <email>atripp AT users.sourceforge.net</email> - <organization>Sourceforge</organization> - <roles> - <role>Project admin</role> - </roles> - <timezone>0</timezone> - </developer> - <developer> - <name>Russell Gold</name> - <id>russgold</id> - <email>russgold AT users.sourceforge.net</email> - <organization>Sourceforge</organization> - <roles> - <role>Project admin</role> - </roles> - <timezone>0</timezone> - </developer> - <developer> - <name>Gary L Peskin</name> - <id>garypeskin</id> - <email>garypeskin AT users.sourceforge.net</email> - <organization>Sourceforge</organization> - <roles> - <role>developer</role> - </roles> - <timezone>0</timezone> - </developer> - <developer> - <name>Sami Lempinen</name> - <id>lempinen</id> - <email>lempinen AT users.sourceforge.net</email> - <organization>Sourceforge</organization> - <roles> - <role>release manager</role> - </roles> - <timezone>0</timezone> - </developer> - </developers> - <licenses> - <license/> - </licenses> - <dependencies> - <dependency> - <groupId>xerces</groupId> - <artifactId>dom3-xml-apis</artifactId> - <version>1.0</version> - <type>jar</type> - <properties/> - </dependency> - <!--<dependency> - <groupId>xerces</groupId> - <artifactId>xerces</artifactId> - <version>2.6.1</version> - <type>jar</type> - <properties/> - </dependency>--> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - <type>jar</type> - <properties> - <comment>Only used in junit tests. Not needed at runtime.</comment> - </properties> - </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.2</version> - <type>jar</type> - <url>http://ant.apache.org</url> - <properties> - <comment>Required to build and use the jtidy ant task.</comment> - </properties> - </dependency> - <dependency> - <groupId>maven-plugins</groupId> - <artifactId>maven-sourceforge-plugin</artifactId> - <version>1.0</version> - <type>plugin</type> - <url>http://maven-plugins.sourceforge.net</url> - <properties/> - </dependency> - <dependency> - <groupId>statcvs</groupId> - <artifactId>maven-statcvs-plugin</artifactId> - <version>2.4</version> - <type>plugin</type> - <properties> - <comment>maven plugin for the statcvs report</comment> - </properties> - </dependency> - <dependency> - <groupId>maven-plugins</groupId> - <artifactId>maven-findbugs-plugin</artifactId> - <version>0.8.4</version> - <type>plugin</type> - <properties> - <comment>maven plugin for the findbug report</comment> - </properties> - </dependency> - <dependency> - <groupId>maven-validator</groupId> - <artifactId>maven-xhtml-plugin</artifactId> - <version>1.2</version> - <type>plugin</type> - <url>http://maven-validator.sourceforge.net</url> - <properties> - <comment>maven plugin for the xthml validation report</comment> - </properties> - </dependency> - <dependency> - <groupId>maven</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.4.1</version> - <type>plugin</type> - <url>http://maven.apache.org/reference/plugins/checkstyle</url> - <properties> - <comment>maven plugin for the checkstyle report</comment> - </properties> - </dependency> - </dependencies> - <build> - <sourceDirectory>src/main</sourceDirectory> - <unitTestSourceDirectory>src/test</unitTestSourceDirectory> - <unitTest> - <includes> - <include>**/*Test.*</include> - </includes> - <resources> - <resource> - <directory>src/test-resources</directory> - <includes> - <include>**/*.*</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </unitTest> - <resources> - <resource> - <directory>src/main</directory> - <includes> - <include>**/*Messages.properties</include> - <include>**/*.gif</include> - <include>**/*.txt</include> - <include>**/manifest.mf</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </build> - <reports> - <report>maven-license-plugin</report> - <report>maven-checkstyle-plugin</report> - <report>maven-changes-plugin</report> - <report>maven-javadoc-plugin</report> - <report>maven-jdepend-plugin</report> - <report>maven-pmd-plugin</report> - <report>maven-findbugs-plugin</report> - <report>maven-jxr-plugin</report> - <report>maven-junit-report-plugin</report> - <report>maven-clover-plugin</report> - <report>maven-tasklist-plugin</report> - <report>maven-simian-plugin</report> - <report>maven-statcvs-plugin</report> - <report>maven-xhtml-plugin</report> - </reports> - <properties/> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd "> + <pomVersion>3</pomVersion> + <name>JTidy</name> + <groupId>jtidy</groupId> + <currentVersion>r8-SNAPSHOT</currentVersion> + <organization> + <name>sourceforge</name> + <url>http://sourceforge.net</url> + <logo>http://sourceforge.net/sflogo.php?group_id=13153&type=2</logo> + </organization> + <inceptionYear>2000</inceptionYear> + <package>org.w3c.tidy</package> + <logo>/images/logo.png</logo> + <description> + JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty printer. Like its non-Java cousin, JTidy can be used as a tool for cleaning up malformed and faulty HTML. In addition, JTidy provides a DOM interface to the document that is being processed, which effectively makes you able to + use JTidy as a DOM parser for real-world HTML. + </description> + <shortDescription>JTidy - HTML syntax checker and pretty printer</shortDescription> + <url>http://jtidy.sourceforge.net</url> + <issueTrackingUrl>http://sourceforge.net/tracker/?group_id=13153</issueTrackingUrl> + <siteAddress>shell.sourceforge.net</siteAddress> + <siteDirectory>/home/groups/j/jt/jtidy/htdocs</siteDirectory> + <distributionDirectory>http://sourceforge.net/project/showfiles.php?group_id=13153</distributionDirectory> + <repository> + <connection>scm:cvs:pserver:anonymous:@cvs.sourceforge.net:/cvsroot/jtidy:jtidy</connection> + <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/jtidy:jtidy</developerConnection> + <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jtidy/jtidy/</url> + </repository> + <versions> + <version> + <id>04aug2000r2</id> + <name>04aug2000r2</name> + <tag></tag> + </version> + <version> + <id>04aug2000r3</id> + <name>04aug2000r3</name> + <tag></tag> + </version> + <version> + <id>04aug2000r4</id> + <name>04aug2000r4</name> + <tag></tag> + </version> + <version> + <id>04aug2000r5</id> + <name>04aug2000r5</name> + <tag></tag> + </version> + <version> + <id>04aug2000r6</id> + <name>04aug2000r6</name> + <tag></tag> + </version> + <version> + <id>04aug2000r7-dev</id> + <name>04aug2000r7-dev</name> + <tag></tag> + </version> + </versions> + <mailingLists> + <mailingList> + <name>JTidy User Mailing list</name> + <subscribe>http://lists.sourceforge.net/lists/listinfo/jtidy-user</subscribe> + <unsubscribe>http://lists.sourceforge.net/lists/listinfo/jtidy-user</unsubscribe> + <archive>http://sourceforge.net/mailarchive/forum.php?forum=jtidy-user</archive> + </mailingList> + <mailingList> + <name>JTidy Developer Mailing list</name> + <subscribe>http://lists.sourceforge.net/lists/listinfo/jtidy-devel</subscribe> + <unsubscribe>http://lists.sourceforge.net/lists/listinfo/jtidy-devel</unsubscribe> + <archive>http://sourceforge.net/mailarchive/forum.php?forum=jtidy-devel</archive> + </mailingList> + <mailingList> + <name>JTidy Cvs Mailing list</name> + <subscribe>http://lists.sourceforge.net/lists/listinfo/jtidy-cvs</subscribe> + <unsubscribe>http://lists.sourceforge.net/lists/listinfo/jtidy-cvs</unsubscribe> + <archive>http://sourceforge.net/mailarchive/forum.php?forum=jtidy-cvs</archive> + </mailingList> + </mailingLists> + <developers> + <developer> + <name>Fabrizio Giustina</name> + <id>fgiust</id> + <email>fgiust AT users.sourceforge.net</email> + <organization>Sourceforge</organization> + <roles> + <role>Current project admin and developer</role> + </roles> + <timezone>+1</timezone> + </developer> + <developer> + <name>Andy Tripp</name> + <id>atripp</id> + <email>atripp AT users.sourceforge.net</email> + <organization>Sourceforge</organization> + <roles> + <role>Project admin</role> + </roles> + <timezone>0</timezone> + </developer> + <developer> + <name>Russell Gold</name> + <id>russgold</id> + <email>russgold AT users.sourceforge.net</email> + <organization>Sourceforge</organization> + <roles> + <role>Project admin</role> + </roles> + <timezone>0</timezone> + </developer> + <developer> + <name>Gary L Peskin</name> + <id>garypeskin</id> + <email>garypeskin AT users.sourceforge.net</email> + <organization>Sourceforge</organization> + <roles> + <role>developer</role> + </roles> + <timezone>0</timezone> + </developer> + <developer> + <name>Sami Lempinen</name> + <id>lempinen</id> + <email>lempinen AT users.sourceforge.net</email> + <organization>Sourceforge</organization> + <roles> + <role>release manager</role> + </roles> + <timezone>0</timezone> + </developer> + </developers> + <licenses> + <license /> + </licenses> + <dependencies> + <dependency> + <groupId>xerces</groupId> + <artifactId>dom3-xml-apis</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + <properties> + <comment>Only used in junit tests. Not needed at runtime.</comment> + </properties> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.2</version> + <url>http://ant.apache.org</url> + <properties> + <comment>Required to build and use the jtidy ant task.</comment> + </properties> + </dependency> + <dependency> + <groupId>maven-plugins</groupId> + <artifactId>maven-sourceforge-plugin</artifactId> + <version>1.0</version> + <type>plugin</type> + <url>http://maven-plugins.sourceforge.net</url> + </dependency> + <dependency> + <groupId>statcvs</groupId> + <artifactId>maven-statcvs-plugin</artifactId> + <version>2.7</version> + <type>plugin</type> + <properties> + <comment>maven plugin for the statcvs report</comment> + </properties> + </dependency> + <dependency> + <groupId>maven-plugins</groupId> + <artifactId>maven-findbugs-plugin</artifactId> + <version>0.9.2</version> + <type>plugin</type> + <properties> + <comment>maven plugin for the findbug report</comment> + </properties> + </dependency> + <dependency> + <groupId>maven-validator</groupId> + <artifactId>maven-xhtml-plugin</artifactId> + <version>1.2</version> + <type>plugin</type> + <url>http://maven-validator.sourceforge.net</url> + <properties> + <comment>maven plugin for the xthml validation report</comment> + </properties> + </dependency> + <dependency> + <groupId>maven</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.4.1</version> + <type>plugin</type> + <url>http://maven.apache.org/reference/plugins/checkstyle</url> + <properties> + <comment>maven plugin for the checkstyle report</comment> + </properties> + </dependency> + </dependencies> + <build> + <nagEmailAddress>jti...@li...</nagEmailAddress> + <sourceDirectory>src/main</sourceDirectory> + <unitTestSourceDirectory>src/test</unitTestSourceDirectory> + <unitTest> + <includes> + <include>**/*Test.*</include> + </includes> + <resources> + <resource> + <directory>src/test-resources</directory> + <includes> + <include>**/*.*</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </unitTest> + <resources> + <resource> + <directory>src/main</directory> + <includes> + <include>**/*Messages.properties</include> + <include>**/*.gif</include> + <include>**/*.txt</include> + <include>**/manifest.mf</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </build> + <reports> + <report>maven-license-plugin</report> + <report>maven-checkstyle-plugin</report> + <report>maven-changes-plugin</report> + <report>maven-javadoc-plugin</report> + <report>maven-jdepend-plugin</report> + <report>maven-pmd-plugin</report> + <report>maven-findbugs-plugin</report> + <report>maven-jxr-plugin</report> + <report>maven-junit-report-plugin</report> + <report>maven-clover-plugin</report> + <report>maven-tasklist-plugin</report> + <report>maven-simian-plugin</report> + <report>maven-statcvs-plugin</report> + <report>maven-xhtml-plugin</report> + </reports> </project> \ No newline at end of file |
|
From: Vlad S. <vl...@us...> - 2005-04-29 21:24:19
|
Update of /cvsroot/jtidy/jtidyservlet-webapp/src/webapp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14217/src/webapp/tests Added Files: index.jsp testStrutsAction.jsp Log Message: Struts and tiles tests. --- NEW FILE --- <%-- @author Vlad Skarzhevskyy <a href="mailto:ska...@gm...">ska...@gm...</a> @version $Revision: 1.1 $ ($Author: vlads $) --%> <%@ page language="java" %> <%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %> <tiles:insert definition="mainLayout" flush="true"> <tiles:put name="body.str"> <h2>JTidy servlet and Struts/tiles Examples</h2> <ul> <li><a href="testStrutsAction.jsp">testStrutsAction.jsp</a></li> <li><a href="test-filter1.jsp">test-filter1.jsp</a></li> </ul> </tiles:put> </tiles:insert> --- NEW FILE --- <%-- @author Vlad Skarzhevskyy <a href="mailto:ska...@gm...">ska...@gm...</a> @version $Revision: 1.1 $ ($Author: vlads $) --%> <%@ page language="java" %> <%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %> <tiles:insert page="/testAction.do" > <tiles:put name="title" value="Test definition set in action, and action forward to another definition. Title is overloaded from insert" /> <%-- header and body values come from definition used in action's forward --%> <%-- name of definition to use in action --%> <tiles:put name="set-definition" value="layout.test1" /> </tiles:insert> |
|
From: Vlad S. <vl...@us...> - 2005-04-29 21:24:13
|
Update of /cvsroot/jtidy/jtidyservlet-webapp/src/java/org/w3c/tidy/servlet/sample/struts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14217/src/java/org/w3c/tidy/servlet/sample/struts Added Files: TestActionTileAction.java Log Message: Struts and tiles tests. --- NEW FILE --- /* * Java HTML Tidy - JTidy * HTML parser and pretty printer * * Copyright (c) 1998-2000 World Wide Web Consortium (Massachusetts * Institute of Technology, Institut National de Recherche en * Informatique et en Automatique, Keio University). All Rights * Reserved. * * Contributing Author(s): * * Dave Raggett <ds...@w3...> * Andy Quick <ac....@sy...> (translation to Java) * Gary L Peskin <ga...@fi...> (Java development) * Sami Lempinen <sa...@le...> (release management) * Fabrizio Giustina <fgiust at users.sourceforge.net> * Vlad Skarzhevskyy <vlads at users.sourceforge.net> (JTidy servlet development) * * The contributing author(s) would like to thank all those who * helped with testing, bug fixes, and patience. This wouldn't * have been possible without all of you. * * COPYRIGHT NOTICE: * * This software and documentation is provided "as is," and * the copyright holders and contributing author(s) make no * representations or warranties, express or implied, including * but not limited to, warranties of merchantability or fitness * for any particular purpose or that the use of the software or * documentation will not infringe any third party patents, * copyrights, trademarks or other rights. * * The copyright holders and contributing author(s) will not be * liable for any direct, indirect, special or consequential damages * arising out of any use of the software or documentation, even if * advised of the possibility of such damage. * * Permission is hereby granted to use, copy, modify, and distribute * this source code, or portions hereof, documentation and executables, * for any purpose, without fee, subject to the following restrictions: * * 1. The origin of this source code must not be misrepresented. * 2. Altered versions must be plainly marked as such and must * not be misrepresented as being the original source. * 3. This Copyright notice may not be removed or altered from any * source or altered source distribution. * * The copyright holders and contributing author(s) specifically * permit, without fee, and encourage the use of this source code * as a component for supporting the Hypertext Markup Language in * commercial products. If you use this source code in a product, * acknowledgment is not required but would be appreciated. * */ package org.w3c.tidy.servlet.sample.struts; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.tiles.ComponentContext; import org.apache.struts.tiles.ComponentDefinition; import org.apache.struts.tiles.DefinitionsFactoryException; import org.apache.struts.tiles.DefinitionsUtil; import org.apache.struts.tiles.FactoryNotFoundException; import org.apache.struts.tiles.NoSuchDefinitionException; /** * Implementation of <strong>Action</strong> that populates an instance of * <code>SubscriptionForm</code> from the currently specified subscription. * * Taken from: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/test/TestActionTileAction.java * * @version $Revision: 1.1 $ ($Author: vlads $) */ /** * */ public class TestActionTileAction extends Action { // --------------------------------------------------------- Public Methods /** * Process the specified HTTP request, and create the corresponding HTTP response (or forward to another web * component that will create it). Return an <code>ActionForward</code> instance describing where and how control * should be forwarded, or <code>null</code> if the response has already been completed. * @param mapping The ActionMapping used to select this instance * @param actionForm The optional ActionForm bean for this request (if any) * @param request The HTTP request we are processing * @param response The HTTP response we are creating * @exception Exception if the application business logic throws an exception */ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { // Try to retrieve tile context ComponentContext context = ComponentContext.getContext(request); if (context == null) { request.setAttribute("actionError", "Can't get component context."); return (mapping.findForward("failure")); } // Get requested test from tile parameter String param; // Set a definition in this action param = (String) context.getAttribute("set-definition-name"); if (param != null) { try { // Read definition from factory, but we can create it here. ComponentDefinition definition = DefinitionsUtil.getDefinition(param, request, getServlet() .getServletContext()); //definition.putAttribute( "attributeName", "aValue" ); DefinitionsUtil.setActionDefinition(request, definition); } catch (FactoryNotFoundException ex) { request.setAttribute("actionError", "Can't get definition factory."); return (mapping.findForward("failure")); } catch (NoSuchDefinitionException ex) { request.setAttribute("actionError", "Can't get definition '" + param + "'."); return (mapping.findForward("failure")); } catch (DefinitionsFactoryException ex) { request.setAttribute("actionError", "General error '" + ex.getMessage() + "'."); return (mapping.findForward("failure")); } } // Overload a parameter param = (String) context.getAttribute("set-attribute"); if (param != null) { context.putAttribute(param, context.getAttribute("set-attribute-value")); } // end if return (mapping.findForward("success")); } } |
|
From: Vlad S. <vl...@us...> - 2005-04-29 21:24:07
|
Update of /cvsroot/jtidy/jtidyservlet-webapp/src/webapp/layout In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14217/src/webapp/layout Added Files: classicLayout.jsp Log Message: Struts and tiles tests. --- NEW FILE --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %> <%@ taglib uri="http://jtidy.sf.net" prefix="jtidy" %> <%@ page import="org.w3c.tidy.servlet.sample.TimeZoneDetection" %> <%-- Layout component parameters : title, body --%> <html> <head> <title><tiles:getAsString name="title"/></title> <meta http-equiv="Expires" content="-1"> <meta http-equiv="Pragma" content="no-cache"> <meta http-equiv="Cache-Control" content="no-cache"> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <meta name="author" content="Vlad Skarzhevskyy"> <meta name="email" content="vlads(at)users.sourceforge.net"> <link rel="stylesheet" href="../styles/examples.css" type="text/css" media="all"> <style type="text/css" media="all"> @import url("../styles/maven-base.css"); @import url("../styles/maven-theme.css");</style> <script type="text/javascript" src="../js/timeZoneDetection.js"></script> </head> <body onload="setTimezoneOffsetCookie()"> <div id="banner"> <a href="http://sourceforge.net" id="organizationLogo"> <img alt="sourceforge" src="http://sourceforge.net/sflogo.php?group_id=13153&type=2"></a> <a href="http://jtidy.sourceforge.net" id="projectLogo"> <img alt="JTidy Servlet" src="../images/logo.png"></a> <div class="clear"><hr></div> </div> <div id="breadcrumbs"> <div class="xleft"> JTidy servlet extension - Live examples <span class="separator">|</span> <a href="../index.jsp">Examples Home</a> <span class="separator">|</span> <a href="http://jtidy.homelinux.net/" class="externalLink">Documentation</a> </div> <div class="xright"> RequestID: <jtidy:requestID/> <span class="separator">|</span> Time: <%=TimeZoneDetection.getUserTime(request)%> </div> <div class="clear"><hr></div> </div> <div id="backDiv"> <a href="javascript:history.go(-1)"><img alt="Back" src="../images/back.gif"></a> </div> <div id="showsourceDiv"> <a href="<%=request.getRequestURI()%>.source">View JSP Source</a><br> <jtidy:link report="true" result="true" source="false" text="This HTML Source"/> </div> <div id="JTidyValidationImageDiv"> <script type="text/javascript"> function showJTidyReport_iframe() { if ((ppJTidyReport != null) && (ppJTidyReport.ppmShow != null)) { return ppJTidyReport.ppmShow(); } else { // No frame support or some other error return true; } } </script> <jtidy:validationImage onclick="this.blur();return showJTidyReport_iframe();" imgName="JTidyValidationImageCommon" /> <iframe name="ppJTidyReport" id="ppJTidyReport" src="./iframe_main.jsp?requestID=<jtidy:requestID/>" scrolling="no" frameborder="0" style="visibility:hidden; z-index:999; left:50px; position:absolute;"> Sory No support for iframe in your browser </iframe> </div> <div id="body"> <tiles:insert attribute='body'/> <tiles:getAsString name="body.str"/> </div> <div id="firefox"> <a href="http://www.spreadfirefox.com/?q=affiliates&id=0&t=68"><img border="0" alt="Get Firefox!" title="Get Firefox!" src="http://www.spreadfirefox.com/community/images/affiliates/Buttons/88x31/take.gif"/></a> </div> <div id="validxhtml"> <a href="http://validator.w3.org/check?uri=referer"> <img border="0" src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" height="31" width="88"></a> </div> <div id="footer"> <div class="xleft"> Please send any questions or suggestions to <a href="mailto:vlads(at)users.sourceforge.net">vlads(at)users.sourceforge.net</a> </div> </div> </body> </html> |
|
From: Vlad S. <vl...@us...> - 2005-04-29 21:24:06
|
Update of /cvsroot/jtidy/jtidyservlet-webapp/src/java/org/w3c/tidy/servlet/sample In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14217/src/java/org/w3c/tidy/servlet/sample Modified Files: DisplaySourceServlet.java Log Message: Struts and tiles tests. Index: DisplaySourceServlet.java =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet-webapp/src/java/org/w3c/tidy/servlet/sample/DisplaySourceServlet.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DisplaySourceServlet.java 1 Nov 2004 16:36:51 -0000 1.3 +++ DisplaySourceServlet.java 29 Apr 2005 21:23:58 -0000 1.4 @@ -114,14 +114,19 @@ { jspFile = "index.jsp"; } + else if (jspFile.lastIndexOf("/") == (jspFile.length() - 1)) + { + jspFile += "index.jsp"; + } + // only want to show sample pages, don't play with url! /* * if (!jspFile.startsWith("example-")) { throw new ServletException("Invalid file selected: " + jspFile); } */ - if ((jspFile.indexOf("..") >= 0) - || (jspFile.toUpperCase().indexOf("/WEB-INF/") >= 0) + if ((jspFile.indexOf("..") >= 0) + || (jspFile.toUpperCase().indexOf("/WEB-INF/") >= 0) || (jspFile.toUpperCase().indexOf("/META-INF/") >= 0)) { throw new ServletException("Invalid file selected: " + jspFile); |
|
From: Vlad S. <vl...@us...> - 2005-04-29 21:24:06
|
Update of /cvsroot/jtidy/jtidyservlet-webapp/src/webapp/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14217/src/webapp/WEB-INF Modified Files: web.xml Added Files: struts-config.xml tiles-defs.xml Log Message: Struts and tiles tests. --- NEW FILE --- <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd"> <!-- This is the Struts configuration file for the Tiles-test application --> <struts-config> <action-mappings> <!-- Test Struts action and Tiles integration --> <action path="/testAction" type="org.w3c.tidy.servlet.sample.struts.TestActionTileAction"> <forward name="success" path="struts.action.success"/> <forward name="failure" path="struts.action.failure"/> </action> </action-mappings> <!-- ========== TilesPlugin settings ===================================== --> <!-- You should declare this plugin if you want to use Tiles with an XML definition file. --> <plug-in className="org.apache.struts.tiles.TilesPlugin" > <!-- Path to XML definition file --> <set-property property="definitions-config" value="/WEB-INF/tiles-defs.xml" /> <!-- Set Module-awareness to true --> <set-property property="moduleAware" value="false" /> </plug-in> </struts-config> --- NEW FILE --- <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN" "http://struts.apache.org/dtds/tiles-config_1_1.dtd"> <!-- Definitions for Tiles This file contains definitions common to all Struts modules. In particular, it contains the main layout and the common menus. There is also the main page as a portal. --> <tiles-definitions> <definition name="mainLayout" path="/layout/classicLayout.jsp"> <put name="title" value="JTidy servlet extension - Live examples" /> <put name="body.str" value="" /> <put name="body" value="/include/empty.html" /> </definition> <definition name="layout.test1" extends="mainLayout" > <put name="body.str" value="layout.test1" /> </definition> <!-- Test Struts Action and Tiles integration --> <definition name="struts.action.success" extends="mainLayout" > <put name="title" value="Test Struts Action and Tiles integration: default title" direct="true"/> <put name="body.str" value="Success Action" /> </definition> <definition name="struts.action.failure" extends="mainLayout" > <put name="title" value="Test Struts Action and Tiles integration: default title" direct="true"/> <put name="body.str" value="Failure Action" /> </definition> </tiles-definitions> Index: web.xml =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet-webapp/src/webapp/WEB-INF/web.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- web.xml 30 Nov 2004 06:03:57 -0000 1.6 +++ web.xml 29 Apr 2005 21:23:58 -0000 1.7 @@ -6,6 +6,41 @@ <web-app> <display-name>JTidy Examples</display-name> <description>JTidy Examples of Integrating HTML validation to my site building process</description> + + <!-- Action Servlet Configuration --> + <servlet> + <servlet-name>action</servlet-name> + <servlet-class>org.apache.struts.action.ActionServlet</servlet-class> + + <init-param> + <param-name>config</param-name> + <param-value>/WEB-INF/struts-config.xml</param-value> + </init-param> + + <init-param> + <param-name>validate</param-name> + <param-value>true</param-value> + </init-param> + + <init-param> + <param-name>debug</param-name> + <param-value>2</param-value> + </init-param> + + <init-param> + <param-name>detail</param-name> + <param-value>2</param-value> + </init-param> + + <load-on-startup>2</load-on-startup> + </servlet> + + <!-- Action Servlet Mapping --> + <servlet-mapping> + <servlet-name>action</servlet-name> + <url-pattern>*.do</url-pattern> + </servlet-mapping> + <filter> <filter-name>JTidyFilter</filter-name> <description>Filter for JSP</description> |
|
From: Vlad S. <vl...@us...> - 2005-04-29 21:24:06
|
Update of /cvsroot/jtidy/jtidyservlet-webapp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14217 Modified Files: project.xml Log Message: Struts and tiles tests. Index: project.xml =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet-webapp/project.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- project.xml 30 Nov 2004 06:03:56 -0000 1.8 +++ project.xml 29 Apr 2005 21:23:58 -0000 1.9 @@ -184,6 +184,36 @@ </properties> </dependency> <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + <url>http://jakarta.apache.org/commons/beanutils/</url> + <properties> + <war.bundle>true</war.bundle> + <comment>Required by struts</comment> + </properties> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.6</version> + <url>http://jakarta.apache.org/commons/digester/</url> + <properties> + <war.bundle>true</war.bundle> + <comment>Required by struts</comment> + </properties> + </dependency> + <dependency> + <groupId>commons-validator</groupId> + <artifactId>commons-validator</artifactId> + <version>1.1.4</version> + <url>http://jakarta.apache.org/commons/validator/</url> + <properties> + <war.bundle>true</war.bundle> + <comment>Required by struts</comment> + </properties> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.8</version> |
|
From: Vlad S. <vl...@us...> - 2005-04-29 21:20:54
|
Update of /cvsroot/jtidy/jtidyservlet/src/java/org/w3c/tidy/servlet/filter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12472/src/java/org/w3c/tidy/servlet/filter Modified Files: BufferedServletOutputStream.java BufferedServletResponse.java Log Message: Prepare for Fix by: Mark Chrisman Index: BufferedServletOutputStream.java =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet/src/java/org/w3c/tidy/servlet/filter/BufferedServletOutputStream.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- BufferedServletOutputStream.java 1 Nov 2004 06:03:13 -0000 1.4 +++ BufferedServletOutputStream.java 29 Apr 2005 21:20:45 -0000 1.5 @@ -149,6 +149,15 @@ } /** + * Used by BufferedServletResponse.isCommitted + * @return + */ + public boolean hasNonemptyBuffer() + { + return (this.buffer.size() != 0); + } + + /** * Close this output stream, causing any buffered data to be flushed and * any further output data to throw an IOException. */ Index: BufferedServletResponse.java =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet/src/java/org/w3c/tidy/servlet/filter/BufferedServletResponse.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- BufferedServletResponse.java 1 Nov 2004 06:03:20 -0000 1.4 +++ BufferedServletResponse.java 29 Apr 2005 21:20:45 -0000 1.5 @@ -234,6 +234,17 @@ return (this.writer); } + + /** + * Fix by: Mark Chrisman + * An exception is thrown when using JTidyFilter with a JSP that has a dynamic include which points to a Struts action that forwards to a Tiles definition. + * The fix is to override isCommitted() in BufferedServletResponse, to make sure this method correctly reports the "committed" status with our custom output stream + */ + public boolean isCommitted() + { + return /*(stream != null && stream.hasNonemptyBuffer()) ||*/ super.isCommitted(); + } + /** * Finish a response. */ |
|
From: Vlad S. <vl...@us...> - 2005-04-29 21:20:13
|
Update of /cvsroot/jtidy/jtidyservlet-webapp/src/java/org/w3c/tidy/servlet/sample/struts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12048/struts Log Message: Directory /cvsroot/jtidy/jtidyservlet-webapp/src/java/org/w3c/tidy/servlet/sample/struts added to the repository |
|
From: Vlad S. <vl...@us...> - 2005-04-29 20:28:54
|
Update of /cvsroot/jtidy/jtidyservlet-webapp/src/webapp/layout In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16190/layout Log Message: Directory /cvsroot/jtidy/jtidyservlet-webapp/src/webapp/layout added to the repository |
|
From: Vlad S. <vl...@us...> - 2005-04-28 21:59:48
|
Update of /cvsroot/jtidy/jtidyservlet-webapp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13861 Modified Files: link_target2webapp.bat Log Message: Test environment Index: link_target2webapp.bat =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet-webapp/link_target2webapp.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- link_target2webapp.bat 30 Nov 2004 04:32:07 -0000 1.2 +++ link_target2webapp.bat 28 Apr 2005 21:59:37 -0000 1.3 @@ -26,3 +26,11 @@ junction %servlet_classes%\sample target\classes\org\w3c\tidy\servlet\sample +if "%TOMCAT_HOME%" == "" goto no_tomcat_home + +junction "%TOMCAT_HOME%\webapps\jtidyservlet-webapp" src\webapp +rem junction -D "%TOMCAT_HOME%\webapps\jtidyservlet-webapp" + +:no_tomcat_home + +pause \ No newline at end of file |
Update of /cvsroot/jtidy/jtidyservlet-webapp/src/webapp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13374/src/webapp/tests Added Files: test-filter1-include1.jsp test-filter1-include2-forward.jsp test-filter1-include2.jsp test-filter1-include2.txt test-filter1.jsp Log Message: Tests for jsp:include --- NEW FILE --- <p> This is: test-filter1-include1.jsp </p> --- NEW FILE --- <jsp:forward page="test-filter1-include2.jsp" /> --- NEW FILE --- <p> This is: test-filter1-include2.jsp </p> --- NEW FILE --- <p> This is: test-filter1-include2.txt </p> --- NEW FILE --- <%@ include file="../include/header.jsp" %> <h3>Test dynamic include and Filter</h3> <p> Start. </p> <% String include1 = "test-filter1-include1.jsp"; %> <jsp:include page="<%=include1%>" flush="false" /> <% String include2 = "test-filter1-include2-forward.jsp"; //include2 = "test-filter1-include2-forward2txt.jsp"; %> <jsp:include page="<%=include2%>" flush="false" /> <p> End. </p> <%@ include file="../include/footer.jsp" %> |
|
From: Vlad S. <vl...@us...> - 2005-04-28 21:41:44
|
Update of /cvsroot/jtidy/jtidyservlet-webapp/src/webapp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4474/tests Log Message: Directory /cvsroot/jtidy/jtidyservlet-webapp/src/webapp/tests added to the repository |
|
From: Vlad S. <vl...@us...> - 2005-04-28 21:04:28
|
Update of /cvsroot/jtidy/jtidyservlet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17178 Modified Files: maven.xml Log Message: Fixed stand maven test target Index: maven.xml =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet/maven.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- maven.xml 30 Nov 2004 03:34:37 -0000 1.4 +++ maven.xml 28 Apr 2005 21:04:19 -0000 1.5 @@ -14,6 +14,11 @@ <include name="*.tld"/> </fileset> </copy> + <copy todir="${maven.build.dir}/tld" > + <fileset dir="${maven.src.dir}/tld"> + <include name="*.tld"/> + </fileset> + </copy> <copy todir="${maven.build.dir}/test-classes/resources" > <fileset dir="${maven.src.dir}/resources"> <include name="*.png"/> |
|
From: Vlad S. <vl...@us...> - 2005-02-09 19:55:34
|
Update of /cvsroot/jtidy/jtidyservlet/src/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14913/src/resources Modified Files: JTidyServlet.properties Log Message: JTidyServlet.properties logValidationMessages=true|false Index: JTidyServlet.properties =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet/src/resources/JTidyServlet.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JTidyServlet.properties 27 Nov 2004 19:04:42 -0000 1.3 +++ JTidyServlet.properties 9 Feb 2005 19:55:22 -0000 1.4 @@ -21,3 +21,5 @@ # Ouput validation image tag as xhtml xhtml=true +# log JTidy validation messages to log file +logValidationMessages=false |
|
From: Vlad S. <vl...@us...> - 2005-02-09 19:55:34
|
Update of /cvsroot/jtidy/jtidyservlet/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14913/xdocs Modified Files: configuration.xml Log Message: JTidyServlet.properties logValidationMessages=true|false Index: configuration.xml =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet/xdocs/configuration.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- configuration.xml 30 Nov 2004 03:32:51 -0000 1.4 +++ configuration.xml 9 Feb 2005 19:55:22 -0000 1.5 @@ -126,6 +126,12 @@ <td>output jtidy validation image tag as xhtml</td> </tr> <tr> + <td>logValidationMessages</td> + <td>false</td> + <td>boolean</td> + <td>log JTidy validation messages to log file</td> + </tr> + <tr> <td>JTidyServletURI</td> <td>/JTidy</td> <td>String</td> |
|
From: Vlad S. <vl...@us...> - 2005-02-09 19:55:33
|
Update of /cvsroot/jtidy/jtidyservlet/src/java/org/w3c/tidy/servlet/properties In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14913/src/java/org/w3c/tidy/servlet/properties Modified Files: JTidyServletProperties.java Log Message: JTidyServlet.properties logValidationMessages=true|false Index: JTidyServletProperties.java =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet/src/java/org/w3c/tidy/servlet/properties/JTidyServletProperties.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- JTidyServletProperties.java 27 Nov 2004 19:04:45 -0000 1.5 +++ JTidyServletProperties.java 9 Feb 2005 19:55:21 -0000 1.6 @@ -121,6 +121,11 @@ public static final String PROPERTY_BOOLEAN_XHTML = "xhtml"; /** + * property <code>logValidationMessages</code>. + */ + public static final String PROPERTY_BOOLEAN_LOG_VALIDATION_MESSAGES = "logValidationMessages"; + + /** * Logger. */ private static Log log = LogFactory.getLog(JTidyServletProperties.class); |
|
From: Vlad S. <vl...@us...> - 2005-02-09 19:55:31
|
Update of /cvsroot/jtidy/jtidyservlet/src/java/org/w3c/tidy/servlet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14913/src/java/org/w3c/tidy/servlet Modified Files: TidyProcessor.java Log Message: JTidyServlet.properties logValidationMessages=true|false Index: TidyProcessor.java =================================================================== RCS file: /cvsroot/jtidy/jtidyservlet/src/java/org/w3c/tidy/servlet/TidyProcessor.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- TidyProcessor.java 27 Nov 2004 19:04:45 -0000 1.6 +++ TidyProcessor.java 9 Feb 2005 19:55:21 -0000 1.7 @@ -62,6 +62,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.PrintWriter; +import java.util.Iterator; import java.util.Properties; import java.util.StringTokenizer; @@ -298,6 +299,22 @@ ResponseRecordRepository repository = factory.getRepositoryInstance(this.httpSession); repository.addRecord(result); + if (JTidyServletProperties.getInstance().getBooleanProperty( + JTidyServletProperties.PROPERTY_BOOLEAN_LOG_VALIDATION_MESSAGES, + false)) + { + for (Iterator iter = result.getMessages().iterator(); iter.hasNext();) + { + TidyMessage message = (TidyMessage) iter.next(); + StringBuffer msg = new StringBuffer(); + msg.append(message.getLevel()); + msg.append(" (L").append(message.getLine()); + msg.append(":C").append(message.getColumn()).append(") "); + msg.append(message.getMessage()); + log.info(msg.toString()); + } + } + String shortMessage; if ((result.getParseErrors() != 0) || (result.getParseWarnings() != 0)) { |
|
From: fabrizio g. <fg...@us...> - 2005-01-06 10:30:54
|
Update of /cvsroot/jtidy/jtidy/src/test/org/w3c/tidy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30218/src/test/org/w3c/tidy Modified Files: JTidyBugsTest.java AllWorkingTests.java Log Message: #1097062 Index: JTidyBugsTest.java =================================================================== RCS file: /cvsroot/jtidy/jtidy/src/test/org/w3c/tidy/JTidyBugsTest.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- JTidyBugsTest.java 6 Nov 2004 22:16:25 -0000 1.23 +++ JTidyBugsTest.java 6 Jan 2005 10:30:45 -0000 1.24 @@ -53,12 +53,6 @@ */ package org.w3c.tidy; -import java.io.BufferedInputStream; -import java.net.URL; - -import org.w3c.dom.Document; - - /** * testcase for JTidy resolved bugs. * @author fgiust @@ -136,8 +130,8 @@ */ public void test538727() throws Exception { - //this has the same result of setting it in the config file - //tidy.setDocType("\"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"file:///E:/xhtml1-transitional.dtd\""); + // this has the same result of setting it in the config file + // tidy.setDocType("\"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"file:///E:/xhtml1-transitional.dtd\""); executeTidyTest("538727.html"); } @@ -288,4 +282,13 @@ executeTidyTest("1058909.html"); } + /** + * test for JTidy [1097062]: trimInitialSpace does not handle nested inlines. + * @throws Exception any exception generated during the test + */ + public void test1097062() throws Exception + { + executeTidyTest("1097062.html"); + } + } \ No newline at end of file Index: AllWorkingTests.java =================================================================== RCS file: /cvsroot/jtidy/jtidy/src/test/org/w3c/tidy/AllWorkingTests.java,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- AllWorkingTests.java 6 Nov 2004 22:16:25 -0000 1.54 +++ AllWorkingTests.java 6 Jan 2005 10:30:45 -0000 1.55 @@ -98,6 +98,7 @@ suite.addTest(new JTidyBugsTest("test929936")); suite.addTest(new JTidyBugsTest("test1024661")); suite.addTest(new JTidyBugsTest("test1058909")); + suite.addTest(new JTidyBugsTest("test1097062")); suite.addTest(new TidyOutputBugsTest("test427812")); suite.addTest(new TidyOutputBugsTest("test427662")); |
|
From: fabrizio g. <fg...@us...> - 2005-01-06 10:30:53
|
Update of /cvsroot/jtidy/jtidy/src/test-resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30218/src/test-resources Added Files: 1097062.html 1097062.cfg 1097062.msg 1097062.out Log Message: #1097062 --- NEW FILE --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns="http://www.w3.org/TR/REC-html40"> <head> <title>[#1097062] trimInitialSpace does not handle nested inlines</title> </head> <body> <p><span><span><span>Start</span></span></span><span><span>Middle</span></span><span> End</span></p> </body> </html> --- NEW FILE --- tidy-mark: false wrap: 0 word-2000: yes tidy-mark= false wrap= 0 word-2000= yes --- NEW FILE --- <?xml version="1.0" encoding="ISO-8859-1"?> <!-- expected messages for test 1097062--> <messages> <message> <code>-1</code> <level>0</level> <line>0</line> <column>0</column> <text><![CDATA[Tidy (vers Sep 26, 2004) Parsing "InputStream"]]></text> </message> <message> <code>48</code> <level>2</level> <line>2</line> <column>1</column> <text><![CDATA[unknown attribute "xmlns:dt"]]></text> </message> <message> <code>48</code> <level>2</level> <line>2</line> <column>1</column> <text><![CDATA[unknown attribute "xmlns:w"]]></text> </message> <message> <code>48</code> <level>2</level> <line>2</line> <column>1</column> <text><![CDATA[unknown attribute "xmlns:o"]]></text> </message> <message> <code>9</code> <level>1</level> <line>8</line> <column>10</column> <text><![CDATA[nested emphasis <span>]]></text> </message> <message> <code>9</code> <level>1</level> <line>8</line> <column>16</column> <text><![CDATA[nested emphasis <span>]]></text> </message> <message> <code>9</code> <level>1</level> <line>8</line> <column>54</column> <text><![CDATA[nested emphasis <span>]]></text> </message> <message> <code>110</code> <level>0</level> <line>1</line> <column>1</column> <text><![CDATA[InputStream: Doctype given is "-//W3C//DTD XHTML 1.0 Strict//EN"]]></text> </message> <message> <code>111</code> <level>0</level> <line>1</line> <column>1</column> <text><![CDATA[InputStream: Document content looks like HTML 4.01]]></text> </message> <message> <code>-1</code> <level>0</level> <line>0</line> <column>0</column> <text><![CDATA[6 warnings, no errors were found!]]></text> </message> </messages> --- NEW FILE --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html> <head> <title>[#1097062] trimInitialSpace does not handle nested inlines</title> </head> <body> <p>StartMiddle End</p> </body> </html> |
|
From: fabrizio g. <fg...@us...> - 2005-01-06 10:10:40
|
Update of /cvsroot/jtidy/jtidy/src/test/org/w3c/tidy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26013/src/test/org/w3c/tidy Modified Files: TidyTestCase.java Log Message: use assertEquals when a comparison fail, more IDE-friendly Index: TidyTestCase.java =================================================================== RCS file: /cvsroot/jtidy/jtidy/src/test/org/w3c/tidy/TidyTestCase.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- TidyTestCase.java 18 Sep 2004 13:26:35 -0000 1.26 +++ TidyTestCase.java 6 Jan 2005 10:10:31 -0000 1.27 @@ -149,7 +149,7 @@ { super.setUp(); - //creates a new Tidy + // creates a new Tidy this.tidy = new Tidy(); } @@ -321,7 +321,7 @@ */ protected Document parseDomTest(String fileName) throws Exception { - //creates a new Tidy + // creates a new Tidy setUpTidy(fileName); // input file @@ -505,15 +505,7 @@ if ((tidyLine != null) || (testLine != null)) { - fail("Wrong output, file comparison failed at line [" - + (i - 1) - + "]:\n" - + "[tidy][" - + tidyLine - + "]\n" - + "[test][" - + testLine - + "]"); + assertEquals("Wrong output, file comparison failed at line [" + (i - 1) + "]", testLine, tidyLine); } return; } |
![http://www.spreadfirefox.com/community/images/affiliates/Buttons/88x31/take.gif"/></a>](http://www.spreadfirefox.com/community/images/affiliates/Buttons/88x31/take.gif"/></a>){kind=link}