Author: scottbw
Date: Tue Mar 4 14:20:48 2014
New Revision: 1574106
URL: http://svn.apache.org/r1574106
Log:
Updated HtmlCleaner to v 2.7 and removed redundant code. See WOOKIE-428
Removed:
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/html/Html5DoctypeToken.java
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/html/HtmlSerializer.java
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/HtmlSerializerTest.java
Modified:
wookie/trunk/wookie-server/pom.xml
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/html/HtmlCleaner.java
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/html/StartPageProcessor.java
Modified: wookie/trunk/wookie-server/pom.xml
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/pom.xml?rev=1574106&r1=1574105&r2=1574106&view=diff
==============================================================================
--- wookie/trunk/wookie-server/pom.xml (original)
+++ wookie/trunk/wookie-server/pom.xml Tue Mar 4 14:20:48 2014
@@ -146,7 +146,7 @@
<dependency>
<groupId>net.sourceforge.htmlcleaner</groupId>
<artifactId>htmlcleaner</artifactId>
- <version>2.2.1</version>
+ <version>2.7</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified:
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/html/HtmlCleaner.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/html/HtmlCleaner.java?rev=1574106&r1=1574105&r2=1574106&view=diff
==============================================================================
---
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/html/HtmlCleaner.java
(original)
+++
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/html/HtmlCleaner.java
Tue Mar 4 14:20:48 2014
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import org.htmlcleaner.CleanerProperties;
-import org.htmlcleaner.DoctypeToken;
import org.htmlcleaner.SimpleHtmlSerializer;
import org.htmlcleaner.TagNode;
@@ -85,7 +84,6 @@ public class HtmlCleaner implements IHtm
// remove widget-specific scripts. These will be replaced
// after processing, so that the injected scripts come first
removeUserScripts();
- fixHTML5Doctype();
}
/* (non-Javadoc)
@@ -112,7 +110,6 @@ public class HtmlCleaner implements IHtm
/* (non-Javadoc)
* @see
org.apache.wookie.util.html.IHtmlProcessor#setCharset(java.lang.String)
*/
- @SuppressWarnings("unchecked")
public void setTypeAndCharset(String type, String charset) {
// NB This overrides any existing encoding information in the HTML file.
@@ -124,7 +121,7 @@ public class HtmlCleaner implements IHtm
if (meta == null) {
meta = new TagNode(META_TAG);
meta.addAttribute("http-equiv", "Content-Type");
- headNode.getChildren().add(0, meta);
+ headNode.addChild(meta);
}
//
// Force UTF into lowercase
@@ -165,7 +162,6 @@ public class HtmlCleaner implements IHtm
* Finds any user script imports and saves them to
* the scriptList
*/
- @SuppressWarnings("unchecked")
private void getUserScripts(){
List<TagNode> children = headNode.getChildTagList();
for(TagNode child : children){
@@ -183,19 +179,5 @@ public class HtmlCleaner implements IHtm
headNode.addChild(node);
}
}
-
- /**
- * Fix for a bug in HTMLCleaner which cannot handle HTML5 doctypes
correctly
- * See
http://sourceforge.net/tracker/?func=detail&aid=3190583&group_id=183053&atid=903696
- */
- private void fixHTML5Doctype(){
- DoctypeToken docType = htmlNode.getDocType();
- if(docType != null){
-
if(docType.getContent().equalsIgnoreCase(Html5DoctypeToken.BADDOCTYPE)){
- Html5DoctypeToken newToken = new
Html5DoctypeToken("html",null,null,null);
- htmlNode.setDocType(newToken);
- }
- }
- }
}
Modified:
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/html/StartPageProcessor.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/html/StartPageProcessor.java?rev=1574106&r1=1574105&r2=1574106&view=diff
==============================================================================
---
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/html/StartPageProcessor.java
(original)
+++
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/html/StartPageProcessor.java
Tue Mar 4 14:20:48 2014
@@ -28,8 +28,6 @@ import org.apache.wookie.w3c.W3CWidget;
*/
public class StartPageProcessor implements IStartPageProcessor {
- static final String DEFAULT_FEATURE =
"http://wookie.apache.org/feature/default";;
-
/* (non-Javadoc)
* @see
org.apache.wookie.util.html.IStartPageProcessor#processStartFile(java.io.File,
org.apache.wookie.w3c.IManifestModel)
*/
@@ -85,19 +83,6 @@ public class StartPageProcessor implemen
}
/**
- * Instantiates a feature for a given feature name
- * @param featureName the name of the feature to be instantiated
- * @return an IFeature instance
- * @throws Exception if the feature cannot be instantiated
- */
- @SuppressWarnings("unchecked")
- private IFeature getFeatureInstanceForName(String featureName) throws
Exception{
- Class<? extends IFeature> klass = (Class<? extends IFeature>)
Class.forName(featureName);
- IFeature theFeature = (IFeature) klass.newInstance();
- return theFeature;
- }
-
- /**
* Adds scripts for a given feature
* @param engine
* @param feature
