You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2008/04/04 05:05:42 UTC
svn commit: r644590 - in
/cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon:
components/ components/NekoHtmlSaxParser.java
generation/NekoHTMLGenerator.java transformation/NekoHTMLTransformer.java
Author: joerg
Date: Thu Apr 3 20:05:40 2008
New Revision: 644590
URL: http://svn.apache.org/viewvc?rev=644590&view=rev
Log:
extracted HtmlSaxParser from both NekoHTMLGenerator and NekoHTMLTransformer as NekoHtmlSaxParser
Added:
cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/components/
cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/components/NekoHtmlSaxParser.java
Modified:
cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/NekoHTMLGenerator.java
cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/transformation/NekoHTMLTransformer.java
Added: cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/components/NekoHtmlSaxParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/components/NekoHtmlSaxParser.java?rev=644590&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/components/NekoHtmlSaxParser.java (added)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/components/NekoHtmlSaxParser.java Thu Apr 3 20:05:40 2008
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.components;
+
+import java.util.Iterator;
+import java.util.Properties;
+
+import org.apache.xerces.parsers.AbstractSAXParser;
+import org.cyberneko.html.HTMLConfiguration;
+
+/**
+ * @version $Id$
+ */
+public class NekoHtmlSaxParser extends AbstractSAXParser {
+
+ public NekoHtmlSaxParser(Properties properties) {
+ super(getConfig(properties));
+ }
+
+ private static HTMLConfiguration getConfig(Properties properties) {
+ HTMLConfiguration config = new HTMLConfiguration();
+ config.setProperty("http://cyberneko.org/html/properties/names/elems", "lower");
+ if (properties != null) {
+ for (Iterator i = properties.keySet().iterator(); i.hasNext();) {
+ String name = (String) i.next();
+ if (name.indexOf("/features/") > -1) {
+ config.setFeature(name, Boolean.getBoolean(properties.getProperty(name)));
+ } else if (name.indexOf("/properties/") > -1) {
+ config.setProperty(name, properties.getProperty(name));
+ }
+ }
+ }
+ return config;
+ }
+
+}
Modified: cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/NekoHTMLGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/NekoHTMLGenerator.java?rev=644590&r1=644589&r2=644590&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/NekoHTMLGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/NekoHTMLGenerator.java Thu Apr 3 20:05:40 2008
@@ -19,7 +19,6 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
@@ -35,6 +34,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
+import org.apache.cocoon.components.NekoHtmlSaxParser;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -47,8 +47,6 @@
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.xml.xpath.XPathProcessor;
-import org.apache.xerces.parsers.AbstractSAXParser;
-import org.cyberneko.html.HTMLConfiguration;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
@@ -255,12 +253,12 @@
public void generate()
throws IOException, SAXException, ProcessingException {
try {
- HtmlSaxParser parser = new HtmlSaxParser(this.properties);
+ NekoHtmlSaxParser parser = new NekoHtmlSaxParser(this.properties);
if (inputSource != null)
requestStream = this.inputSource.getInputStream();
- if(xpath != null) {
+ if (xpath != null) {
DOMBuilder builder = new DOMBuilder();
parser.setContentHandler(builder);
parser.parse(new InputSource(requestStream));
@@ -299,27 +297,4 @@
super.dispose();
}
- public static class HtmlSaxParser extends AbstractSAXParser {
-
- public HtmlSaxParser(Properties properties) {
- super(getConfig(properties));
- }
-
- private static HTMLConfiguration getConfig(Properties properties) {
- HTMLConfiguration config = new HTMLConfiguration();
- config.setProperty("http://cyberneko.org/html/properties/names/elems", "lower");
- if (properties != null) {
- for (Iterator i = properties.keySet().iterator(); i.hasNext();) {
- String name = (String) i.next();
- if (name.indexOf("/features/") > -1) {
- config.setFeature(name, Boolean.getBoolean(properties.getProperty(name)));
- } else if (name.indexOf("/properties/") > -1) {
- config.setProperty(name, properties.getProperty(name));
- }
- }
- }
-
- return config;
- }
- }
}
Modified: cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/transformation/NekoHTMLTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/transformation/NekoHTMLTransformer.java?rev=644590&r1=644589&r2=644590&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/transformation/NekoHTMLTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/transformation/NekoHTMLTransformer.java Thu Apr 3 20:05:40 2008
@@ -19,7 +19,6 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
@@ -29,12 +28,11 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.NekoHtmlSaxParser;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.dom.DOMBuilder;
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.apache.excalibur.source.Source;
-import org.apache.xerces.parsers.AbstractSAXParser;
-import org.cyberneko.html.HTMLConfiguration;
import org.w3c.dom.Document;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
@@ -147,7 +145,7 @@
*/
private void normalize(String text) throws ProcessingException {
try {
- HtmlSaxParser parser = new HtmlSaxParser(this.properties);
+ NekoHtmlSaxParser parser = new NekoHtmlSaxParser(this.properties);
ByteArrayInputStream bais =
new ByteArrayInputStream(text.getBytes());
@@ -184,29 +182,6 @@
while (tokenizer.hasMoreElements()) {
String tok = tokenizer.nextToken().trim();
this.tags.put(tok, tok);
- }
- }
-
- public static class HtmlSaxParser extends AbstractSAXParser {
-
- public HtmlSaxParser(Properties properties) {
- super(getConfig(properties));
- }
-
- private static HTMLConfiguration getConfig(Properties properties) {
- HTMLConfiguration config = new HTMLConfiguration();
- config.setProperty("http://cyberneko.org/html/properties/names/elems", "lower");
- if (properties != null) {
- for (Iterator i = properties.keySet().iterator();i.hasNext();) {
- String name = (String) i.next();
- if (name.indexOf("/features/") > -1) {
- config.setFeature(name, Boolean.getBoolean(properties.getProperty(name)));
- } else if (name.indexOf("/properties/") > -1) {
- config.setProperty(name, properties.getProperty(name));
- }
- }
- }
- return config;
}
}
}