Author: alexsmirnov Date: 2007-07-09 14:34:57 -0400 (Mon, 09 Jul 2007) New Revision: 305 Added: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ConfigurableFilter.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ConfigurableXMLFilter.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ParserConfig.java Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/Filter.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/AjaxContext.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/FilterServletResponseWrapper.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/HtmlParser.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/Log4JConfigurator.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoFilter.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ServletStreamWriter.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/TidyFilter.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/XMLResponseWriterState.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekkoParser.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekkoXMLFilter.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyParser.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyXMLFilter.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/ByteBuffer.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/CharBuffer.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferInputStream.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferOutputStream.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferReader.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferWriter.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/Test.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/AnyCharState.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BlankState.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedAnyCharState.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedBlankState.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedSingleCharState.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedStringState.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/FastHtmlParser.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/KeywordCharState.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/KeywordState.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/ParserState.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/ParsingContext.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/ParsingStateManager.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/SingleCharState.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/StringState.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/XmlIdentifierState.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Anchor.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttVal.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttrCheck.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttrCheckImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Attribute.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttributeTable.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Clean.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Configuration.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMAttrImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMAttrMapImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMCDATASectionImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMCharacterDataImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMCommentImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentTypeImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMElementImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMNodeImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMNodeListByTagNameImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMNodeListImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMProcessingInstructionImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMTextImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Dict.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/EncodingNameMapper.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/EncodingUtils.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Entity.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/EntityTable.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/IStack.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Lexer.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Node.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Out.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/OutFactory.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/OutImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/OutJavaImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/PPrint.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ParseProperty.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ParsePropertyImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Parser.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ParserImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Report.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamIn.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamInFactory.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamInImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamInJavaImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Style.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StyleProp.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TagCheck.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TagCheckImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TagTable.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Tidy.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyBeanInfo.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyLexerListener.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyMessage.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyMessageListener.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyUtils.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ValidUTF8Sequence.java Log: append configurable XML filter from 1.1.2-SNAPSHOT branch Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/Filter.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/Filter.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/Filter.java 2007-07-09 18:34:57 UTC (rev 305) @@ -21,6 +21,7 @@ package org.ajax4jsf; +import org.ajax4jsf.framework.ajax.xmlfilter.ConfigurableFilter; import org.ajax4jsf.framework.ajax.xmlfilter.TidyFilter; /** @@ -29,6 +30,6 @@ * @version $Revision: 1.1 $ $Date: 2006/04/28 02:05:59 $ * */ -public class Filter extends TidyFilter { +public class Filter extends ConfigurableFilter { } Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/AjaxContext.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/AjaxContext.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/AjaxContext.java 2007-07-09 18:34:57 UTC (rev 305) @@ -416,6 +416,9 @@ } // Mark as processed. requestMap.put(RESOURCES_PROCESSED, Boolean.TRUE); + // Save viewId for a parser selection + requestMap.put( + AjaxViewHandler.VIEW_ID_KEY,root.getViewId()); } } Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java 2007-07-09 18:34:57 UTC (rev 305) @@ -57,6 +57,8 @@ private static final String REDIRECTED = "org.ajax4jsf.view.REDIRECTED"; + public static final String VIEW_ID_KEY = "org.ajax4jsf.VIEW_ID"; + /** * @param parent */ Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -34,6 +34,7 @@ import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.ServletRequest; +import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -45,304 +46,384 @@ import org.apache.commons.logging.LogFactory; public abstract class BaseXMLFilter { - private static final Log log = LogFactory.getLog(BaseXMLFilter.class); - public static final String RESPONSE_WRAPPER_ATTRIBUTE = "com.exade.vcp.Filter.ResponseWrapper"; + private static final Log log = LogFactory.getLog(BaseXMLFilter.class); - private String mimetype = "text/xml"; - private String publicid = "-//W3C//DTD XHTML 1.0 Transitional//EN"; - private String systemid = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"; - private String namespace = "http://www.w3.org/1999/xhtml"; + public static final String RESPONSE_WRAPPER_ATTRIBUTE = "com.exade.vcp.Filter.ResponseWrapper"; - private static final String MIME_TYPE_PARAMETER = "mime-type"; - private static final String PUBLICID_PARAMETER = "publicid"; - private static final String SYSTEMID_PARAMETER = "systemid"; - private static final String NAMESPACE_PARAMETER = "namespace"; - - private boolean forcexml = true; - private static final String FORCEXML_PARAMETER = "forceparser"; - public BaseFilter filter; - - public void setFilter(BaseFilter filter) { - this.filter = filter; - } + private String mimetype = "text/xml"; - public void init(FilterConfig config) throws ServletException { - if("false".equalsIgnoreCase(config.getInitParameter(FORCEXML_PARAMETER))){ - this.forcexml = false; - } - if("true".equalsIgnoreCase(config.getInitParameter(FORCEXML_PARAMETER))){ - this.forcexml = true; - } - setMimetype((String) nz(config.getInitParameter(MIME_TYPE_PARAMETER),"text/xml")); - setPublicid((String) nz(config.getInitParameter(PUBLICID_PARAMETER),getPublicid())); - setSystemid((String) nz(config.getInitParameter(SYSTEMID_PARAMETER),getSystemid())); - setNamespace((String) nz(config.getInitParameter(NAMESPACE_PARAMETER),getNamespace())); - } + private String publicid = "-//W3C//DTD XHTML 1.0 Transitional//EN"; - /** - * Perform filter chain with xml parsing and transformation. Subclasses must implement - * concrete HTML to XML parsing, nesseasary transformations and serialization. - * @param chain - * @param httpServletRequest - * @param httpServletResponse - * @throws ServletException - * @throws IOException - */ - protected void doXmlFilter(FilterChain chain, HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException { - FilterServletResponseWrapper servletResponseWrapper = getWrapper(response); - // HACK - to avoid MyFaces <f:view> incompabilites and bypass intermediaty filters - // in chain, self-rendered region write directly to wrapper stored in request-scope attribute. - request.setAttribute(RESPONSE_WRAPPER_ATTRIBUTE,servletResponseWrapper); - chain.doFilter(request, servletResponseWrapper); - // TidyParser parser = getParser(servletResponseWrapper.getCharacterEncoding()); - HtmlParser parser = null; - // setup response - // Redirect in AJAX request - convert to special response recognized by client. - String redirectLocation = servletResponseWrapper.getRedirectLocation(); - String characterEncoding = servletResponseWrapper.getCharacterEncoding(); - Writer output; - if(null != redirectLocation){ - if (isAjaxRequest(request)) { - // Special handling of redirect - client-side script must - // Check for response and perform redirect by window.location - if(log.isDebugEnabled()){ - log.debug("Create AJAX redirect response to url: "+redirectLocation); - } - response.reset(); - // Copy response headers - Map headers = servletResponseWrapper.getHeaders(); - for (Iterator iter = headers.entrySet().iterator(); iter.hasNext();) { - Map.Entry header = (Map.Entry) iter.next(); - response.setHeader((String)header.getKey(), (String)header.getValue()); - } - response.setHeader(AjaxContainerRenderer.AJAX_FLAG_HEADER,"redirect"); - // Not caching AJAX request - response.setHeader("Cache-Control", - "no-cache, must-revalidate, max_age=0, no-store"); - response.setHeader("Expires", "0"); - response.setHeader("Pragma", "no-cache"); - response.setContentType(getMimetype() + ";charset=UTF-8"); - response.setHeader(AjaxContainerRenderer.AJAX_LOCATION_HEADER,redirectLocation); - output = createResponseWriter(response, "UTF-8"); - // For buggy XmlHttpRequest realisations repeat headers in <meta> - output.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + - "<html xmlns=\"http://www.w3.org/1999/xhtml\"><head>"+ - "<meta name=\""+AjaxContainerRenderer.AJAX_FLAG_HEADER+"\" content=\"redirect\" />"+ - "<meta name=\""+AjaxContainerRenderer.AJAX_LOCATION_HEADER+"\" content=\""+redirectLocation+"\" />"+ - "</head></html>" - ); - output.flush(); - response.flushBuffer(); - } else { - response.sendRedirect(redirectLocation); - } - return; - } else if ("true".equals(servletResponseWrapper.getHeaders().get(AjaxContainerRenderer.AJAX_FLAG_HEADER))) { - if(log.isDebugEnabled()){ - log.debug("Process response to well-formed XML for AJAX XMLHttpRequest parser"); - } - // Not caching AJAX request - response.setHeader("Cache-Control", - "no-cache, must-revalidate, max_age=0, no-store"); - response.setHeader("Expires", "0"); - response.setHeader("Pragma", "no-cache"); - //response.setCharacterEncoding(servletResponseWrapper - //.getCharacterEncoding()); // JSContentHandler.DEFAULT_ENCODING); - // Set the content-type. For AJAX responses default encoding - UTF8. - // TODO - for null encoding, setup only Output encoding for filter ? - String outputEncoding = "UTF-8"; - String contentType = getMimetype() + ";charset=" + outputEncoding; - response.setContentType(contentType); - parser = getParser(getMimetype(),true); - if(null == parser){ - throw new ServletException(Messages.getMessage(Messages.PARSER_NOT_INSTANTIATED_ERROR, contentType)); - } - output = createResponseWriter(response, outputEncoding); - parser.setDoctype(getPublicid()); - parser.setInputEncoding(characterEncoding); - parser.setOutputEncoding(outputEncoding); - parser.setViewState((String) request.getAttribute(AjaxViewHandler.SERIALIZED_STATE_KEY)); - } else { - // setup conversion reules for output contentType, send directly if content not - // supported by tidy. - String contentType = servletResponseWrapper.getContentType(); - if(log.isDebugEnabled()){ - log.debug("create HTML/XML parser for content type: "+contentType); - } -// if(contentType == null){ -// contentType = request.getContentType(); -// } - if(contentType != null){ - if (contentType.indexOf("charset")<0 && null != characterEncoding) { - contentType += ";charset=" + characterEncoding; - } - parser = getParser(contentType,false); - response.setContentType(contentType); - } - // null or unsupported content type - if(null == parser) { - if(log.isDebugEnabled()){ - log.debug("Parser not have support for the such content type, send response as-is"); - } - try { - if (servletResponseWrapper.isUseWriter()) { - output = createResponseWriter(response, characterEncoding); - servletResponseWrapper.sendContent(output); - } else if (servletResponseWrapper.isUseStream()) { - ServletOutputStream out = response.getOutputStream(); - servletResponseWrapper.sendContent(out); - } - } finally { - // reuseWrapper(servletResponseWrapper); - } - return; - } - output = createResponseWriter(response, characterEncoding); + private String systemid = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"; - parser.setInputEncoding(characterEncoding); - parser.setOutputEncoding(characterEncoding); - } - - try { - // Setup scripts and styles - parser.setScripts((Set) request.getAttribute(AjaxContext.SCRIPTS_PARAMETER)); - parser.setStyles((Set) request.getAttribute(AjaxContext.STYLES_PARAMETER)); - // Process parsing. - long startTimeMills =System.currentTimeMillis(); - servletResponseWrapper.parseContent(output,parser); - if (log.isDebugEnabled()) { - startTimeMills = System.currentTimeMillis()-startTimeMills; - log.debug(Messages.getMessage(Messages.PARSING_TIME_INFO, "" + startTimeMills)); - } - } catch (Exception e) { - throw new ServletException(Messages.getMessage(Messages.JTIDY_PARSING_ERROR), e); - } finally { - reuseParser(parser); - } - } + private String namespace = "http://www.w3.org/1999/xhtml"; - /** - * @param response - * @return - * @throws ServletException - */ - protected FilterServletResponseWrapper getWrapper(HttpServletResponse response) throws ServletException{ - return new FilterServletResponseWrapper(response); - } - - /** - * @param request - * @return - */ - protected boolean isAjaxRequest(ServletRequest request) { - try { - return null != request - .getParameter(AjaxContainerRenderer.AJAX_PARAMETER_NAME); - } catch (Exception e) { - // OCJ 10 - throw exception for static resources. - return false; - } - } + private static final String MIME_TYPE_PARAMETER = "mime-type"; - /** - * @param response - * @param characterEncoding - * @return - * @throws IOException - * @throws UnsupportedEncodingException - */ - private Writer createResponseWriter(final HttpServletResponse response, String characterEncoding) throws IOException, UnsupportedEncodingException { - Writer output; - try { - output = response.getWriter(); - } catch (IllegalStateException e) { - if (null != characterEncoding) { - output = new OutputStreamWriter(response.getOutputStream(), - characterEncoding); - } else { - output = new OutputStreamWriter(response.getOutputStream()); - } - } - return output; - } + private static final String PUBLICID_PARAMETER = "publicid"; - protected abstract void reuseParser(HtmlParser parser); + private static final String SYSTEMID_PARAMETER = "systemid"; - protected abstract HtmlParser getParser(String mimetype, boolean isAjax); + private static final String NAMESPACE_PARAMETER = "namespace"; - /** - * @param publicid The publicid to set. - */ - protected void setPublicid(String publicid) { - this.publicid = publicid; - } + private boolean forcexml = false; + - /** - * @return Returns the publicid. - */ - public String getPublicid() { - return publicid; - } + private static final String FORCEXML_PARAMETER = "forceparser"; - /** - * @param systemid The systemid to set. - */ - protected void setSystemid(String systemid) { - this.systemid = systemid; - } + private static final String INIT_PARAMETER_PREFIX = "org.ajax4jsf.xmlfilter."; - /** - * @return Returns the systemid. - */ - public String getSystemid() { - return systemid; + public BaseFilter filter; + + public void setFilter(BaseFilter filter) { + this.filter = filter; + } + + public void init(FilterConfig config) throws ServletException { + if (log.isDebugEnabled()) { + log.debug("init XML filter service with class " + + this.getClass().getName()); } + String forceXmlParameter = config + .getInitParameter(FORCEXML_PARAMETER); + setupForceXml(forceXmlParameter); + forceXmlParameter = config.getServletContext().getInitParameter(INIT_PARAMETER_PREFIX+FORCEXML_PARAMETER); + setMimetype((String) nz(config.getInitParameter(MIME_TYPE_PARAMETER), + "text/xml")); + setPublicid((String) nz(config.getInitParameter(PUBLICID_PARAMETER), + getPublicid())); + setSystemid((String) nz(config.getInitParameter(SYSTEMID_PARAMETER), + getSystemid())); + setNamespace((String) nz(config.getInitParameter(NAMESPACE_PARAMETER), + getNamespace())); + } - /** - * @param namespace The namespace to set. - */ - protected void setNamespace(String namespace) { - this.namespace = namespace; + /** + * @param forceXmlParameter + */ + private void setupForceXml(String forceXmlParameter) { + if ("false".equalsIgnoreCase(forceXmlParameter)) { + this.forcexml = false; } + if ("true" + .equalsIgnoreCase(forceXmlParameter)) { + this.forcexml = true; + } + } - /** - * @return Returns the namespace. - */ - public String getNamespace() { - return namespace; + /** + * Perform filter chain with xml parsing and transformation. Subclasses + * must implement concrete HTML to XML parsing, nesseasary + * transformations and serialization. + * + * @param chain + * @param httpServletRequest + * @param httpServletResponse + * @throws ServletException + * @throws IOException + */ + protected void doXmlFilter(FilterChain chain, HttpServletRequest request, + final HttpServletResponse response) throws IOException, + ServletException { + if (log.isDebugEnabled()) { + log.debug("XML filter service start processing request"); } + FilterServletResponseWrapper servletResponseWrapper = getWrapper(response); + // HACK - to avoid MyFaces <f:view> incompabilites and bypass + // intermediaty filters + // in chain, self-rendered region write directly to wrapper stored in + // request-scope attribute. + request + .setAttribute(RESPONSE_WRAPPER_ATTRIBUTE, + servletResponseWrapper); + chain.doFilter(request, servletResponseWrapper); + String viewId = (String) request.getAttribute(AjaxViewHandler.VIEW_ID_KEY); + HtmlParser parser = null; + // setup response + // Redirect in AJAX request - convert to special response recognized by + // client. + String redirectLocation = servletResponseWrapper.getRedirectLocation(); + String characterEncoding = servletResponseWrapper + .getCharacterEncoding(); + Writer output; + if (null != redirectLocation) { + if (isAjaxRequest(request)) { + // Special handling of redirect - client-side script must + // Check for response and perform redirect by window.location + if (log.isDebugEnabled()) { + log.debug("Create AJAX redirect response to url: " + + redirectLocation); + } + response.reset(); + // Keep cookies. + for (Iterator iter = servletResponseWrapper.getCookies().iterator(); iter.hasNext();) { + Cookie cookie = (Cookie) iter.next(); + response.addCookie(cookie); + } + // Copy response headers + Map headers = servletResponseWrapper.getHeaders(); + for (Iterator iter = headers.entrySet().iterator(); iter + .hasNext();) { + Map.Entry header = (Map.Entry) iter.next(); + response.setHeader((String) header.getKey(), + (String) header.getValue()); + } + response.setHeader(AjaxContainerRenderer.AJAX_FLAG_HEADER, + "redirect"); + // Not caching AJAX request + response.setHeader("Cache-Control", + "no-cache, must-revalidate, max_age=0, no-store"); + response.setHeader("Expires", "0"); + response.setHeader("Pragma", "no-cache"); + response.setContentType(getMimetype() + ";charset=UTF-8"); + response.setHeader(AjaxContainerRenderer.AJAX_LOCATION_HEADER, + redirectLocation); + output = createResponseWriter(response, "UTF-8"); + // For buggy XmlHttpRequest realisations repeat headers in + // <meta> + output.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + + "<html xmlns=\"http://www.w3.org/1999/xhtml\"><head>" + + "<meta name=\"" + + AjaxContainerRenderer.AJAX_FLAG_HEADER + + "\" content=\"redirect\" />" + "<meta name=\"" + + AjaxContainerRenderer.AJAX_LOCATION_HEADER + + "\" content=\"" + redirectLocation + "\" />" + + "</head></html>"); + output.flush(); + response.flushBuffer(); + } else { + response.sendRedirect(redirectLocation); + } + return; + } else if ("true".equals(servletResponseWrapper.getHeaders().get( + AjaxContainerRenderer.AJAX_FLAG_HEADER))) { + if (log.isDebugEnabled()) { + log + .debug("Process response to well-formed XML for AJAX XMLHttpRequest parser"); + } + // Not caching AJAX request + response.setHeader("Cache-Control", + "no-cache, must-revalidate, max_age=0, no-store"); + response.setHeader("Expires", "0"); + response.setHeader("Pragma", "no-cache"); + // response.setCharacterEncoding(servletResponseWrapper + // .getCharacterEncoding()); // + // JSContentHandler.DEFAULT_ENCODING); + // Set the content-type. For AJAX responses default encoding - + // UTF8. + // TODO - for null encoding, setup only Output encoding for + // filter ? + String outputEncoding = "UTF-8"; + String contentType = getMimetype() + ";charset=" + outputEncoding; + response.setContentType(contentType); + parser = getParser(getMimetype(), true, viewId); + if (null == parser) { + throw new ServletException(Messages.getMessage( + Messages.PARSER_NOT_INSTANTIATED_ERROR, contentType)); + } + output = createResponseWriter(response, outputEncoding); + parser.setDoctype(getPublicid()); + parser.setInputEncoding(characterEncoding); + parser.setOutputEncoding(outputEncoding); + parser.setViewState((String) request + .getAttribute(AjaxViewHandler.SERIALIZED_STATE_KEY)); + } else { + // setup conversion reules for output contentType, send directly + // if content not + // supported by tidy. + String contentType = servletResponseWrapper.getContentType(); + if (log.isDebugEnabled()) { + log.debug("create HTML/XML parser for content type: " + + contentType); + } + // if(contentType == null){ + // contentType = request.getContentType(); + // } + if (contentType != null) { + if (contentType.indexOf("charset") < 0 + && null != characterEncoding) { + contentType += ";charset=" + characterEncoding; + } + parser = getParser(contentType, false, viewId); + response.setContentType(contentType); + } + // null or unsupported content type + if (null == parser) { + if (log.isDebugEnabled()) { + log + .debug("Parser not have support for the such content type, send response as-is"); + } + try { + if (servletResponseWrapper.isUseWriter()) { + output = createResponseWriter(response, + characterEncoding); + servletResponseWrapper.sendContent(output); + } else if (servletResponseWrapper.isUseStream()) { + ServletOutputStream out = response.getOutputStream(); + servletResponseWrapper.sendContent(out); + } + } finally { + // reuseWrapper(servletResponseWrapper); + } + return; + } + output = createResponseWriter(response, characterEncoding); - /** - * @param mimetype The mimetype to set. - */ - protected void setMimetype(String mimetype) { - this.mimetype = mimetype; + parser.setInputEncoding(characterEncoding); + parser.setOutputEncoding(characterEncoding); } - /** - * @return Returns the mimetype. - */ - protected String getMimetype() { - return mimetype; + try { + // Setup scripts and styles + parser.setScripts((Set) request + .getAttribute(AjaxContext.SCRIPTS_PARAMETER)); + parser.setStyles((Set) request + .getAttribute(AjaxContext.STYLES_PARAMETER)); + // Process parsing. + long startTimeMills = System.currentTimeMillis(); + servletResponseWrapper.parseContent(output, parser); + if (log.isDebugEnabled()) { + startTimeMills = System.currentTimeMillis() - startTimeMills; + log.debug(Messages.getMessage(Messages.PARSING_TIME_INFO, "" + + startTimeMills)); + } + } catch (Exception e) { + throw new ServletException(Messages + .getMessage(Messages.JTIDY_PARSING_ERROR), e); + } finally { + reuseParser(parser); } + } - /** - * @return Returns the forcexml. - */ - public boolean isForcexml() { - return this.forcexml; + /** + * @param response + * @return + * @throws ServletException + */ + protected FilterServletResponseWrapper getWrapper( + HttpServletResponse response) throws ServletException { + return new FilterServletResponseWrapper(response); + } + + /** + * @param request + * @return + */ + protected boolean isAjaxRequest(ServletRequest request) { + try { + return null != request + .getParameter(AjaxContainerRenderer.AJAX_PARAMETER_NAME); + } catch (Exception e) { + // OCJ 10 - throw exception for static resources. + return false; } + } - /** - * @param forcexml The forcexml to set. - */ - protected void setForcexml(boolean forcexml) { - this.forcexml = forcexml; + /** + * @param response + * @param characterEncoding + * @return + * @throws IOException + * @throws UnsupportedEncodingException + */ + private Writer createResponseWriter(final HttpServletResponse response, + String characterEncoding) throws IOException, + UnsupportedEncodingException { + Writer output; + try { + output = response.getWriter(); + } catch (IllegalStateException e) { + if (null != characterEncoding) { + output = new OutputStreamWriter(response.getOutputStream(), + characterEncoding); + } else { + output = new OutputStreamWriter(response.getOutputStream()); + } } + return output; + } + protected abstract void reuseParser(HtmlParser parser); - private Object nz(Object param, Object def) { - return param != null?param:def; - } + protected abstract HtmlParser getParser(String mimetype, boolean isAjax, String viewId); + /** + * @param publicid + * The publicid to set. + */ + protected void setPublicid(String publicid) { + this.publicid = publicid; + } + + /** + * @return Returns the publicid. + */ + public String getPublicid() { + return publicid; + } + + /** + * @param systemid + * The systemid to set. + */ + protected void setSystemid(String systemid) { + this.systemid = systemid; + } + + /** + * @return Returns the systemid. + */ + public String getSystemid() { + return systemid; + } + + /** + * @param namespace + * The namespace to set. + */ + protected void setNamespace(String namespace) { + this.namespace = namespace; + } + + /** + * @return Returns the namespace. + */ + public String getNamespace() { + return namespace; + } + + /** + * @param mimetype + * The mimetype to set. + */ + protected void setMimetype(String mimetype) { + this.mimetype = mimetype; + } + + /** + * @return Returns the mimetype. + */ + protected String getMimetype() { + return mimetype; + } + + /** + * @return Returns the forcexml. + */ + public boolean isForcexml() { + return this.forcexml; + } + + /** + * @param forcexml + * The forcexml to set. + */ + protected void setForcexml(boolean forcexml) { + this.forcexml = forcexml; + } + + private Object nz(Object param, Object def) { + return param != null ? param : def; + } + } Added: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ConfigurableFilter.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ConfigurableFilter.java (rev 0) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ConfigurableFilter.java 2007-07-09 18:34:57 UTC (rev 305) @@ -0,0 +1,20 @@ +/** + * + */ +package org.ajax4jsf.framework.ajax.xmlfilter; + +/** + * @author asmirnov + * + */ +public class ConfigurableFilter extends BaseFilter { + + /** + * + */ + public ConfigurableFilter() { + xmlFilter = new ConfigurableXMLFilter(); + xmlFilter.setFilter(this); + } + +} Added: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ConfigurableXMLFilter.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ConfigurableXMLFilter.java (rev 0) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ConfigurableXMLFilter.java 2007-07-09 18:34:57 UTC (rev 305) @@ -0,0 +1,238 @@ +/** + * + */ +package org.ajax4jsf.framework.ajax.xmlfilter; + +import java.io.IOException; +import java.io.InputStream; +import java.util.EmptyStackException; +import java.util.Properties; +import java.util.regex.PatternSyntaxException; + +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; + +import org.ajax4jsf.framework.ajax.xmlfilter.nekko.NekkoParser; +import org.ajax4jsf.framework.ajax.xmlfilter.tidy.TidyParser; +import org.ajax4jsf.framework.ajax.xmlfilter.tidy.TidyXMLFilter; +import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.io.parser.FastHtmlParser; +import org.apache.commons.collections.ArrayStack; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * @author asmirnov + * + */ +public class ConfigurableXMLFilter extends BaseXMLFilter { + + private static final Log log = LogFactory + .getLog(ConfigurableXMLFilter.class); + + private static final String PARSERS_LIST_PARAMETER = "org.ajax4jsf.xmlparsers"; + + private static final String VIEW_ID_PATTERN_PARAMETER = "org.ajax4jsf.xmlparser."; + + /** + * map of the parsers names and viewId patterns for all parser type. + */ + private ParserConfig parsers = new TidyParserConfig(); + + // private ParserConfig passParserConfig = new PassParserConfig(); + + public void init(FilterConfig config) throws ServletException { + super.init(config); + ServletContext servletContext = config.getServletContext(); + String parsersParameter = servletContext + .getInitParameter(PARSERS_LIST_PARAMETER); + if (null != parsersParameter) { + configureParsers(servletContext, parsersParameter); + } + } + + /** + * @param servletContext + * @param parsersParameter + * @throws ServletException + */ + public void configureParsers(ServletContext servletContext, + String parsersParameter) throws ServletException { + String[] parsersNames = parsersParameter.split("\\s*,\\s*"); + for (int i = parsersNames.length - 1; i >= 0; i--) { + String parserName = parsersNames[i]; + ParserConfig parserConfig; + if ("TIDY".equals(parserName)) { + parserConfig = new TidyParserConfig(); + } else if ("NEKO".equals(parserName)) { + parserConfig = new NekoParserConfig(); + } else if ("PASS".equals(parserName)) { + parserConfig = new PassParserConfig(); + } else { + throw new ServletException( + "Unknown XML parser type in config parameter " + + parserName); + } + parserConfig.setNext(parsers); + if (null != servletContext) { + try { + String parserViewPattern = servletContext + .getInitParameter(VIEW_ID_PATTERN_PARAMETER + + parserName); + parserConfig.setPatterns(parserViewPattern); + + } catch (PatternSyntaxException e) { + throw new ServletException("Invalid pattern for a parser " + + parserName + " :" + e.getMessage()); + } + } + parsers = parserConfig; + } + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.framework.ajax.xmlfilter.BaseXMLFilter#getParser(java.lang.String, + * boolean, java.lang.String) + */ + protected HtmlParser getParser(String mimetype, boolean isAjax, + String viewId) { + HtmlParser parser = null; + if (isAjax || isForcexml()) { + parser = parsers.getParser(viewId, mimetype); + } else if (mimetype.startsWith("text/html") + || mimetype.startsWith("application/xhtml+xml")) { + parser = new FastHtmlParser(); + } + return parser; + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.framework.ajax.xmlfilter.BaseXMLFilter#reuseParser(org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser) + */ + protected void reuseParser(HtmlParser parser) { + parsers.reuseParser(parser); + + } + + private static final int STACK_SIZE = 100; + + private ArrayStack _xhtmlParsersPool = new ArrayStack(STACK_SIZE); + + private class NekoParserConfig extends ParserConfig { + + protected HtmlParser createParser(String mime) { + NekkoParser parser; + try { + synchronized (_xhtmlParsersPool) { + parser = (NekkoParser) _xhtmlParsersPool.pop(); + } + } catch (EmptyStackException e) { + parser = new NekkoParser(); + parser.setPublicId(getPublicid()); + parser.setSystemid(getSystemid()); + parser.setNamespace(getNamespace()); + // If tidy not handle all requests, disable reorganising + // of html + // parser.setMoveElements(isForcexml()); + } + // TODO - set header scripts/styles filter. + return parser; + } + + boolean storeParser(HtmlParser parser) { + if (null != parser && parser instanceof NekkoParser) { + synchronized (_xhtmlParsersPool) { + if (_xhtmlParsersPool.size() < STACK_SIZE) { + ((NekkoParser) parser).reset(); + _xhtmlParsersPool.push(parser); + } + + } + return true; + } + return false; + } + } + + private class TidyParserConfig extends ParserConfig { + + protected HtmlParser createParser(String mime) { + // TODO Auto-generated method stub + TidyParser tidyParser = new TidyParser(getTidyProperties()); + tidyParser.setMoveElements(isForcexml()); + tidyParser.setMime(mime); + return tidyParser; + } + + } + + private class PassParserConfig extends ParserConfig { + + protected HtmlParser createParser(String mime) { + return new FastHtmlParser(); + } + + } + + private Properties _tidyProperties; + + private Properties getTidyProperties() { + if (null == _tidyProperties) { + _tidyProperties = new Properties(); + InputStream defaultprops = null; + InputStream props = null; + try { + defaultprops = TidyParser.class + .getResourceAsStream("tidy.properties"); + if (null != defaultprops) { + _tidyProperties.load(defaultprops); + if (log.isDebugEnabled()) { + log.debug("default tidy parser properties loaded"); + } + } else if (log.isDebugEnabled()) { + log.debug("No default tidy parser properties found"); + } + + // Second part - user-defined properties. + props = Thread.currentThread().getContextClassLoader() + .getResourceAsStream("tidy.properties"); + if (null != props) { + _tidyProperties.load(props); + if (log.isDebugEnabled()) { + log.debug("application-specific tidy parser properties loaded"); + } + } + } catch (IOException e) { + // TODO Auto-generated catch block + log.warn(Messages + .getMessage(Messages.READING_TIDY_PROPERTIES_ERROR), e); + } finally { + if (null != props) { + try { + props.close(); + } catch (IOException e) { + // can be ignored + } + } + if (null != defaultprops) { + try { + defaultprops.close(); + } catch (IOException e) { + // can be ignored + } + } + } + } + return _tidyProperties; + } + + public ParserConfig getParsers() { + return parsers; + } + +} Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/FilterServletResponseWrapper.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/FilterServletResponseWrapper.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/FilterServletResponseWrapper.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -61,11 +61,15 @@ import java.io.Reader; import java.io.UnsupportedEncodingException; import java.io.Writer; +import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; +import java.util.List; import java.util.Locale; import java.util.Map; import javax.servlet.ServletOutputStream; +import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; @@ -81,7 +85,7 @@ /** * Base wrapper save JSF page response, for parse to XML with different parsers * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.21 $ $Date: 2006/08/28 19:21:43 $ + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:58:17 $ * */ public class FilterServletResponseWrapper extends HttpServletResponseWrapper { @@ -112,6 +116,8 @@ private String redirectLocation = null; private boolean useNullStream = false; + + private List cookies = new ArrayList(); public FilterServletResponseWrapper(HttpServletResponse response) { super(response); @@ -635,4 +641,13 @@ + public void addCookie(Cookie cookie) { + cookies.add(cookie); + super.addCookie(cookie); + } + + public Collection getCookies() { + return cookies; + } + } Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/HtmlParser.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/HtmlParser.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/HtmlParser.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -66,4 +66,6 @@ */ public abstract void setViewState(String viewState); + public abstract boolean setMime(String mimeType); + } \ No newline at end of file Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/Log4JConfigurator.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/Log4JConfigurator.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/Log4JConfigurator.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -30,8 +30,8 @@ import org.apache.log4j.xml.DOMConfigurator; /** - * @author shura (latest modification by $Author: slava_kabanovich $) - * @version $Revision: 1.2 $ $Date: 2006/07/11 15:54:51 $ + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:58:18 $ * */ class Log4JConfigurator { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoFilter.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoFilter.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoFilter.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Added: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ParserConfig.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ParserConfig.java (rev 0) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ParserConfig.java 2007-07-09 18:34:57 UTC (rev 305) @@ -0,0 +1,67 @@ +/** + * + */ +package org.ajax4jsf.framework.ajax.xmlfilter; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +abstract class ParserConfig { + + private static final Pattern[] ALL_VIEWS_PATTERN = { Pattern.compile(".*") }; + + private static final Pattern SEPARATOR_PATTERN = Pattern.compile("\\s*,\\s*"); + + private Pattern[] patterns = ALL_VIEWS_PATTERN; + + private ParserConfig next; + + protected abstract HtmlParser createParser(String mimetype); + + boolean storeParser(HtmlParser parser) { + return false; + } + + HtmlParser getParser(String viewId, String mimetype) { + HtmlParser result = null; + for (int i = 0; i < patterns.length && null == result; i++) { + Matcher matcher = patterns[i].matcher(viewId); + if (matcher.matches()) { + result = createParser(mimetype); + } + } + if (null == result && null != next) { + result = next.getParser(viewId, mimetype); + } + return result; + } + + public void reuseParser(HtmlParser parser) { + if (!storeParser(parser) && null != next) { + next.reuseParser(parser); + } + } + + public ParserConfig getNext() { + return next; + } + + public void setNext(ParserConfig next) { + this.next = next; + } + + public void setPatterns(String patternsString) { + if (null != patternsString) { + String[] split = SEPARATOR_PATTERN.split(patternsString); + patterns = new Pattern[split.length]; + for (int i = 0; i < split.length; i++) { + patterns[i]=Pattern.compile(split[i].trim()); + } + } + } + + public Pattern[] getPatterns() { + return patterns; + } + +} \ No newline at end of file Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ServletStreamWriter.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ServletStreamWriter.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ServletStreamWriter.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/TidyFilter.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/TidyFilter.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/TidyFilter.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -29,7 +29,7 @@ /** * Convert Html Output to XML using Jtidy. * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.10 $ $Date: 2006/07/05 08:53:36 $ + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:58:20 $ */ public class TidyFilter extends BaseFilter { static final Log log = LogFactory.getLog(TidyFilter.class); Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/XMLResponseWriterState.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/XMLResponseWriterState.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/XMLResponseWriterState.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -38,7 +38,7 @@ /** * @throws java.io.IOException */ - private static String ILLEGAL_METOD_STATE = Messages.getMessage(Messages.ILLEGAL_METHOD_STATE); + private static final String ILLEGAL_METOD_STATE = Messages.getMessage(Messages.ILLEGAL_METHOD_STATE); void endDocument() throws IOException { throw new IOException(ILLEGAL_METOD_STATE); Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekkoParser.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekkoParser.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekkoParser.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -108,6 +108,7 @@ */ public NekkoParser() { _parser=new HtmlSAXParser(getHtmlConfig()); +// Properties properties = OutputPropertiesFactory.getDefaultMethodProperties(Method.XHTML); Properties properties = OutputPropertiesFactory.getDefaultMethodProperties(Method.XML); // properties.put("encoding",_encoding); _serializer = SerializerFactory.getSerializer(properties); @@ -459,7 +460,7 @@ } - private class HtmlWriter extends Writer { + private static class HtmlWriter extends Writer { /** * @@ -641,4 +642,8 @@ _systemid = systemid; } + public boolean setMime(String mimeType) { + return false; + } + } Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekkoXMLFilter.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekkoXMLFilter.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekkoXMLFilter.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -36,7 +36,7 @@ public NekkoXMLFilter() {} - protected HtmlParser getParser(String mimetype, boolean isAjax) { + protected HtmlParser getParser(String mimetype, boolean isAjax, String viewId) { HtmlParser parser = null; if( isAjax ){ parser = getXmlParser(); Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyParser.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyParser.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyParser.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -46,7 +46,7 @@ /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.7 $ $Date: 2006/11/24 17:10:23 $ + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:59:17 $ * */ public class TidyParser implements TidyMessageListener, HtmlParser { @@ -243,7 +243,7 @@ * 'null' writer for discard errors - since processed in message listener * * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.7 $ $Date: 2006/11/24 17:10:23 $ + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:59:17 $ * */ private static class ErrorWriter extends Writer { @@ -322,7 +322,9 @@ // setup html output tidy.setXHTML(false); tidy.setXmlOut(false); - // TODO - auto doctype ? + if (log.isDebugEnabled()) { + log.debug("Print output as ordinary HTML"); + } return true; } } @@ -332,6 +334,9 @@ // setup xhtml output tidy.setXHTML(true); tidy.setXmlOut(false); + if (log.isDebugEnabled()) { + log.debug("Print output as XHTML"); + } return true; } } @@ -344,6 +349,9 @@ tidy.setXmlPi(true); tidy.setEscapeCdata(false); tidy.setNumEntities(true); + if (log.isDebugEnabled()) { + log.debug("Print output as XML"); + } return true; } } @@ -384,7 +392,7 @@ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setDoctype(java.lang.String) */ public void setDoctype(String doctype) { - tidy.setDocType(doctype); + tidy.setDocType("omit");//doctype); } /* Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyXMLFilter.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyXMLFilter.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyXMLFilter.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -25,13 +25,8 @@ import java.io.InputStream; import java.util.Properties; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; - import org.ajax4jsf.framework.ajax.xmlfilter.BaseXMLFilter; -import org.ajax4jsf.framework.ajax.xmlfilter.FilterServletResponseWrapper; import org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser; -import org.ajax4jsf.framework.ajax.xmlfilter.TidyServletResponseWrapper; import org.ajax4jsf.framework.util.message.Messages; import org.ajax4jsf.io.parser.FastHtmlParser; import org.apache.commons.collections.ArrayStack; @@ -71,7 +66,7 @@ * @param string Encodings for parser * @return */ - protected HtmlParser getParser(String mime, boolean isAjax) { + protected HtmlParser getParser(String mime, boolean isAjax, String viewId) { // For non-ajax, parse only html types ! if (isAjax || mime.startsWith("text/html") || mime.startsWith("application/xhtml+xml")) { if(isAjax || isForcexml()){ @@ -123,15 +118,6 @@ } return _tidyProperties; - } - - - /* (non-Javadoc) - * @see org.ajax4jsf.framework.ajax.xmlfilter.BaseFilter#getWrapper(javax.servlet.http.HttpServletResponse) - */ - protected FilterServletResponseWrapper getWrapper(HttpServletResponse response) throws ServletException { - // TODO Auto-generated method stub - return new TidyServletResponseWrapper(response); } } Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/ByteBuffer.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/ByteBuffer.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/ByteBuffer.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/CharBuffer.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/CharBuffer.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/CharBuffer.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferInputStream.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferInputStream.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferInputStream.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferOutputStream.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferOutputStream.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferOutputStream.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferReader.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferReader.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferReader.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferWriter.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferWriter.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/FastBufferWriter.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/Test.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/Test.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/Test.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/AnyCharState.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/AnyCharState.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/AnyCharState.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BlankState.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BlankState.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BlankState.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedAnyCharState.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedAnyCharState.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedAnyCharState.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedBlankState.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedBlankState.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedBlankState.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedSingleCharState.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedSingleCharState.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedSingleCharState.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedStringState.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedStringState.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/BufferedStringState.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/FastHtmlParser.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/FastHtmlParser.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/FastHtmlParser.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -56,6 +56,8 @@ private String viewState; + private String mimeType; + public void parse(Reader in, Writer out) throws IOException { boolean haveHtml = false; boolean haveHead = false; @@ -163,7 +165,7 @@ private void writeToHead(Writer out, boolean haveHtml, boolean haveHead) throws IOException { if (!haveHead && !haveHtml) { - out.write("<html>"); + out.write("<html xmlns=\"http://www.w3.org/1999/xhtml\">"); } if (!haveHead) { out.write("<head>"); @@ -252,4 +254,9 @@ this.viewState = viewState; } + + public boolean setMime(String mimeType) { + this.mimeType=mimeType; + return true; + } } Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/KeywordCharState.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/KeywordCharState.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/KeywordCharState.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/KeywordState.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/KeywordState.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/KeywordState.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/ParserState.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/ParserState.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/ParserState.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/ParsingContext.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/ParsingContext.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/ParsingContext.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/ParsingStateManager.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/ParsingStateManager.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/ParsingStateManager.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/SingleCharState.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/SingleCharState.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/SingleCharState.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/StringState.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/StringState.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/StringState.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/XmlIdentifierState.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/XmlIdentifierState.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/io/parser/XmlIdentifierState.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Anchor.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Anchor.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Anchor.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -78,7 +78,7 @@ * Anchor/node Linked list. * @author hoehrmann * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class Anchor { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttVal.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttVal.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttVal.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -82,7 +82,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class AttVal extends Object implements Cloneable { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttrCheck.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttrCheck.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttrCheck.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -79,7 +79,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public interface AttrCheck { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttrCheckImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttrCheckImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttrCheckImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -84,7 +84,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public final class AttrCheckImpl { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Attribute.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Attribute.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Attribute.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -79,7 +79,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class Attribute { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttributeTable.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttributeTable.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/AttributeTable.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -83,7 +83,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class AttributeTable { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Clean.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Clean.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Clean.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -101,7 +101,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class Clean { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Configuration.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Configuration.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Configuration.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -99,7 +99,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.4 $ ($Author: slava_kabanovich $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class Configuration implements Serializable { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMAttrImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMAttrImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMAttrImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -84,7 +84,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.2 $ ($Author: slava_kabanovich $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class DOMAttrImpl extends DOMNodeImpl implements org.w3c.dom.Attr, Cloneable { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMAttrMapImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMAttrMapImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMAttrMapImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -83,7 +83,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.2 $ ($Author: slava_kabanovich $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class DOMAttrMapImpl implements org.w3c.dom.NamedNodeMap { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMCDATASectionImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMCDATASectionImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMCDATASectionImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -79,7 +79,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class DOMCDATASectionImpl extends DOMTextImpl implements org.w3c.dom.CDATASection { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMCharacterDataImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMCharacterDataImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMCharacterDataImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -82,7 +82,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class DOMCharacterDataImpl extends DOMNodeImpl implements org.w3c.dom.CharacterData { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMCommentImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMCommentImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMCommentImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -79,7 +79,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class DOMCommentImpl extends DOMCharacterDataImpl implements org.w3c.dom.Comment { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -84,7 +84,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.3 $ ($Author: slava_kabanovich $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class DOMDocumentImpl extends DOMNodeImpl implements org.w3c.dom.Document { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentTypeImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentTypeImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentTypeImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -80,7 +80,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class DOMDocumentTypeImpl extends DOMNodeImpl implements org.w3c.dom.DocumentType { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMElementImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMElementImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMElementImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -85,7 +85,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.2 $ ($Author: slava_kabanovich $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class DOMElementImpl extends DOMNodeImpl implements org.w3c.dom.Element { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMNodeImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMNodeImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMNodeImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -85,7 +85,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.3 $ ($Author: slava_kabanovich $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class DOMNodeImpl implements org.w3c.dom.Node { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMNodeListByTagNameImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMNodeListByTagNameImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMNodeListByTagNameImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -81,7 +81,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class DOMNodeListByTagNameImpl implements org.w3c.dom.NodeList { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMNodeListImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMNodeListImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMNodeListImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -79,7 +79,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class DOMNodeListImpl implements org.w3c.dom.NodeList { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMProcessingInstructionImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMProcessingInstructionImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMProcessingInstructionImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -83,7 +83,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.2 $ ($Author: slava_kabanovich $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class DOMProcessingInstructionImpl extends DOMNodeImpl implements org.w3c.dom.ProcessingInstruction { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMTextImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMTextImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/DOMTextImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -84,7 +84,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.2 $ ($Author: slava_kabanovich $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class DOMTextImpl extends DOMCharacterDataImpl implements org.w3c.dom.Text { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Dict.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Dict.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Dict.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -82,7 +82,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class Dict { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/EncodingNameMapper.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/EncodingNameMapper.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/EncodingNameMapper.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -81,7 +81,7 @@ /** * Maps between Java and IANA character encoding names. Also handles encoding alias used in tidy c. * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) * @see http://www.iana.org/assignments/character-sets */ public abstract class EncodingNameMapper Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/EncodingUtils.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/EncodingUtils.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/EncodingUtils.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -76,7 +76,7 @@ /** * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public final class EncodingUtils { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Entity.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Entity.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Entity.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -79,7 +79,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class Entity { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/EntityTable.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/EntityTable.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/EntityTable.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -84,7 +84,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public final class EntityTable { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/IStack.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/IStack.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/IStack.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -85,7 +85,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class IStack { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Lexer.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Lexer.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Lexer.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -93,7 +93,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.8 $ ($Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class Lexer { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Node.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Node.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Node.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -82,7 +82,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.2 $ ($Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class Node implements Cloneable { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Out.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Out.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Out.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -81,7 +81,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public interface Out { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/OutFactory.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/OutFactory.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/OutFactory.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -84,7 +84,7 @@ /** * Tidy Output factory. * @author Fabrizio Giustina - * @version $Revision: 1.3 $ ($Author: slava_kabanovich $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public final class OutFactory { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/OutImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/OutImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/OutImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -89,7 +89,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class OutImpl implements Out { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/OutJavaImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/OutJavaImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/OutJavaImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -87,7 +87,7 @@ /** * Output implementation using java writers. * @author Fabrizio Giustina - * @version $Revision: 1.2 $ ($Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class OutJavaImpl implements Out { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/PPrint.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/PPrint.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/PPrint.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -90,7 +90,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.7 $ ($Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class PPrint { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ParseProperty.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ParseProperty.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ParseProperty.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ParsePropertyImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ParsePropertyImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ParsePropertyImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Parser.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Parser.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Parser.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -79,7 +79,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public interface Parser { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ParserImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ParserImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ParserImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -79,7 +79,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.2 $ ($Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public final class ParserImpl { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Report.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Report.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Report.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -93,7 +93,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.2 $ ($Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public final class Report { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamIn.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamIn.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamIn.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -79,7 +79,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public interface StreamIn Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamInFactory.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamInFactory.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamInFactory.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -84,7 +84,7 @@ /** * Tidy Input factory. * @author Fabrizio Giustina - * @version $Revision: 1.2 $ ($Author: slava_kabanovich $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public final class StreamInFactory { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamInImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamInImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamInImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -89,7 +89,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.2 $ ($Author: slava_kabanovich $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class StreamInImpl implements StreamIn { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamInJavaImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamInJavaImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StreamInJavaImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -85,7 +85,7 @@ /** * StreamIn Implementation using java writers. * @author Fabrizio Giustina - * @version $Revision: 1.5 $ ($Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class StreamInJavaImpl implements StreamIn { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Style.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Style.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Style.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -79,7 +79,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class Style { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StyleProp.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StyleProp.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/StyleProp.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -79,7 +79,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class StyleProp { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TagCheck.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TagCheck.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TagCheck.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -80,7 +80,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public interface TagCheck { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TagCheckImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TagCheckImpl.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TagCheckImpl.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -79,7 +79,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public final class TagCheckImpl { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TagTable.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TagTable.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TagTable.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -86,7 +86,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public final class TagTable { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Tidy.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Tidy.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/Tidy.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -98,7 +98,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.5 $ ($Author: slava_kabanovich $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class Tidy implements Serializable { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyBeanInfo.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyBeanInfo.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyBeanInfo.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -83,7 +83,7 @@ * @author Dave Raggett <a href="mailto:dsr@w3.org">dsr@w3.org </a> * @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick@sympatico.ca </a> (translation to Java) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class TidyBeanInfo extends SimpleBeanInfo { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyLexerListener.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyLexerListener.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyLexerListener.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -22,8 +22,8 @@ package org.ajax4jsf.org.w3c.tidy; /** - * @author asmirnov(a)exadel.com (latest modification by $Author: sergeysmirnov $) - * @version $Revision: 1.1 $ $Date: 2006/04/28 02:04:41 $ + * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:56:47 $ * */ public interface TidyLexerListener extends TidyMessageListener { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyMessage.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyMessage.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyMessage.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -78,7 +78,7 @@ * Message sent to listeners for validation errors/warnings and info. * @see Tidy#setMessageListener(TidyMessageListener) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public final class TidyMessage { @@ -181,7 +181,7 @@ /** * Message severity enumeration. * @author fgiust - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public static final class Level implements Comparable { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyMessageListener.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyMessageListener.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyMessageListener.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -78,7 +78,7 @@ * Listener interface for validation errors/warnings and info. * @see Tidy#setMessageListener(TidyMessageListener) * @author Fabrizio Giustina - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public interface TidyMessageListener { Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyUtils.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyUtils.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/TidyUtils.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ValidUTF8Sequence.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ValidUTF8Sequence.java 2007-07-09 13:55:22 UTC (rev 304) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/org/w3c/tidy/ValidUTF8Sequence.java 2007-07-09 18:34:57 UTC (rev 305) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.0 - Natural Ajax for Java Server Faces (JSF) + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -76,7 +76,7 @@ /** * @author Fabrizio Giustina (translation from c) - * @version $Revision: 1.1 $ ($Author: sergeysmirnov $) + * @version $Revision: 1.1.2.1 $ ($Author: alexsmirnov $) */ public class ValidUTF8Sequence {