JBoss Ajax4JSF SVN: r313 - trunk/framework/src/main/java/org/ajax4jsf/renderkit/html.
by ajax4jsf-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-07-27 18:41:06 -0400 (Fri, 27 Jul 2007)
New Revision: 313
Modified:
trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java
Log:
Requested fix for http://jira.jboss.com/jira/browse/RF-476 backported from 3.1.0
Modified: trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java
===================================================================
--- trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java 2007-07-25 15:07:03 UTC (rev 312)
+++ trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java 2007-07-27 22:41:06 UTC (rev 313)
@@ -304,8 +304,20 @@
getValidJavascriptName(formName));
script.append("(){").append(functionName).append("();}\n");
// MyFaces 1.1.5 clear form function name
- script.append("function ").append("clearFormHiddenParams_").append(
- formName.replace("-", "$_").replace(':', '_'));
+
+ //equivalent for formName.replace("-", "$_")
+ StringBuffer formNameReplaceBuffer = new StringBuffer(formName.length());
+ int idx = -1;
+ int idxA = 0;
+ while ((idx = formName.indexOf('-', idxA)) != -1) {
+ formNameReplaceBuffer.append(formName.substring(idxA, idx));
+ formNameReplaceBuffer.append("$_");
+ idxA = idx + 1;
+ }
+ formNameReplaceBuffer.append(formName.substring(idxA));
+
+ script.append("function ").append("clearFormHiddenParams_").append(formNameReplaceBuffer.toString().
+ replace(':', '_'));
script.append("(){").append(functionName).append("();}\n");
// Just to be sure we call this clear method on each load.
// Otherwise in the case, that someone submits a form by pressing Enter
16 years, 9 months
- 1
- 0
JBoss Ajax4JSF SVN: r312 - branches/version_1_0_7/src/framework/JavaScript/ajaxjsf.
by ajax4jsf-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-07-25 11:07:03 -0400 (Wed, 25 Jul 2007)
New Revision: 312
Modified:
branches/version_1_0_7/src/framework/JavaScript/ajaxjsf/JSFAJAX.js
Log:
fixed issue https://jira.exadel.com/browse/PS-86 with inaccessible event properties on IE
Modified: branches/version_1_0_7/src/framework/JavaScript/ajaxjsf/JSFAJAX.js
===================================================================
--- branches/version_1_0_7/src/framework/JavaScript/ajaxjsf/JSFAJAX.js 2007-07-17 13:15:28 UTC (rev 311)
+++ branches/version_1_0_7/src/framework/JavaScript/ajaxjsf/JSFAJAX.js 2007-07-25 15:07:03 UTC (rev 312)
@@ -402,10 +402,14 @@
A4J.AJAX.CloneObject = function( obj, noFunctions ) {
var cloned = {};
for( var n in obj ){
- if(noFunctions && typeof(evt[prop]) == 'function'){
- continue;
+ try {
+ if(noFunctions && typeof(obj[n]) == 'function'){
+ continue;
+ }
+ cloned[n]=obj[n];
+ } catch(e) {
+ LOG.warn(e.message || e);
}
- cloned[n]=obj[n];
}
return cloned;
}
16 years, 9 months
- 1
- 0
JBoss Ajax4JSF SVN: r311 - trunk/framework/src/main/config/component.
by ajax4jsf-svn-commits＠lists.jboss.org
Author: vkukharchuk
Date: 2007-07-17 09:15:28 -0400 (Tue, 17 Jul 2007)
New Revision: 311
Modified:
trunk/framework/src/main/config/component/actionParameter.xml
Log:
http://jira.jboss.com/jira/browse/AJSF-103
Modified: trunk/framework/src/main/config/component/actionParameter.xml
===================================================================
--- trunk/framework/src/main/config/component/actionParameter.xml 2007-07-17 13:10:36 UTC (rev 310)
+++ trunk/framework/src/main/config/component/actionParameter.xml 2007-07-17 13:15:28 UTC (rev 311)
@@ -83,6 +83,13 @@
client-side. This doesn't work with non-AJAX components.
</description>
</property>
+
+ <property>
+ <name>name</name>
+ <classname>java.lang.String</classname>
+ <description>A name of this parameter. The attribute is mandatory.</description>
+ </property>
+
<property hidden="true">
<name>assignToBinding</name>
</property>
16 years, 9 months
- 1
- 0
JBoss Ajax4JSF SVN: r310 - trunk/framework/src/main/config/component.
by ajax4jsf-svn-commits＠lists.jboss.org
Author: vkukharchuk
Date: 2007-07-17 09:10:36 -0400 (Tue, 17 Jul 2007)
New Revision: 310
Modified:
trunk/framework/src/main/config/component/repeat.xml
Log:
http://jira.jboss.com/jira/browse/RF-410
Modified: trunk/framework/src/main/config/component/repeat.xml
===================================================================
--- trunk/framework/src/main/config/component/repeat.xml 2007-07-13 00:02:07 UTC (rev 309)
+++ trunk/framework/src/main/config/component/repeat.xml 2007-07-17 13:10:36 UTC (rev 310)
@@ -60,7 +60,7 @@
<property>
<name>ajaxKeys</name>
<classname>java.lang.String</classname>
- <description>This attribute defines strings that are updated after an AJAX request.</description>
+ <description>This attribute defines rows that are updated after an AJAX request.</description>
</property>
<property>
<name>rowKeyVar</name>
16 years, 9 months
- 1
- 0
JBoss Ajax4JSF SVN: r309 - in branches/version_1_0_7/src/framework/java/org/ajax4jsf: xml/serializer and 1 other directory.
by ajax4jsf-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-07-12 20:02:07 -0400 (Thu, 12 Jul 2007)
New Revision: 309
Modified:
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/xml/serializer/ToXHTMLStream.java
Log:
fix renderin empty html attributes
Modified: 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 2007-07-12 23:46:02 UTC (rev 308)
+++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/ConfigurableXMLFilter.java 2007-07-13 00:02:07 UTC (rev 309)
@@ -15,7 +15,6 @@
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;
@@ -28,13 +27,23 @@
*/
public class ConfigurableXMLFilter extends BaseXMLFilter {
- private static final Log log = LogFactory
+ public static final String NONE = "NONE";
+
+ public static final String NEKO = "NEKO";
+
+ public static final String TIDY = "TIDY";
+
+ private static final Log log = LogFactory
.getLog(ConfigurableXMLFilter.class);
- private static final String PARSERS_LIST_PARAMETER = "org.ajax4jsf.xmlparsers";
+ private static final String PARSERS_LIST_PARAMETER = "org.ajax4jsf.xmlparser.ORDER";
private static final String VIEW_ID_PATTERN_PARAMETER = "org.ajax4jsf.xmlparser.";
+ public static final String TEXT_HTML = "text/html";
+
+ public static final String APPLICATION_XHTML_XML = "application/xhtml+xml";
+
/**
* map of the parsers names and viewId patterns for all parser type.
*/
@@ -63,11 +72,11 @@
for (int i = parsersNames.length - 1; i >= 0; i--) {
String parserName = parsersNames[i];
ParserConfig parserConfig;
- if ("TIDY".equals(parserName)) {
+ if (TIDY.equals(parserName)) {
parserConfig = new TidyParserConfig();
- } else if ("NEKO".equals(parserName)) {
+ } else if (NEKO.equals(parserName)) {
parserConfig = new NekoParserConfig();
- } else if ("PASS".equals(parserName)) {
+ } else if (NONE.equals(parserName)) {
parserConfig = new PassParserConfig();
} else {
throw new ServletException(
@@ -94,7 +103,7 @@
/*
* (non-Javadoc)
*
- * @see org.ajax4jsf.framework.ajax.xmlfilter.BaseXMLFilter#getParser(java.lang.String,
+ * @see org.ajax4jsf.webapp.BaseXMLFilter#getParser(java.lang.String,
* boolean, java.lang.String)
*/
protected HtmlParser getParser(String mimetype, boolean isAjax,
@@ -102,8 +111,8 @@
HtmlParser parser = null;
if (isAjax || isForcexml()) {
parser = parsers.getParser(viewId, mimetype);
- } else if (mimetype.startsWith("text/html")
- || mimetype.startsWith("application/xhtml+xml")) {
+ } else if (mimetype.startsWith(TEXT_HTML)
+ || mimetype.startsWith(APPLICATION_XHTML_XML)) {
parser = new FastHtmlParser();
}
return parser;
@@ -112,7 +121,7 @@
/*
* (non-Javadoc)
*
- * @see org.ajax4jsf.framework.ajax.xmlfilter.BaseXMLFilter#reuseParser(org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser)
+ * @see org.ajax4jsf.webapp.BaseXMLFilter#reuseParser(org.ajax4jsf.webapp.HtmlParser)
*/
protected void reuseParser(HtmlParser parser) {
parsers.reuseParser(parser);
@@ -139,6 +148,7 @@
// If tidy not handle all requests, disable reorganising
// of html
// parser.setMoveElements(isForcexml());
+// parser.init();
}
// TODO - set header scripts/styles filter.
return parser;
Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java
===================================================================
--- branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java 2007-07-12 23:46:02 UTC (rev 308)
+++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java 2007-07-13 00:02:07 UTC (rev 309)
@@ -1084,11 +1084,14 @@
{
writer.write(' ');
- if ( ((value.length() == 0) || value.equalsIgnoreCase(name))
+ if ( ((value.length() == 0) )
&& elemDesc != null
&& elemDesc.isAttrFlagSet(name, ElemDesc.ATTREMPTY))
{
writer.write(name);
+ writer.write("=\"");
+ writeAttrString(writer, name, this.getEncoding());
+ writer.write('"');
}
else
{
16 years, 9 months
- 1
- 0
JBoss Ajax4JSF SVN: r308 - in trunk/framework/src/main/java/org/ajax4jsf: xml/serializer and 1 other directory.
by ajax4jsf-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-07-12 19:46:02 -0400 (Thu, 12 Jul 2007)
New Revision: 308
Modified:
trunk/framework/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/ConfigurableXMLFilter.java
trunk/framework/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java
Log:
Fix empty attributes output in the Neko parser
Modified: trunk/framework/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/ConfigurableXMLFilter.java
===================================================================
--- trunk/framework/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/ConfigurableXMLFilter.java 2007-07-10 18:27:37 UTC (rev 307)
+++ trunk/framework/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/ConfigurableXMLFilter.java 2007-07-12 23:46:02 UTC (rev 308)
@@ -15,7 +15,6 @@
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;
@@ -28,13 +27,23 @@
*/
public class ConfigurableXMLFilter extends BaseXMLFilter {
- private static final Log log = LogFactory
+ public static final String NONE = "NONE";
+
+ public static final String NEKO = "NEKO";
+
+ public static final String TIDY = "TIDY";
+
+ private static final Log log = LogFactory
.getLog(ConfigurableXMLFilter.class);
- private static final String PARSERS_LIST_PARAMETER = "org.ajax4jsf.xmlparsers";
+ private static final String PARSERS_LIST_PARAMETER = "org.ajax4jsf.xmlparser.ORDER";
private static final String VIEW_ID_PATTERN_PARAMETER = "org.ajax4jsf.xmlparser.";
+ public static final String TEXT_HTML = "text/html";
+
+ public static final String APPLICATION_XHTML_XML = "application/xhtml+xml";
+
/**
* map of the parsers names and viewId patterns for all parser type.
*/
@@ -63,11 +72,11 @@
for (int i = parsersNames.length - 1; i >= 0; i--) {
String parserName = parsersNames[i];
ParserConfig parserConfig;
- if ("TIDY".equals(parserName)) {
+ if (TIDY.equals(parserName)) {
parserConfig = new TidyParserConfig();
- } else if ("NEKO".equals(parserName)) {
+ } else if (NEKO.equals(parserName)) {
parserConfig = new NekoParserConfig();
- } else if ("PASS".equals(parserName)) {
+ } else if (NONE.equals(parserName)) {
parserConfig = new PassParserConfig();
} else {
throw new ServletException(
@@ -94,7 +103,7 @@
/*
* (non-Javadoc)
*
- * @see org.ajax4jsf.framework.ajax.xmlfilter.BaseXMLFilter#getParser(java.lang.String,
+ * @see org.ajax4jsf.webapp.BaseXMLFilter#getParser(java.lang.String,
* boolean, java.lang.String)
*/
protected HtmlParser getParser(String mimetype, boolean isAjax,
@@ -102,8 +111,8 @@
HtmlParser parser = null;
if (isAjax || isForcexml()) {
parser = parsers.getParser(viewId, mimetype);
- } else if (mimetype.startsWith("text/html")
- || mimetype.startsWith("application/xhtml+xml")) {
+ } else if (mimetype.startsWith(TEXT_HTML)
+ || mimetype.startsWith(APPLICATION_XHTML_XML)) {
parser = new FastHtmlParser();
}
return parser;
@@ -112,7 +121,7 @@
/*
* (non-Javadoc)
*
- * @see org.ajax4jsf.framework.ajax.xmlfilter.BaseXMLFilter#reuseParser(org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser)
+ * @see org.ajax4jsf.webapp.BaseXMLFilter#reuseParser(org.ajax4jsf.webapp.HtmlParser)
*/
protected void reuseParser(HtmlParser parser) {
parsers.reuseParser(parser);
@@ -139,6 +148,7 @@
// If tidy not handle all requests, disable reorganising
// of html
// parser.setMoveElements(isForcexml());
+// parser.init();
}
// TODO - set header scripts/styles filter.
return parser;
Modified: trunk/framework/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java
===================================================================
--- trunk/framework/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java 2007-07-10 18:27:37 UTC (rev 307)
+++ trunk/framework/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java 2007-07-12 23:46:02 UTC (rev 308)
@@ -1084,11 +1084,14 @@
{
writer.write(' ');
- if ( ((value.length() == 0) || value.equalsIgnoreCase(name))
+ if ( ((value.length() == 0) )
&& elemDesc != null
&& elemDesc.isAttrFlagSet(name, ElemDesc.ATTREMPTY))
{
writer.write(name);
+ writer.write("=\"");
+ writeAttrString(writer, name, this.getEncoding());
+ writer.write('"');
}
else
{
16 years, 9 months
- 1
- 0
JBoss Ajax4JSF SVN: r307 - in branches/version_1_0_7/src/framework/java/org/ajax4jsf: xml/serializer and 1 other directory.
by ajax4jsf-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-07-10 14:27:37 -0400 (Tue, 10 Jul 2007)
New Revision: 307
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/xml/serializer/ToXHTMLStream.java
branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/output_xhtml.properties
Log:
fix NekoFilter output to use HTML DTD rules.
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-10 18:21:27 UTC (rev 306)
+++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekkoParser.java 2007-07-10 18:27:37 UTC (rev 307)
@@ -68,582 +68,674 @@
/**
* @author shura
- *
+ *
*/
-public class NekkoParser implements HtmlParser {
+public class NekkoParser implements HtmlParser {
- private static final Log _log = LogFactory.getLog(NekkoParser.class);
-
- private HtmlSAXParser _parser;
-
-// private HtmlWriter _writer= new HtmlWriter();
-
- private ElementRemover remover = new ElementRemover();
-
- private XMLDocumentFilter[] _filters = { new ViewStateFilter()/*,remover */, new HtmlCorrectionFilter(), new Purifier() /*, _writer*/ };
+ private static final Log _log = LogFactory.getLog(NekkoParser.class);
- private DOMFragmentParser viewStateParser ;//= new DOMFragmentParser();
+ private HtmlSAXParser _parser;
- private Document viewStateDocument ;//= new HTMLDocumentImpl();
+ // private HtmlWriter _writer= new HtmlWriter();
- private DocumentFragment fragment = null;
+ private ElementRemover remover = new ElementRemover();
- private Set _scripts;
-
- private Set _styles;
-
- private String _viewState;
-
- private String _encoding;
+ private XMLDocumentFilter[] _filters = {
+ new ViewStateFilter()/* ,remover */, new HtmlCorrectionFilter(),
+ new Purifier() /* , _writer */};
- private Serializer _serializer;
+ private DOMFragmentParser viewStateParser;// = new DOMFragmentParser();
- 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";
+ private Document viewStateDocument;// = new HTMLDocumentImpl();
- private String _outputEncoding;
- /**
- *
- */
- 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);
-// serializer.setOutputStream(output);
-// _parser.setContentHandler(serializer.asContentHandler());
- viewStateParser = new DOMFragmentParser();
- // Set parser features
- try {
- viewStateParser.setProperty(
- "http://cyberneko.org/html/properties/names/elems",
- "lower");
- viewStateParser.setProperty(
- "http://cyberneko.org/html/properties/names/attrs",
- "lower");
- } catch (SAXException e) {
- _log.error("Exception in DOM parser configuration", e);
- }
- try {
- // Create Document Builder Factory
- DocumentBuilderFactory docFactory = DocumentBuilderFactory
- .newInstance();
- // Create Document Builder
- DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
- viewStateDocument = docBuilder.newDocument();
- } catch (ParserConfigurationException e) {
- viewStateDocument = new HTMLDocumentImpl();
- _log.error("Error on create DOM Document by JAXP, use Xerxes implementation. Check JAXP configuration ",e);
- }
-// viewStateDocument = new HTMLDocumentImpl();
- remover.removeElement("style");
+ private DocumentFragment fragment = null;
+
+ private Set _scripts;
+
+ private Set _styles;
+
+ private String _viewState;
+
+ private String _encoding;
+
+ private Serializer _serializer;
+
+ 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";
+
+ private String _outputEncoding;
+
+ /**
+ *
+ */
+ 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);
+ // serializer.setOutputStream(output);
+ // _parser.setContentHandler(serializer.asContentHandler());
+ viewStateParser = new DOMFragmentParser();
+ // Set parser features
+ try {
+ viewStateParser
+ .setProperty(
+ "http://cyberneko.org/html/properties/names/elems",
+ "lower");
+ viewStateParser
+ .setProperty(
+ "http://cyberneko.org/html/properties/names/attrs",
+ "lower");
+ } catch (SAXException e) {
+ _log.error("Exception in DOM parser configuration", e);
}
-
- /**
- * Reset parser state
- */
- public void reset(){
- _scripts=null;
- _styles=null;
- _viewState=null;
- _parser.reset();
- _serializer.reset();
+ try {
+ // Create Document Builder Factory
+ DocumentBuilderFactory docFactory = DocumentBuilderFactory
+ .newInstance();
+ // Create Document Builder
+ DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+ viewStateDocument = docBuilder.newDocument();
+ } catch (ParserConfigurationException e) {
+ viewStateDocument = new HTMLDocumentImpl();
+ _log
+ .error(
+ "Error on create DOM Document by JAXP, use Xerxes implementation. Check JAXP configuration ",
+ e);
}
+ // viewStateDocument = new HTMLDocumentImpl();
+ remover.removeElement("style");
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#parseHtml(java.io.InputStream, java.io.OutputStream)
- */
- public void parseHtml(InputStream input, java.io.Writer output)
- throws IOException {
- InputSource src = new InputSource(input);
- parseSAXSource(src,output);
- }
+ /**
+ * Reset parser state
+ */
+ public void reset() {
+ _scripts = null;
+ _styles = null;
+ _viewState = null;
+ _parser.reset();
+ _serializer.reset();
+ }
- private void parseSAXSource(InputSource src, java.io.Writer output) throws IOException {
-// PrintWriter printWriter = null;
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#parseHtml(java.io.InputStream,
+ * java.io.OutputStream)
+ */
+ public void parseHtml(InputStream input, java.io.Writer output)
+ throws IOException {
+ InputSource src = new InputSource(input);
+ parseSAXSource(src, output);
+ }
+
+ private void parseSAXSource(InputSource src, java.io.Writer output)
+ throws IOException {
+ // PrintWriter printWriter = null;
+ fragment = null;
+ if (null != _viewState) {
+ fragment = viewStateDocument.createDocumentFragment();
+ try {
+ viewStateParser.parse(new InputSource(new StringReader(
+ _viewState)), fragment);
+ } catch (Exception e) {
fragment = null;
- if(null != _viewState){
- fragment = viewStateDocument.createDocumentFragment();
- try {
- viewStateParser.parse(new InputSource(new StringReader(
- _viewState)), fragment);
- } catch (Exception e) {
- fragment = null;
- }
- // TODO - parse view state to DOM Fragment.
- }
- try {
- _parser.setProperty("http://cyberneko.org/html/properties/default-encoding",
- _encoding);
- Properties properties = _serializer.getOutputFormat();
- properties.put("encoding",_outputEncoding);
- _serializer.setOutputFormat(properties);
- _serializer.setWriter(output);
-// _serializer.setOutputStream(new OutputStream(){
-//
-// public void write(int b) throws IOException {
-// // TODO Auto-generated method stub
-//
-// }});
- _parser.setContentHandler(_serializer.asContentHandler());
-// printWriter = new PrintWriter(output);
-// _writer.setWriter(printWriter);
-// _writer.setEncoding(_encoding);
- _parser.parse(src);
- } catch (SAXException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } finally {
-// _writer.setWriter(null);
-// if(null != printWriter){
-// printWriter.flush();
-// printWriter.close();
-// }
-
- }
-
+ }
+ // TODO - parse view state to DOM Fragment.
}
+ try {
+ if (null != _encoding) {
+ _parser
+ .setProperty(
+ "http://cyberneko.org/html/properties/default-encoding",
+ _encoding);
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#parseHtml(java.io.Reader, java.io.OutputStream)
- */
- public void parseHtml(Reader input, java.io.Writer output) throws IOException {
- InputSource src = new InputSource(input);
- parseSAXSource(src,output);
- }
+ }
+ Properties properties = _serializer.getOutputFormat();
+ if (null != _outputEncoding) {
+ properties.put("encoding", _outputEncoding);
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setEncoding(java.lang.String)
- */
- public void setInputEncoding(String encoding) {
- _encoding = encoding;
- }
+ }
+ _serializer.setOutputFormat(properties);
+ _serializer.setWriter(output);
+ // _serializer.setOutputStream(new OutputStream(){
+ //
+ // public void write(int b) throws IOException {
+ // // TODO Auto-generated method stub
+ //
+ // }});
+ _parser.setContentHandler(_serializer.asContentHandler());
+ // printWriter = new PrintWriter(output);
+ // _writer.setWriter(printWriter);
+ // _writer.setEncoding(_encoding);
+ _parser.parse(src);
+ } catch (SAXException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } finally {
+ // _writer.setWriter(null);
+ // if(null != printWriter){
+ // printWriter.flush();
+ // printWriter.close();
+ // }
- public void setOutputEncoding(String encoding) {
- _outputEncoding = encoding;
}
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setMoveElements(boolean)
- */
- public void setMoveElements(boolean move) {
- // TODO Auto-generated method stub
- }
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setScripts(java.util.Set)
- */
- public void setScripts(Set scripts) {
- _scripts = scripts;
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#parseHtml(java.io.Reader,
+ * java.io.OutputStream)
+ */
+ public void parseHtml(Reader input, java.io.Writer output)
+ throws IOException {
+ InputSource src = new InputSource(input);
+ parseSAXSource(src, output);
+ }
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setEncoding(java.lang.String)
+ */
+ public void setInputEncoding(String encoding) {
+ _encoding = encoding;
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setStyles(java.util.Set)
- */
- public void setStyles(Set styles) {
- _styles = styles;
+ public void setOutputEncoding(String encoding) {
+ _outputEncoding = encoding;
+ }
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setMoveElements(boolean)
+ */
+ public void setMoveElements(boolean move) {
+ // TODO Auto-generated method stub
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setDoctype(java.lang.String)
- */
- public void setDoctype(String doctype) {
- this._publicId = doctype;
+ }
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setScripts(java.util.Set)
+ */
+ public void setScripts(Set scripts) {
+ _scripts = scripts;
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setViewState(java.lang.String)
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setStyles(java.util.Set)
+ */
+ public void setStyles(Set styles) {
+ _styles = styles;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setDoctype(java.lang.String)
+ */
+ public void setDoctype(String doctype) {
+ this._publicId = doctype;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setViewState(java.lang.String)
+ */
+ public void setViewState(String viewState) {
+ _viewState = viewState;
+
+ }
+
+ private static class HtmlSAXParser extends AbstractSAXParser {
+ /**
+ * Default constructor.
+ *
+ * @throws ServletException
*/
- public void setViewState(String viewState) {
- _viewState = viewState;
+ public HtmlSAXParser(HTMLConfiguration config) {
+ super(config);
}
-
- private static class HtmlSAXParser extends AbstractSAXParser {
- /** Default constructor.
- * @throws ServletException */
- public HtmlSAXParser(HTMLConfiguration config) {
- super(config);
-
- }
- }
-
- private class ViewStateFilter extends DefaultFilter{
- private boolean haveHtml = false;
- private boolean haveHead = false;
- private boolean headParsed = false;
- private int stateMarkerLevel = -1;
+ }
+ private class ViewStateFilter extends DefaultFilter {
+ private boolean haveHtml = false;
+ private boolean haveHead = false;
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#reset(org.apache.xerces.xni.parser.XMLComponentManager)
- */
- public void reset(XMLComponentManager componentManager) throws XMLConfigurationException {
- haveHead = false;
- haveHtml = false;
- headParsed = false;
- stateMarkerLevel = -1;
- super.reset(componentManager);
- }
+ private boolean headParsed = false;
+ private int stateMarkerLevel = -1;
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#startElement(org.apache.xerces.xni.QName, org.apache.xerces.xni.XMLAttributes, org.apache.xerces.xni.Augmentations)
- */
- public void startElement(QName element, XMLAttributes attributes, Augmentations augs) throws XNIException {
- if(stateMarkerLevel >=0){
- stateMarkerLevel++;
- if(null != fragment){
- return;
- }
- }
- if (!headParsed) {
- if("html".equalsIgnoreCase(element.rawname)){
- haveHtml = true;
- } else if("head".equalsIgnoreCase(element.rawname)){
- haveHead = true;
- super.startElement(element, attributes, augs);
- insertResources();
- return;
- } else {
- if(!haveHtml){
- insertStartElement("html");
- }
- insertStartElement("head");
- insertResources();
- insertEndElement("head");
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#reset(org.apache.xerces.xni.parser.XMLComponentManager)
+ */
+ public void reset(XMLComponentManager componentManager)
+ throws XMLConfigurationException {
+ haveHead = false;
+ haveHtml = false;
+ headParsed = false;
+ stateMarkerLevel = -1;
+ super.reset(componentManager);
+ }
- }
- if(isStateMarker(element, attributes)){
- stateMarkerLevel = 0;
- return;
- };
- super.startElement(element, attributes, augs);
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#startElement(org.apache.xerces.xni.QName,
+ * org.apache.xerces.xni.XMLAttributes,
+ * org.apache.xerces.xni.Augmentations)
+ */
+ public void startElement(QName element, XMLAttributes attributes,
+ Augmentations augs) throws XNIException {
+ if (stateMarkerLevel >= 0) {
+ stateMarkerLevel++;
+ if (null != fragment) {
+ return;
}
+ }
+ if (!headParsed) {
+ if ("html".equalsIgnoreCase(element.rawname)) {
+ haveHtml = true;
+ } else if ("head".equalsIgnoreCase(element.rawname)) {
+ haveHead = true;
+ super.startElement(element, attributes, augs);
+ insertResources();
+ return;
+ } else {
+ if (!haveHtml) {
+ insertStartElement("html");
+ }
+ insertStartElement("head");
+ insertResources();
+ insertEndElement("head");
+ }
+ }
+ if (isStateMarker(element, attributes)) {
+ stateMarkerLevel = 0;
+ return;
+ }
+ ;
+ super.startElement(element, attributes, augs);
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#characters(org.apache.xerces.xni.XMLString, org.apache.xerces.xni.Augmentations)
- */
- public void characters(XMLString text, Augmentations augs) throws XNIException {
- if(stateMarkerLevel >=0){
- if(null != fragment){
- return;
- }
- }
- super.characters(text, augs);
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#characters(org.apache.xerces.xni.XMLString,
+ * org.apache.xerces.xni.Augmentations)
+ */
+ public void characters(XMLString text, Augmentations augs)
+ throws XNIException {
+ if (stateMarkerLevel >= 0) {
+ if (null != fragment) {
+ return;
}
+ }
+ super.characters(text, augs);
+ }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#endElement(org.apache.xerces.xni.QName,
+ * org.apache.xerces.xni.Augmentations)
+ */
+ public void endElement(QName element, Augmentations augs)
+ throws XNIException {
+ if (stateMarkerLevel >= 0) {
+ stateMarkerLevel--;
+ if (null != fragment || stateMarkerLevel == -1) {
+ return;
+ }
+ }
+ super.endElement(element, augs);
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#endElement(org.apache.xerces.xni.QName, org.apache.xerces.xni.Augmentations)
- */
- public void endElement(QName element, Augmentations augs) throws XNIException {
- if(stateMarkerLevel >=0){
- stateMarkerLevel--;
- if(null != fragment || stateMarkerLevel == -1){
- return;
- }
- }
- super.endElement(element, augs);
+ private void insertResources() {
+ headParsed = true;
+ if (null != _styles) {
+ for (Iterator iter = _styles.iterator(); iter.hasNext();) {
+ String style = (String) iter.next();
+ QName element = new QName(null, "link", "link", null);
+ XMLAttributes attrs = new XMLAttributesImpl();
+ attrs.addAttribute(new QName(null, "href", "href", null),
+ "CDATA", style);
+ attrs.addAttribute(new QName(null, "type", "type", null),
+ "CDATA", "text/css");
+ attrs.addAttribute(new QName(null, "rel", "rel", null),
+ "CDATA", "stylesheet");
+ Augmentations augs = new HTMLAugmentations();
+ super.emptyElement(element, attrs, augs);
}
+ }
+ if (null != _scripts) {
+ for (Iterator iter = _scripts.iterator(); iter.hasNext();) {
+ String script = (String) iter.next();
+ QName element = new QName(null, "script", "script", null);
+ XMLAttributes attrs = new XMLAttributesImpl();
+ attrs.addAttribute(new QName(null, "src", "src", null),
+ "CDATA", script);
+ attrs.addAttribute(new QName(null, "type", "type", null),
+ "CDATA", "text/javascript");
+ Augmentations augs = new HTMLAugmentations();
+ super.startElement(element, attrs, augs);
+ super.endElement(element, augs);
+ }
+ }
+ }
- private void insertResources() {
- headParsed = true;
- if(null != _styles){
- for (Iterator iter = _styles.iterator(); iter.hasNext();) {
- String style = (String) iter.next();
- QName element = new QName(null,"link","link",null);
- XMLAttributes attrs = new XMLAttributesImpl();
- attrs.addAttribute(new QName(null,"href","href",null), "CDATA", style);
- attrs.addAttribute(new QName(null,"type","type",null), "CDATA", "text/css");
- attrs.addAttribute(new QName(null,"rel","rel",null), "CDATA", "stylesheet");
- Augmentations augs = new HTMLAugmentations();
- super.emptyElement(element,attrs,augs);
- }
- }
- if(null != _scripts){
- for (Iterator iter = _scripts.iterator(); iter.hasNext();) {
- String script = (String) iter.next();
- QName element = new QName(null,"script","script",null);
- XMLAttributes attrs = new XMLAttributesImpl();
- attrs.addAttribute(new QName(null,"src","src",null), "CDATA", script);
- attrs.addAttribute(new QName(null,"type","type",null), "CDATA", "text/javascript");
- Augmentations augs = new HTMLAugmentations();
- super.startElement(element,attrs,augs);
- super.endElement(element, augs);
- }
- }
-
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#emptyElement(org.apache.xerces.xni.QName,
+ * org.apache.xerces.xni.XMLAttributes,
+ * org.apache.xerces.xni.Augmentations)
+ */
+ public void emptyElement(QName name, XMLAttributes attributes,
+ Augmentations augmentation) throws XNIException {
+ if (stateMarkerLevel >= 0) {
+ if (null != fragment) {
+ return;
}
+ }
+ if (!headParsed) {
+ if ("head".equalsIgnoreCase(name.rawname)) {
+ haveHead = true;
+ super.startElement(name, attributes, augmentation);
+ insertResources();
+ insertEndElement(name.rawname);
+ return;
+ }
+ }
+ if (isStateMarker(name, attributes)) {
+ return;
+ }
+ ;
+ super.emptyElement(name, attributes, augmentation);
+ }
-
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#emptyElement(org.apache.xerces.xni.QName, org.apache.xerces.xni.XMLAttributes, org.apache.xerces.xni.Augmentations)
- */
- public void emptyElement(QName name, XMLAttributes attributes, Augmentations augmentation) throws XNIException {
- if(stateMarkerLevel >=0){
- if(null != fragment){
- return;
- }
- }
- if (!headParsed) {
- if("head".equalsIgnoreCase(name.rawname)){
- haveHead = true;
- super.startElement(name, attributes, augmentation);
- insertResources();
- insertEndElement(name.rawname);
- return;
- }
- }
- if(isStateMarker(name, attributes)){
- return;
- };
- super.emptyElement(name, attributes, augmentation);
+ /**
+ * @param name
+ * @param attributes
+ */
+ private boolean isStateMarker(QName name, XMLAttributes attributes) {
+ if (name.rawname.equalsIgnoreCase("span")
+ && AjaxViewHandler.STATE_MARKER_KEY.equals(attributes
+ .getValue("id"))) {
+ // STATE marker element - out real content.
+ if (null != fragment) {
+ try {
+ _serializer.asDOMSerializer().serialize(fragment);
+ } catch (IOException e) {
+ // Break output.
+ }
}
+ return true;
+ }
+ return false;
+ }
+ void insertStartElement(String name) {
+ QName element = new QName(null, name, name, null);
+ XMLAttributes attrs = new XMLAttributesImpl();
+ Augmentations augs = new HTMLAugmentations();
+ super.startElement(element, attrs, augs);
+ }
- /**
- * @param name
- * @param attributes
- */
- private boolean isStateMarker(QName name, XMLAttributes attributes) {
- if(name.rawname.equalsIgnoreCase("span") && AjaxViewHandler.STATE_MARKER_KEY.equals(attributes.getValue("id"))){
- // STATE marker element - out real content.
- if(null != fragment){
- try {
- _serializer.asDOMSerializer().serialize(fragment);
- } catch (IOException e) {
- // Break output.
- }
- }
- return true;
- }
- return false;
- }
-
- void insertStartElement(String name) {
- QName element = new QName(null,name,name,null);
- XMLAttributes attrs = new XMLAttributesImpl();
- Augmentations augs = new HTMLAugmentations();
- super.startElement(element,attrs,augs);
- }
-
-
- void insertEndElement(String name) {
- QName element = new QName(null,name,name,null);
-// XMLAttributes attrs = new XMLAttributesImpl();
- Augmentations augs = new HTMLAugmentations();
- super.endElement(element,augs);
- }
+ void insertEndElement(String name) {
+ QName element = new QName(null, name, name, null);
+ // XMLAttributes attrs = new XMLAttributesImpl();
+ Augmentations augs = new HTMLAugmentations();
+ super.endElement(element, augs);
+ }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#endDocument(org.apache.xerces.xni.Augmentations)
+ */
+ public void endDocument(Augmentations augs) throws XNIException {
+ if (!haveHtml) {
+ insertEndElement("html");
+ }
+ super.endDocument(augs);
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#endDocument(org.apache.xerces.xni.Augmentations)
- */
- public void endDocument(Augmentations augs) throws XNIException {
- if (!haveHtml) {
- insertEndElement("html");
- }
- super.endDocument(augs);
- }
-
-
+ }
+ private static class HtmlWriter extends Writer {
+
+ /**
+ *
+ */
+ public HtmlWriter() {
+ super();
+ fEncoding = "UTF-8";
}
- private static class HtmlWriter extends Writer {
+ public void setEncoding(String encoding) {
+ this.fEncoding = encoding;
+ }
- /**
- *
- */
- public HtmlWriter() {
- super();
- fEncoding = "UTF-8";
- }
-
- public void setEncoding(String encoding){
- this.fEncoding = encoding;
- }
-
- public void setWriter( PrintWriter writer){
- this.fPrinter = writer;
- }
+ public void setWriter(PrintWriter writer) {
+ this.fPrinter = writer;
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.Writer#emptyElement(org.apache.xerces.xni.QName, org.apache.xerces.xni.XMLAttributes, org.apache.xerces.xni.Augmentations)
- */
- public void emptyElement(QName element, XMLAttributes attributes, Augmentations augs) throws XNIException {
- // TODO Auto-generated method stub
- super.emptyElement(element, attributes, augs);
- printEndElement(element);
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.Writer#emptyElement(org.apache.xerces.xni.QName,
+ * org.apache.xerces.xni.XMLAttributes,
+ * org.apache.xerces.xni.Augmentations)
+ */
+ public void emptyElement(QName element, XMLAttributes attributes,
+ Augmentations augs) throws XNIException {
+ // TODO Auto-generated method stub
+ super.emptyElement(element, attributes, augs);
+ printEndElement(element);
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#endCDATA(org.apache.xerces.xni.Augmentations)
- */
- public void endCDATA(Augmentations augs) throws XNIException {
- // TODO Auto-generated method stub
- super.endCDATA(augs);
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#endCDATA(org.apache.xerces.xni.Augmentations)
+ */
+ public void endCDATA(Augmentations augs) throws XNIException {
+ // TODO Auto-generated method stub
+ super.endCDATA(augs);
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#startCDATA(org.apache.xerces.xni.Augmentations)
- */
- public void startCDATA(Augmentations augs) throws XNIException {
- // TODO Auto-generated method stub
- super.startCDATA(augs);
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#startCDATA(org.apache.xerces.xni.Augmentations)
+ */
+ public void startCDATA(Augmentations augs) throws XNIException {
+ // TODO Auto-generated method stub
+ super.startCDATA(augs);
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#textDecl(java.lang.String, java.lang.String, org.apache.xerces.xni.Augmentations)
- */
- public void textDecl(String version, String encoding, Augmentations augs) throws XNIException {
- // TODO Auto-generated method stub
- super.textDecl(version, encoding, augs);
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#textDecl(java.lang.String,
+ * java.lang.String, org.apache.xerces.xni.Augmentations)
+ */
+ public void textDecl(String version, String encoding, Augmentations augs)
+ throws XNIException {
+ // TODO Auto-generated method stub
+ super.textDecl(version, encoding, augs);
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#xmlDecl(java.lang.String, java.lang.String, java.lang.String, org.apache.xerces.xni.Augmentations)
- */
- public void xmlDecl(String version, String encoding, String standalone, Augmentations augs) throws XNIException {
- // TODO Auto-generated method stub
- super.xmlDecl(version, encoding, standalone, augs);
- }
-
-
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#xmlDecl(java.lang.String,
+ * java.lang.String, java.lang.String,
+ * org.apache.xerces.xni.Augmentations)
+ */
+ public void xmlDecl(String version, String encoding, String standalone,
+ Augmentations augs) throws XNIException {
+ // TODO Auto-generated method stub
+ super.xmlDecl(version, encoding, standalone, augs);
}
- /**
- * Factory method for create and configure HTML parser configuration.
- * Create configuration for use in parsing, set nessesary features and properties
- * @return
- * @throws ServletException
- */
- protected HTMLConfiguration getHtmlConfig() {
- HTMLConfiguration _config = new HTMLConfiguration();
- try {
- if (this.getPublicid() != null || this.getSystemid() != null) {
- _config.setFeature(
- "http://cyberneko.org/html/features/insert-doctype",
- true);
- _config.setFeature(
- "http://cyberneko.org/html/features/override-doctype",
- true);
- }
- if (this.getPublicid() != null) {
- _config.setProperty(
- "http://cyberneko.org/html/properties/doctype/pubid",
- getPublicid());
-
- }
- if (this.getSystemid() != null) {
- _config.setProperty(
- "http://cyberneko.org/html/properties/doctype/sysid",
- getSystemid());
-
- }
- if (this.getNamespace() != null) {
- _config.setFeature(
- "http://xml.org/sax/features/namespaces",
- true);
- _config.setFeature(
- "http://cyberneko.org/html/features/override-namespaces",
- true);
- _config.setFeature(
- "http://cyberneko.org/html/features/insert-namespaces",
- true);
- _config.setProperty(
- "http://cyberneko.org/html/properties/namespaces-uri",
- getNamespace());
-
- }
- // config
- // .setFeature(
- // "http://cyberneko.org/html/features/balance-tags/ignore-outside-content",
- // true);
- _config
- .setFeature(
- "http://cyberneko.org/html/features/scanner/cdata-sections",
- true);
- _config
- .setFeature(
- "http://cyberneko.org/html/features/scanner/script/strip-comment-delims",
- true);
- _config
- .setFeature(
- "http://cyberneko.org/html/features/scanner/style/strip-comment-delims",
- true);
- _config.setFeature(
- "http://cyberneko.org/html/features/insert-doctype",
- true);
- _config.setFeature(
- "http://cyberneko.org/html/features/insert-namespaces",
- true);
- //
- // Set properties http://cyberneko.org/html/features/insert-namespaces
- // _config
- // .setProperty(
- // "http://cyberneko.org/html/properties/default-encoding",
- // encoding);
- _config.setProperty(
- "http://cyberneko.org/html/properties/names/elems",
- "lower");
- _config.setProperty(
- "http://cyberneko.org/html/properties/names/attrs",
- "lower");
- _config.setProperty("http://cyberneko.org/html/properties/filters", _filters);
- } catch (XMLConfigurationException e) {
-// throw new ServletException("error set Neko feature ", e);
- }
- return _config;
- }
- private String getNamespace() {
- // TODO Auto-generated method stub
- return this._namespace;
- }
+ }
- private String getSystemid() {
- // TODO Auto-generated method stub
- return this._systemid;
- }
+ /**
+ * Factory method for create and configure HTML parser configuration. Create
+ * configuration for use in parsing, set nessesary features and properties
+ *
+ * @return
+ * @throws ServletException
+ */
+ protected HTMLConfiguration getHtmlConfig() {
+ HTMLConfiguration _config = new HTMLConfiguration();
+ try {
+ if (this.getPublicid() != null || this.getSystemid() != null) {
+ _config.setFeature(
+ "http://cyberneko.org/html/features/insert-doctype",
+ true);
+ _config.setFeature(
+ "http://cyberneko.org/html/features/override-doctype",
+ true);
+ }
+ if (this.getPublicid() != null) {
+ _config.setProperty(
+ "http://cyberneko.org/html/properties/doctype/pubid",
+ getPublicid());
- private String getPublicid() {
- // TODO Auto-generated method stub
- return this._publicId;
- }
+ }
+ if (this.getSystemid() != null) {
+ _config.setProperty(
+ "http://cyberneko.org/html/properties/doctype/sysid",
+ getSystemid());
- /**
- * @param namespace The namespace to set.
- */
- public void setNamespace(String namespace) {
- _namespace = namespace;
- }
+ }
+ if (this.getNamespace() != null) {
+ _config.setFeature("http://xml.org/sax/features/namespaces",
+ true);
+ _config
+ .setFeature(
+ "http://cyberneko.org/html/features/override-namespaces",
+ true);
+ _config.setFeature(
+ "http://cyberneko.org/html/features/insert-namespaces",
+ true);
+ _config.setProperty(
+ "http://cyberneko.org/html/properties/namespaces-uri",
+ getNamespace());
- /**
- * @param publicId The publicId to set.
- */
- public void setPublicId(String publicId) {
- _publicId = publicId;
- }
+ }
+ // config
+ // .setFeature(
+ // "http://cyberneko.org/html/features/balance-tags/ignore-outside-content",
+ // true);
+ _config
+ .setFeature(
+ "http://cyberneko.org/html/features/scanner/cdata-sections",
+ true);
+ _config
+ .setFeature(
+ "http://cyberneko.org/html/features/scanner/script/strip-comment-delims",
+ true);
+ _config
+ .setFeature(
+ "http://cyberneko.org/html/features/scanner/style/strip-comment-delims",
+ true);
+ _config.setFeature(
+ "http://cyberneko.org/html/features/insert-doctype", true);
+ _config.setFeature(
+ "http://cyberneko.org/html/features/insert-namespaces",
+ true);
+ //
+ // Set properties
+ // http://cyberneko.org/html/features/insert-namespaces
+ // _config
+ // .setProperty(
+ // "http://cyberneko.org/html/properties/default-encoding",
+ // encoding);
+ _config
+ .setProperty(
+ "http://cyberneko.org/html/properties/names/elems",
+ "lower");
+ _config
+ .setProperty(
+ "http://cyberneko.org/html/properties/names/attrs",
+ "lower");
+ _config.setProperty("http://cyberneko.org/html/properties/filters",
+ _filters);
+ } catch (XMLConfigurationException e) {
+ // throw new ServletException("error set Neko feature ", e);
+ }
+ return _config;
+ }
- /**
- * @param systemid The systemid to set.
- */
- public void setSystemid(String systemid) {
- _systemid = systemid;
- }
+ private String getNamespace() {
+ // TODO Auto-generated method stub
+ return this._namespace;
+ }
- public boolean setMime(String mimeType) {
- return false;
- }
+ private String getSystemid() {
+ // TODO Auto-generated method stub
+ return this._systemid;
+ }
+ private String getPublicid() {
+ // TODO Auto-generated method stub
+ return this._publicId;
+ }
+
+ /**
+ * @param namespace
+ * The namespace to set.
+ */
+ public void setNamespace(String namespace) {
+ _namespace = namespace;
+ }
+
+ /**
+ * @param publicId
+ * The publicId to set.
+ */
+ public void setPublicId(String publicId) {
+ _publicId = publicId;
+ }
+
+ /**
+ * @param systemid
+ * The systemid to set.
+ */
+ public void setSystemid(String systemid) {
+ _systemid = systemid;
+ }
+
+ public boolean setMime(String mimeType) {
+ return false;
+ }
+
}
Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java
===================================================================
--- branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java 2007-07-10 18:21:27 UTC (rev 306)
+++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java 2007-07-10 18:27:37 UTC (rev 307)
@@ -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.
*
@@ -35,7 +35,7 @@
* limitations under the License.
*/
/*
- * $Id: ToXHTMLStream.java,v 1.2 2006/10/24 13:25:09 alexsmirnov Exp $
+ * $Id: ToXHTMLStream.java,v 1.1.2.1 2007/01/09 18:57:19 alexsmirnov Exp $
*/
package org.ajax4jsf.xml.serializer;
@@ -77,7 +77,8 @@
*/
private static final CharInfo m_htmlcharInfo =
// new CharInfo(CharInfo.HTML_ENTITIES_RESOURCE);
- CharInfo.getCharInfo(CharInfo.HTML_ENTITIES_RESOURCE, Method.HTML);
+ // Asmirnov - disable HTML Entities.
+ CharInfo.getCharInfo(CharInfo.XML_ENTITIES_RESOURCE, Method.XHTML);
/** A digital search trie for fast, case insensitive lookup of ElemDesc objects. */
static final Trie m_elementFlags = new Trie();
@@ -538,6 +539,8 @@
*/
static private final ElemDesc m_dummy = new ElemDesc(0 | ElemDesc.BLOCK);
+ public static final String XHTML_NAMESPACE_URI = "http://www.w3.org/1999/xhtml";
+
/** True if URLs should be specially escaped with the %xx form. */
private boolean m_specialEscapeURLs = true;
@@ -838,7 +841,7 @@
// if this element has a namespace then treat it like XML
- if (null != namespaceURI && namespaceURI.length() > 0)
+ if (null != namespaceURI && namespaceURI.length() > 0 && (!XHTML_NAMESPACE_URI.equals(namespaceURI)))
{
super.startElement(namespaceURI, localName, name, atts);
@@ -952,7 +955,7 @@
closeCDATA();
// if the element has a namespace, treat it like XML, not HTML
- if (null != namespaceURI && namespaceURI.length() > 0)
+ if (null != namespaceURI && namespaceURI.length() > 0 && (!XHTML_NAMESPACE_URI.equals(namespaceURI)))
{
super.endElement(namespaceURI, localName, name);
Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/output_xhtml.properties
===================================================================
--- branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/output_xhtml.properties 2007-07-10 18:21:27 UTC (rev 306)
+++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/output_xhtml.properties 2007-07-10 18:27:37 UTC (rev 307)
@@ -14,7 +14,7 @@
# limitations under the License.
##########################################################################
#
-# $Id: output_xhtml.properties,v 1.1 2006/06/14 08:55:05 alexsmirnov Exp $
+# $Id: output_xhtml.properties,v 1.1.2.1 2007/01/10 19:33:38 alexsmirnov Exp $
#
# Specify defaults when method="html". These defaults use output_xml.properties
# as a base.
@@ -22,7 +22,8 @@
# XSLT properties do not need namespace qualification.
method=xhtml
-indent=yes
+indent=no
+omit-xml-declaration=yes
media-type=application/xml+xhtml
version=1.0
@@ -37,6 +38,8 @@
# Note that the colon after the protocol needs to be escaped.
{http\u003a//xml.apache.org/xalan}indent-amount=0
{http\u003a//xml.apache.org/xalan}content-handler=org.ajax4jsf.xml.serializer.ToXHTMLStream
-{http\u003a//xml.apache.org/xalan}entities=org/ajax4jsf/xml/serializer/HTMLEntities
+# XMLHttpRequest can't resolve HTTP entities.
+# {http\u003a//xml.apache.org/xalan}entities=org/ajax4jsf/xml/serializer/HTMLEntities
+{http\u003a//xml.apache.org/xalan}entities=org/ajax4jsf/xml/serializer/XMLEntities
{http\u003a//xml.apache.org/xalan}use-url-escaping=yes
{http\u003a//xml.apache.org/xalan}omit-meta-tag=yes
16 years, 9 months
- 1
- 0
JBoss Ajax4JSF SVN: r306 - in trunk/framework/src: main/java/org/ajax4jsf/xml/serializer and 2 other directories.
by ajax4jsf-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-07-10 14:21:27 -0400 (Tue, 10 Jul 2007)
New Revision: 306
Added:
trunk/framework/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekoParserTestCase.java
Modified:
trunk/framework/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekkoParser.java
trunk/framework/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java
trunk/framework/src/main/resources/org/ajax4jsf/xml/serializer/output_xhtml.properties
Log:
Fix NekoFilter output according to the HTML DTD
Modified: trunk/framework/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekkoParser.java
===================================================================
--- trunk/framework/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekkoParser.java 2007-07-09 18:34:57 UTC (rev 305)
+++ trunk/framework/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekkoParser.java 2007-07-10 18:21:27 UTC (rev 306)
@@ -68,582 +68,674 @@
/**
* @author shura
- *
+ *
*/
-public class NekkoParser implements HtmlParser {
+public class NekkoParser implements HtmlParser {
- private static final Log _log = LogFactory.getLog(NekkoParser.class);
-
- private HtmlSAXParser _parser;
-
-// private HtmlWriter _writer= new HtmlWriter();
-
- private ElementRemover remover = new ElementRemover();
-
- private XMLDocumentFilter[] _filters = { new ViewStateFilter()/*,remover */, new HtmlCorrectionFilter(), new Purifier() /*, _writer*/ };
+ private static final Log _log = LogFactory.getLog(NekkoParser.class);
- private DOMFragmentParser viewStateParser ;//= new DOMFragmentParser();
+ private HtmlSAXParser _parser;
- private Document viewStateDocument ;//= new HTMLDocumentImpl();
+ // private HtmlWriter _writer= new HtmlWriter();
- private DocumentFragment fragment = null;
+ private ElementRemover remover = new ElementRemover();
- private Set _scripts;
-
- private Set _styles;
-
- private String _viewState;
-
- private String _encoding;
+ private XMLDocumentFilter[] _filters = {
+ new ViewStateFilter()/* ,remover */, new HtmlCorrectionFilter(),
+ new Purifier() /* , _writer */};
- private Serializer _serializer;
+ private DOMFragmentParser viewStateParser;// = new DOMFragmentParser();
- 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";
+ private Document viewStateDocument;// = new HTMLDocumentImpl();
- private String _outputEncoding;
- /**
- *
- */
- 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);
-// serializer.setOutputStream(output);
-// _parser.setContentHandler(serializer.asContentHandler());
- viewStateParser = new DOMFragmentParser();
- // Set parser features
- try {
- viewStateParser.setProperty(
- "http://cyberneko.org/html/properties/names/elems",
- "lower");
- viewStateParser.setProperty(
- "http://cyberneko.org/html/properties/names/attrs",
- "lower");
- } catch (SAXException e) {
- _log.error("Exception in DOM parser configuration", e);
- }
- try {
- // Create Document Builder Factory
- DocumentBuilderFactory docFactory = DocumentBuilderFactory
- .newInstance();
- // Create Document Builder
- DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
- viewStateDocument = docBuilder.newDocument();
- } catch (ParserConfigurationException e) {
- viewStateDocument = new HTMLDocumentImpl();
- _log.error("Error on create DOM Document by JAXP, use Xerxes implementation. Check JAXP configuration ",e);
- }
-// viewStateDocument = new HTMLDocumentImpl();
- remover.removeElement("style");
+ private DocumentFragment fragment = null;
+
+ private Set _scripts;
+
+ private Set _styles;
+
+ private String _viewState;
+
+ private String _encoding;
+
+ private Serializer _serializer;
+
+ 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";
+
+ private String _outputEncoding;
+
+ /**
+ *
+ */
+ 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);
+ // serializer.setOutputStream(output);
+ // _parser.setContentHandler(serializer.asContentHandler());
+ viewStateParser = new DOMFragmentParser();
+ // Set parser features
+ try {
+ viewStateParser
+ .setProperty(
+ "http://cyberneko.org/html/properties/names/elems",
+ "lower");
+ viewStateParser
+ .setProperty(
+ "http://cyberneko.org/html/properties/names/attrs",
+ "lower");
+ } catch (SAXException e) {
+ _log.error("Exception in DOM parser configuration", e);
}
-
- /**
- * Reset parser state
- */
- public void reset(){
- _scripts=null;
- _styles=null;
- _viewState=null;
- _parser.reset();
- _serializer.reset();
+ try {
+ // Create Document Builder Factory
+ DocumentBuilderFactory docFactory = DocumentBuilderFactory
+ .newInstance();
+ // Create Document Builder
+ DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+ viewStateDocument = docBuilder.newDocument();
+ } catch (ParserConfigurationException e) {
+ viewStateDocument = new HTMLDocumentImpl();
+ _log
+ .error(
+ "Error on create DOM Document by JAXP, use Xerxes implementation. Check JAXP configuration ",
+ e);
}
+ // viewStateDocument = new HTMLDocumentImpl();
+ remover.removeElement("style");
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#parseHtml(java.io.InputStream, java.io.OutputStream)
- */
- public void parseHtml(InputStream input, java.io.Writer output)
- throws IOException {
- InputSource src = new InputSource(input);
- parseSAXSource(src,output);
- }
+ /**
+ * Reset parser state
+ */
+ public void reset() {
+ _scripts = null;
+ _styles = null;
+ _viewState = null;
+ _parser.reset();
+ _serializer.reset();
+ }
- private void parseSAXSource(InputSource src, java.io.Writer output) throws IOException {
-// PrintWriter printWriter = null;
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#parseHtml(java.io.InputStream,
+ * java.io.OutputStream)
+ */
+ public void parseHtml(InputStream input, java.io.Writer output)
+ throws IOException {
+ InputSource src = new InputSource(input);
+ parseSAXSource(src, output);
+ }
+
+ private void parseSAXSource(InputSource src, java.io.Writer output)
+ throws IOException {
+ // PrintWriter printWriter = null;
+ fragment = null;
+ if (null != _viewState) {
+ fragment = viewStateDocument.createDocumentFragment();
+ try {
+ viewStateParser.parse(new InputSource(new StringReader(
+ _viewState)), fragment);
+ } catch (Exception e) {
fragment = null;
- if(null != _viewState){
- fragment = viewStateDocument.createDocumentFragment();
- try {
- viewStateParser.parse(new InputSource(new StringReader(
- _viewState)), fragment);
- } catch (Exception e) {
- fragment = null;
- }
- // TODO - parse view state to DOM Fragment.
- }
- try {
- _parser.setProperty("http://cyberneko.org/html/properties/default-encoding",
- _encoding);
- Properties properties = _serializer.getOutputFormat();
- properties.put("encoding",_outputEncoding);
- _serializer.setOutputFormat(properties);
- _serializer.setWriter(output);
-// _serializer.setOutputStream(new OutputStream(){
-//
-// public void write(int b) throws IOException {
-// // TODO Auto-generated method stub
-//
-// }});
- _parser.setContentHandler(_serializer.asContentHandler());
-// printWriter = new PrintWriter(output);
-// _writer.setWriter(printWriter);
-// _writer.setEncoding(_encoding);
- _parser.parse(src);
- } catch (SAXException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } finally {
-// _writer.setWriter(null);
-// if(null != printWriter){
-// printWriter.flush();
-// printWriter.close();
-// }
-
- }
-
+ }
+ // TODO - parse view state to DOM Fragment.
}
+ try {
+ if (null != _encoding) {
+ _parser
+ .setProperty(
+ "http://cyberneko.org/html/properties/default-encoding",
+ _encoding);
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#parseHtml(java.io.Reader, java.io.OutputStream)
- */
- public void parseHtml(Reader input, java.io.Writer output) throws IOException {
- InputSource src = new InputSource(input);
- parseSAXSource(src,output);
- }
+ }
+ Properties properties = _serializer.getOutputFormat();
+ if (null != _outputEncoding) {
+ properties.put("encoding", _outputEncoding);
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setEncoding(java.lang.String)
- */
- public void setInputEncoding(String encoding) {
- _encoding = encoding;
- }
+ }
+ _serializer.setOutputFormat(properties);
+ _serializer.setWriter(output);
+ // _serializer.setOutputStream(new OutputStream(){
+ //
+ // public void write(int b) throws IOException {
+ // // TODO Auto-generated method stub
+ //
+ // }});
+ _parser.setContentHandler(_serializer.asContentHandler());
+ // printWriter = new PrintWriter(output);
+ // _writer.setWriter(printWriter);
+ // _writer.setEncoding(_encoding);
+ _parser.parse(src);
+ } catch (SAXException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } finally {
+ // _writer.setWriter(null);
+ // if(null != printWriter){
+ // printWriter.flush();
+ // printWriter.close();
+ // }
- public void setOutputEncoding(String encoding) {
- _outputEncoding = encoding;
}
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setMoveElements(boolean)
- */
- public void setMoveElements(boolean move) {
- // TODO Auto-generated method stub
- }
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setScripts(java.util.Set)
- */
- public void setScripts(Set scripts) {
- _scripts = scripts;
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#parseHtml(java.io.Reader,
+ * java.io.OutputStream)
+ */
+ public void parseHtml(Reader input, java.io.Writer output)
+ throws IOException {
+ InputSource src = new InputSource(input);
+ parseSAXSource(src, output);
+ }
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setEncoding(java.lang.String)
+ */
+ public void setInputEncoding(String encoding) {
+ _encoding = encoding;
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setStyles(java.util.Set)
- */
- public void setStyles(Set styles) {
- _styles = styles;
+ public void setOutputEncoding(String encoding) {
+ _outputEncoding = encoding;
+ }
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setMoveElements(boolean)
+ */
+ public void setMoveElements(boolean move) {
+ // TODO Auto-generated method stub
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setDoctype(java.lang.String)
- */
- public void setDoctype(String doctype) {
- this._publicId = doctype;
+ }
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setScripts(java.util.Set)
+ */
+ public void setScripts(Set scripts) {
+ _scripts = scripts;
- /* (non-Javadoc)
- * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setViewState(java.lang.String)
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setStyles(java.util.Set)
+ */
+ public void setStyles(Set styles) {
+ _styles = styles;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setDoctype(java.lang.String)
+ */
+ public void setDoctype(String doctype) {
+ this._publicId = doctype;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser#setViewState(java.lang.String)
+ */
+ public void setViewState(String viewState) {
+ _viewState = viewState;
+
+ }
+
+ private static class HtmlSAXParser extends AbstractSAXParser {
+ /**
+ * Default constructor.
+ *
+ * @throws ServletException
*/
- public void setViewState(String viewState) {
- _viewState = viewState;
+ public HtmlSAXParser(HTMLConfiguration config) {
+ super(config);
}
-
- private static class HtmlSAXParser extends AbstractSAXParser {
- /** Default constructor.
- * @throws ServletException */
- public HtmlSAXParser(HTMLConfiguration config) {
- super(config);
-
- }
- }
-
- private class ViewStateFilter extends DefaultFilter{
- private boolean haveHtml = false;
- private boolean haveHead = false;
- private boolean headParsed = false;
- private int stateMarkerLevel = -1;
+ }
+ private class ViewStateFilter extends DefaultFilter {
+ private boolean haveHtml = false;
+ private boolean haveHead = false;
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#reset(org.apache.xerces.xni.parser.XMLComponentManager)
- */
- public void reset(XMLComponentManager componentManager) throws XMLConfigurationException {
- haveHead = false;
- haveHtml = false;
- headParsed = false;
- stateMarkerLevel = -1;
- super.reset(componentManager);
- }
+ private boolean headParsed = false;
+ private int stateMarkerLevel = -1;
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#startElement(org.apache.xerces.xni.QName, org.apache.xerces.xni.XMLAttributes, org.apache.xerces.xni.Augmentations)
- */
- public void startElement(QName element, XMLAttributes attributes, Augmentations augs) throws XNIException {
- if(stateMarkerLevel >=0){
- stateMarkerLevel++;
- if(null != fragment){
- return;
- }
- }
- if (!headParsed) {
- if("html".equalsIgnoreCase(element.rawname)){
- haveHtml = true;
- } else if("head".equalsIgnoreCase(element.rawname)){
- haveHead = true;
- super.startElement(element, attributes, augs);
- insertResources();
- return;
- } else {
- if(!haveHtml){
- insertStartElement("html");
- }
- insertStartElement("head");
- insertResources();
- insertEndElement("head");
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#reset(org.apache.xerces.xni.parser.XMLComponentManager)
+ */
+ public void reset(XMLComponentManager componentManager)
+ throws XMLConfigurationException {
+ haveHead = false;
+ haveHtml = false;
+ headParsed = false;
+ stateMarkerLevel = -1;
+ super.reset(componentManager);
+ }
- }
- if(isStateMarker(element, attributes)){
- stateMarkerLevel = 0;
- return;
- };
- super.startElement(element, attributes, augs);
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#startElement(org.apache.xerces.xni.QName,
+ * org.apache.xerces.xni.XMLAttributes,
+ * org.apache.xerces.xni.Augmentations)
+ */
+ public void startElement(QName element, XMLAttributes attributes,
+ Augmentations augs) throws XNIException {
+ if (stateMarkerLevel >= 0) {
+ stateMarkerLevel++;
+ if (null != fragment) {
+ return;
}
+ }
+ if (!headParsed) {
+ if ("html".equalsIgnoreCase(element.rawname)) {
+ haveHtml = true;
+ } else if ("head".equalsIgnoreCase(element.rawname)) {
+ haveHead = true;
+ super.startElement(element, attributes, augs);
+ insertResources();
+ return;
+ } else {
+ if (!haveHtml) {
+ insertStartElement("html");
+ }
+ insertStartElement("head");
+ insertResources();
+ insertEndElement("head");
+ }
+ }
+ if (isStateMarker(element, attributes)) {
+ stateMarkerLevel = 0;
+ return;
+ }
+ ;
+ super.startElement(element, attributes, augs);
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#characters(org.apache.xerces.xni.XMLString, org.apache.xerces.xni.Augmentations)
- */
- public void characters(XMLString text, Augmentations augs) throws XNIException {
- if(stateMarkerLevel >=0){
- if(null != fragment){
- return;
- }
- }
- super.characters(text, augs);
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#characters(org.apache.xerces.xni.XMLString,
+ * org.apache.xerces.xni.Augmentations)
+ */
+ public void characters(XMLString text, Augmentations augs)
+ throws XNIException {
+ if (stateMarkerLevel >= 0) {
+ if (null != fragment) {
+ return;
}
+ }
+ super.characters(text, augs);
+ }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#endElement(org.apache.xerces.xni.QName,
+ * org.apache.xerces.xni.Augmentations)
+ */
+ public void endElement(QName element, Augmentations augs)
+ throws XNIException {
+ if (stateMarkerLevel >= 0) {
+ stateMarkerLevel--;
+ if (null != fragment || stateMarkerLevel == -1) {
+ return;
+ }
+ }
+ super.endElement(element, augs);
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#endElement(org.apache.xerces.xni.QName, org.apache.xerces.xni.Augmentations)
- */
- public void endElement(QName element, Augmentations augs) throws XNIException {
- if(stateMarkerLevel >=0){
- stateMarkerLevel--;
- if(null != fragment || stateMarkerLevel == -1){
- return;
- }
- }
- super.endElement(element, augs);
+ private void insertResources() {
+ headParsed = true;
+ if (null != _styles) {
+ for (Iterator iter = _styles.iterator(); iter.hasNext();) {
+ String style = (String) iter.next();
+ QName element = new QName(null, "link", "link", null);
+ XMLAttributes attrs = new XMLAttributesImpl();
+ attrs.addAttribute(new QName(null, "href", "href", null),
+ "CDATA", style);
+ attrs.addAttribute(new QName(null, "type", "type", null),
+ "CDATA", "text/css");
+ attrs.addAttribute(new QName(null, "rel", "rel", null),
+ "CDATA", "stylesheet");
+ Augmentations augs = new HTMLAugmentations();
+ super.emptyElement(element, attrs, augs);
}
+ }
+ if (null != _scripts) {
+ for (Iterator iter = _scripts.iterator(); iter.hasNext();) {
+ String script = (String) iter.next();
+ QName element = new QName(null, "script", "script", null);
+ XMLAttributes attrs = new XMLAttributesImpl();
+ attrs.addAttribute(new QName(null, "src", "src", null),
+ "CDATA", script);
+ attrs.addAttribute(new QName(null, "type", "type", null),
+ "CDATA", "text/javascript");
+ Augmentations augs = new HTMLAugmentations();
+ super.startElement(element, attrs, augs);
+ super.endElement(element, augs);
+ }
+ }
+ }
- private void insertResources() {
- headParsed = true;
- if(null != _styles){
- for (Iterator iter = _styles.iterator(); iter.hasNext();) {
- String style = (String) iter.next();
- QName element = new QName(null,"link","link",null);
- XMLAttributes attrs = new XMLAttributesImpl();
- attrs.addAttribute(new QName(null,"href","href",null), "CDATA", style);
- attrs.addAttribute(new QName(null,"type","type",null), "CDATA", "text/css");
- attrs.addAttribute(new QName(null,"rel","rel",null), "CDATA", "stylesheet");
- Augmentations augs = new HTMLAugmentations();
- super.emptyElement(element,attrs,augs);
- }
- }
- if(null != _scripts){
- for (Iterator iter = _scripts.iterator(); iter.hasNext();) {
- String script = (String) iter.next();
- QName element = new QName(null,"script","script",null);
- XMLAttributes attrs = new XMLAttributesImpl();
- attrs.addAttribute(new QName(null,"src","src",null), "CDATA", script);
- attrs.addAttribute(new QName(null,"type","type",null), "CDATA", "text/javascript");
- Augmentations augs = new HTMLAugmentations();
- super.startElement(element,attrs,augs);
- super.endElement(element, augs);
- }
- }
-
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#emptyElement(org.apache.xerces.xni.QName,
+ * org.apache.xerces.xni.XMLAttributes,
+ * org.apache.xerces.xni.Augmentations)
+ */
+ public void emptyElement(QName name, XMLAttributes attributes,
+ Augmentations augmentation) throws XNIException {
+ if (stateMarkerLevel >= 0) {
+ if (null != fragment) {
+ return;
}
+ }
+ if (!headParsed) {
+ if ("head".equalsIgnoreCase(name.rawname)) {
+ haveHead = true;
+ super.startElement(name, attributes, augmentation);
+ insertResources();
+ insertEndElement(name.rawname);
+ return;
+ }
+ }
+ if (isStateMarker(name, attributes)) {
+ return;
+ }
+ ;
+ super.emptyElement(name, attributes, augmentation);
+ }
-
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#emptyElement(org.apache.xerces.xni.QName, org.apache.xerces.xni.XMLAttributes, org.apache.xerces.xni.Augmentations)
- */
- public void emptyElement(QName name, XMLAttributes attributes, Augmentations augmentation) throws XNIException {
- if(stateMarkerLevel >=0){
- if(null != fragment){
- return;
- }
- }
- if (!headParsed) {
- if("head".equalsIgnoreCase(name.rawname)){
- haveHead = true;
- super.startElement(name, attributes, augmentation);
- insertResources();
- insertEndElement(name.rawname);
- return;
- }
- }
- if(isStateMarker(name, attributes)){
- return;
- };
- super.emptyElement(name, attributes, augmentation);
+ /**
+ * @param name
+ * @param attributes
+ */
+ private boolean isStateMarker(QName name, XMLAttributes attributes) {
+ if (name.rawname.equalsIgnoreCase("span")
+ && AjaxViewHandler.STATE_MARKER_KEY.equals(attributes
+ .getValue("id"))) {
+ // STATE marker element - out real content.
+ if (null != fragment) {
+ try {
+ _serializer.asDOMSerializer().serialize(fragment);
+ } catch (IOException e) {
+ // Break output.
+ }
}
+ return true;
+ }
+ return false;
+ }
+ void insertStartElement(String name) {
+ QName element = new QName(null, name, name, null);
+ XMLAttributes attrs = new XMLAttributesImpl();
+ Augmentations augs = new HTMLAugmentations();
+ super.startElement(element, attrs, augs);
+ }
- /**
- * @param name
- * @param attributes
- */
- private boolean isStateMarker(QName name, XMLAttributes attributes) {
- if(name.rawname.equalsIgnoreCase("span") && AjaxViewHandler.STATE_MARKER_KEY.equals(attributes.getValue("id"))){
- // STATE marker element - out real content.
- if(null != fragment){
- try {
- _serializer.asDOMSerializer().serialize(fragment);
- } catch (IOException e) {
- // Break output.
- }
- }
- return true;
- }
- return false;
- }
-
- void insertStartElement(String name) {
- QName element = new QName(null,name,name,null);
- XMLAttributes attrs = new XMLAttributesImpl();
- Augmentations augs = new HTMLAugmentations();
- super.startElement(element,attrs,augs);
- }
-
-
- void insertEndElement(String name) {
- QName element = new QName(null,name,name,null);
-// XMLAttributes attrs = new XMLAttributesImpl();
- Augmentations augs = new HTMLAugmentations();
- super.endElement(element,augs);
- }
+ void insertEndElement(String name) {
+ QName element = new QName(null, name, name, null);
+ // XMLAttributes attrs = new XMLAttributesImpl();
+ Augmentations augs = new HTMLAugmentations();
+ super.endElement(element, augs);
+ }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#endDocument(org.apache.xerces.xni.Augmentations)
+ */
+ public void endDocument(Augmentations augs) throws XNIException {
+ if (!haveHtml) {
+ insertEndElement("html");
+ }
+ super.endDocument(augs);
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#endDocument(org.apache.xerces.xni.Augmentations)
- */
- public void endDocument(Augmentations augs) throws XNIException {
- if (!haveHtml) {
- insertEndElement("html");
- }
- super.endDocument(augs);
- }
-
-
+ }
+ private static class HtmlWriter extends Writer {
+
+ /**
+ *
+ */
+ public HtmlWriter() {
+ super();
+ fEncoding = "UTF-8";
}
- private static class HtmlWriter extends Writer {
+ public void setEncoding(String encoding) {
+ this.fEncoding = encoding;
+ }
- /**
- *
- */
- public HtmlWriter() {
- super();
- fEncoding = "UTF-8";
- }
-
- public void setEncoding(String encoding){
- this.fEncoding = encoding;
- }
-
- public void setWriter( PrintWriter writer){
- this.fPrinter = writer;
- }
+ public void setWriter(PrintWriter writer) {
+ this.fPrinter = writer;
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.Writer#emptyElement(org.apache.xerces.xni.QName, org.apache.xerces.xni.XMLAttributes, org.apache.xerces.xni.Augmentations)
- */
- public void emptyElement(QName element, XMLAttributes attributes, Augmentations augs) throws XNIException {
- // TODO Auto-generated method stub
- super.emptyElement(element, attributes, augs);
- printEndElement(element);
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.Writer#emptyElement(org.apache.xerces.xni.QName,
+ * org.apache.xerces.xni.XMLAttributes,
+ * org.apache.xerces.xni.Augmentations)
+ */
+ public void emptyElement(QName element, XMLAttributes attributes,
+ Augmentations augs) throws XNIException {
+ // TODO Auto-generated method stub
+ super.emptyElement(element, attributes, augs);
+ printEndElement(element);
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#endCDATA(org.apache.xerces.xni.Augmentations)
- */
- public void endCDATA(Augmentations augs) throws XNIException {
- // TODO Auto-generated method stub
- super.endCDATA(augs);
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#endCDATA(org.apache.xerces.xni.Augmentations)
+ */
+ public void endCDATA(Augmentations augs) throws XNIException {
+ // TODO Auto-generated method stub
+ super.endCDATA(augs);
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#startCDATA(org.apache.xerces.xni.Augmentations)
- */
- public void startCDATA(Augmentations augs) throws XNIException {
- // TODO Auto-generated method stub
- super.startCDATA(augs);
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#startCDATA(org.apache.xerces.xni.Augmentations)
+ */
+ public void startCDATA(Augmentations augs) throws XNIException {
+ // TODO Auto-generated method stub
+ super.startCDATA(augs);
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#textDecl(java.lang.String, java.lang.String, org.apache.xerces.xni.Augmentations)
- */
- public void textDecl(String version, String encoding, Augmentations augs) throws XNIException {
- // TODO Auto-generated method stub
- super.textDecl(version, encoding, augs);
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#textDecl(java.lang.String,
+ * java.lang.String, org.apache.xerces.xni.Augmentations)
+ */
+ public void textDecl(String version, String encoding, Augmentations augs)
+ throws XNIException {
+ // TODO Auto-generated method stub
+ super.textDecl(version, encoding, augs);
+ }
- /* (non-Javadoc)
- * @see org.cyberneko.html.filters.DefaultFilter#xmlDecl(java.lang.String, java.lang.String, java.lang.String, org.apache.xerces.xni.Augmentations)
- */
- public void xmlDecl(String version, String encoding, String standalone, Augmentations augs) throws XNIException {
- // TODO Auto-generated method stub
- super.xmlDecl(version, encoding, standalone, augs);
- }
-
-
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.cyberneko.html.filters.DefaultFilter#xmlDecl(java.lang.String,
+ * java.lang.String, java.lang.String,
+ * org.apache.xerces.xni.Augmentations)
+ */
+ public void xmlDecl(String version, String encoding, String standalone,
+ Augmentations augs) throws XNIException {
+ // TODO Auto-generated method stub
+ super.xmlDecl(version, encoding, standalone, augs);
}
- /**
- * Factory method for create and configure HTML parser configuration.
- * Create configuration for use in parsing, set nessesary features and properties
- * @return
- * @throws ServletException
- */
- protected HTMLConfiguration getHtmlConfig() {
- HTMLConfiguration _config = new HTMLConfiguration();
- try {
- if (this.getPublicid() != null || this.getSystemid() != null) {
- _config.setFeature(
- "http://cyberneko.org/html/features/insert-doctype",
- true);
- _config.setFeature(
- "http://cyberneko.org/html/features/override-doctype",
- true);
- }
- if (this.getPublicid() != null) {
- _config.setProperty(
- "http://cyberneko.org/html/properties/doctype/pubid",
- getPublicid());
-
- }
- if (this.getSystemid() != null) {
- _config.setProperty(
- "http://cyberneko.org/html/properties/doctype/sysid",
- getSystemid());
-
- }
- if (this.getNamespace() != null) {
- _config.setFeature(
- "http://xml.org/sax/features/namespaces",
- true);
- _config.setFeature(
- "http://cyberneko.org/html/features/override-namespaces",
- true);
- _config.setFeature(
- "http://cyberneko.org/html/features/insert-namespaces",
- true);
- _config.setProperty(
- "http://cyberneko.org/html/properties/namespaces-uri",
- getNamespace());
-
- }
- // config
- // .setFeature(
- // "http://cyberneko.org/html/features/balance-tags/ignore-outside-content",
- // true);
- _config
- .setFeature(
- "http://cyberneko.org/html/features/scanner/cdata-sections",
- true);
- _config
- .setFeature(
- "http://cyberneko.org/html/features/scanner/script/strip-comment-delims",
- true);
- _config
- .setFeature(
- "http://cyberneko.org/html/features/scanner/style/strip-comment-delims",
- true);
- _config.setFeature(
- "http://cyberneko.org/html/features/insert-doctype",
- true);
- _config.setFeature(
- "http://cyberneko.org/html/features/insert-namespaces",
- true);
- //
- // Set properties http://cyberneko.org/html/features/insert-namespaces
- // _config
- // .setProperty(
- // "http://cyberneko.org/html/properties/default-encoding",
- // encoding);
- _config.setProperty(
- "http://cyberneko.org/html/properties/names/elems",
- "lower");
- _config.setProperty(
- "http://cyberneko.org/html/properties/names/attrs",
- "lower");
- _config.setProperty("http://cyberneko.org/html/properties/filters", _filters);
- } catch (XMLConfigurationException e) {
-// throw new ServletException("error set Neko feature ", e);
- }
- return _config;
- }
- private String getNamespace() {
- // TODO Auto-generated method stub
- return this._namespace;
- }
+ }
- private String getSystemid() {
- // TODO Auto-generated method stub
- return this._systemid;
- }
+ /**
+ * Factory method for create and configure HTML parser configuration. Create
+ * configuration for use in parsing, set nessesary features and properties
+ *
+ * @return
+ * @throws ServletException
+ */
+ protected HTMLConfiguration getHtmlConfig() {
+ HTMLConfiguration _config = new HTMLConfiguration();
+ try {
+ if (this.getPublicid() != null || this.getSystemid() != null) {
+ _config.setFeature(
+ "http://cyberneko.org/html/features/insert-doctype",
+ true);
+ _config.setFeature(
+ "http://cyberneko.org/html/features/override-doctype",
+ true);
+ }
+ if (this.getPublicid() != null) {
+ _config.setProperty(
+ "http://cyberneko.org/html/properties/doctype/pubid",
+ getPublicid());
- private String getPublicid() {
- // TODO Auto-generated method stub
- return this._publicId;
- }
+ }
+ if (this.getSystemid() != null) {
+ _config.setProperty(
+ "http://cyberneko.org/html/properties/doctype/sysid",
+ getSystemid());
- /**
- * @param namespace The namespace to set.
- */
- public void setNamespace(String namespace) {
- _namespace = namespace;
- }
+ }
+ if (this.getNamespace() != null) {
+ _config.setFeature("http://xml.org/sax/features/namespaces",
+ true);
+ _config
+ .setFeature(
+ "http://cyberneko.org/html/features/override-namespaces",
+ true);
+ _config.setFeature(
+ "http://cyberneko.org/html/features/insert-namespaces",
+ true);
+ _config.setProperty(
+ "http://cyberneko.org/html/properties/namespaces-uri",
+ getNamespace());
- /**
- * @param publicId The publicId to set.
- */
- public void setPublicId(String publicId) {
- _publicId = publicId;
- }
+ }
+ // config
+ // .setFeature(
+ // "http://cyberneko.org/html/features/balance-tags/ignore-outside-content",
+ // true);
+ _config
+ .setFeature(
+ "http://cyberneko.org/html/features/scanner/cdata-sections",
+ true);
+ _config
+ .setFeature(
+ "http://cyberneko.org/html/features/scanner/script/strip-comment-delims",
+ true);
+ _config
+ .setFeature(
+ "http://cyberneko.org/html/features/scanner/style/strip-comment-delims",
+ true);
+ _config.setFeature(
+ "http://cyberneko.org/html/features/insert-doctype", true);
+ _config.setFeature(
+ "http://cyberneko.org/html/features/insert-namespaces",
+ true);
+ //
+ // Set properties
+ // http://cyberneko.org/html/features/insert-namespaces
+ // _config
+ // .setProperty(
+ // "http://cyberneko.org/html/properties/default-encoding",
+ // encoding);
+ _config
+ .setProperty(
+ "http://cyberneko.org/html/properties/names/elems",
+ "lower");
+ _config
+ .setProperty(
+ "http://cyberneko.org/html/properties/names/attrs",
+ "lower");
+ _config.setProperty("http://cyberneko.org/html/properties/filters",
+ _filters);
+ } catch (XMLConfigurationException e) {
+ // throw new ServletException("error set Neko feature ", e);
+ }
+ return _config;
+ }
- /**
- * @param systemid The systemid to set.
- */
- public void setSystemid(String systemid) {
- _systemid = systemid;
- }
+ private String getNamespace() {
+ // TODO Auto-generated method stub
+ return this._namespace;
+ }
- public boolean setMime(String mimeType) {
- return false;
- }
+ private String getSystemid() {
+ // TODO Auto-generated method stub
+ return this._systemid;
+ }
+ private String getPublicid() {
+ // TODO Auto-generated method stub
+ return this._publicId;
+ }
+
+ /**
+ * @param namespace
+ * The namespace to set.
+ */
+ public void setNamespace(String namespace) {
+ _namespace = namespace;
+ }
+
+ /**
+ * @param publicId
+ * The publicId to set.
+ */
+ public void setPublicId(String publicId) {
+ _publicId = publicId;
+ }
+
+ /**
+ * @param systemid
+ * The systemid to set.
+ */
+ public void setSystemid(String systemid) {
+ _systemid = systemid;
+ }
+
+ public boolean setMime(String mimeType) {
+ return false;
+ }
+
}
Modified: trunk/framework/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java
===================================================================
--- trunk/framework/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java 2007-07-09 18:34:57 UTC (rev 305)
+++ trunk/framework/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java 2007-07-10 18:21:27 UTC (rev 306)
@@ -77,7 +77,8 @@
*/
private static final CharInfo m_htmlcharInfo =
// new CharInfo(CharInfo.HTML_ENTITIES_RESOURCE);
- CharInfo.getCharInfo(CharInfo.HTML_ENTITIES_RESOURCE, Method.HTML);
+ // Asmirnov - disable HTML Entities.
+ CharInfo.getCharInfo(CharInfo.XML_ENTITIES_RESOURCE, Method.XHTML);
/** A digital search trie for fast, case insensitive lookup of ElemDesc objects. */
static final Trie m_elementFlags = new Trie();
@@ -538,6 +539,8 @@
*/
static private final ElemDesc m_dummy = new ElemDesc(0 | ElemDesc.BLOCK);
+ public static final String XHTML_NAMESPACE_URI = "http://www.w3.org/1999/xhtml";
+
/** True if URLs should be specially escaped with the %xx form. */
private boolean m_specialEscapeURLs = true;
@@ -838,7 +841,7 @@
// if this element has a namespace then treat it like XML
- if (null != namespaceURI && namespaceURI.length() > 0)
+ if (null != namespaceURI && namespaceURI.length() > 0 && (!XHTML_NAMESPACE_URI.equals(namespaceURI)))
{
super.startElement(namespaceURI, localName, name, atts);
@@ -952,7 +955,7 @@
closeCDATA();
// if the element has a namespace, treat it like XML, not HTML
- if (null != namespaceURI && namespaceURI.length() > 0)
+ if (null != namespaceURI && namespaceURI.length() > 0 && (!XHTML_NAMESPACE_URI.equals(namespaceURI)))
{
super.endElement(namespaceURI, localName, name);
Modified: trunk/framework/src/main/resources/org/ajax4jsf/xml/serializer/output_xhtml.properties
===================================================================
--- trunk/framework/src/main/resources/org/ajax4jsf/xml/serializer/output_xhtml.properties 2007-07-09 18:34:57 UTC (rev 305)
+++ trunk/framework/src/main/resources/org/ajax4jsf/xml/serializer/output_xhtml.properties 2007-07-10 18:21:27 UTC (rev 306)
@@ -22,7 +22,8 @@
# XSLT properties do not need namespace qualification.
method=xhtml
-indent=yes
+indent=no
+omit-xml-declaration=yes
media-type=application/xml+xhtml
version=1.0
@@ -37,6 +38,8 @@
# Note that the colon after the protocol needs to be escaped.
{http\u003a//xml.apache.org/xalan}indent-amount=0
{http\u003a//xml.apache.org/xalan}content-handler=org.ajax4jsf.xml.serializer.ToXHTMLStream
-{http\u003a//xml.apache.org/xalan}entities=org/ajax4jsf/xml/serializer/HTMLEntities
+# XMLHttpRequest can't resolve HTTP entities.
+# {http\u003a//xml.apache.org/xalan}entities=org/ajax4jsf/xml/serializer/HTMLEntities
+{http\u003a//xml.apache.org/xalan}entities=org/ajax4jsf/xml/serializer/XMLEntities
{http\u003a//xml.apache.org/xalan}use-url-escaping=yes
{http\u003a//xml.apache.org/xalan}omit-meta-tag=yes
Added: trunk/framework/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekoParserTestCase.java
===================================================================
--- trunk/framework/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekoParserTestCase.java (rev 0)
+++ trunk/framework/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/nekko/NekoParserTestCase.java 2007-07-10 18:21:27 UTC (rev 306)
@@ -0,0 +1,55 @@
+/**
+ *
+ */
+package org.ajax4jsf.framework.ajax.xmlfilter.nekko;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import junit.framework.TestCase;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class NekoParserTestCase extends TestCase {
+
+ private NekkoParser parser;
+
+ /**
+ * @param name
+ */
+ public NekoParserTestCase(String name) {
+ super(name);
+ }
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+ parser = new NekkoParser();
+ }
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#tearDown()
+ */
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ parser = null;
+ }
+
+ /**
+ * Test method for {@link org.ajax4jsf.framework.ajax.xmlfilter.nekko.NekkoParser#parseHtml(java.io.Reader, java.io.Writer)}.
+ * @throws IOException
+ */
+ public void testParseHtmlReaderWriter() throws IOException {
+ String html = "<html><head/><body><div/><span></span><br><iframe></iframe><iframe/><div></body>";
+ StringReader reader = new StringReader(html);
+ StringWriter out = new StringWriter();
+ parser.parseHtml(reader, out);
+ System.out.println(out.toString());
+ }
+
+}
16 years, 9 months
- 1
- 0
JBoss Ajax4JSF SVN: r305 - in branches/version_1_0_7/src/framework/java/org/ajax4jsf: framework/ajax and 6 other directories.
by ajax4jsf-svn-commits＠lists.jboss.org
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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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(a)w3.org </a>
* @author Andy Quick <a href="mailto:ac.quick@sympatico.ca">ac.quick(a)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
{
16 years, 9 months
- 1
- 0
JBoss Ajax4JSF SVN: r304 - trunk/docs/userguide/en/src/main/docbook/modules.
by ajax4jsf-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-07-09 09:55:22 -0400 (Mon, 09 Jul 2007)
New Revision: 304
Modified:
trunk/docs/userguide/en/src/main/docbook/modules/a4jUGlinks.xml
Log:
http://jira.jboss.com/jira/browse/RF-429
Modified: trunk/docs/userguide/en/src/main/docbook/modules/a4jUGlinks.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/a4jUGlinks.xml 2007-07-09 13:37:48 UTC (rev 303)
+++ trunk/docs/userguide/en/src/main/docbook/modules/a4jUGlinks.xml 2007-07-09 13:55:22 UTC (rev 304)
@@ -58,7 +58,7 @@
<row>
<entry>Ajax4jsf/RichFaces Blog</entry>
<entry>
- <ulink url="http://jroller.com/page/a4j">http://jroller.com/page/a4j</ulink>
+ <ulink url="http://jroller.com/page/a4j">Ajax4jsf/RichFaces Blog</ulink>
</entry>
</row>
</tbody>
16 years, 9 months
- 1
- 0