Index: src/plugin/build.xml
===================================================================
--- src/plugin/build.xml (revision 1721535)
+++ src/plugin/build.xml (working copy)
@@ -51,6 +51,7 @@
+
@@ -162,6 +163,7 @@
+
Index: src/plugin/protocol-htmlunit/build.xml
===================================================================
--- src/plugin/protocol-htmlunit/build.xml (revision 0)
+++ src/plugin/protocol-htmlunit/build.xml (working copy)
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Property changes on: src/plugin/protocol-htmlunit/build.xml
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: src/plugin/protocol-htmlunit/ivy.xml
===================================================================
--- src/plugin/protocol-htmlunit/ivy.xml (revision 0)
+++ src/plugin/protocol-htmlunit/ivy.xml (working copy)
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+ Apache Nutch
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: src/plugin/protocol-htmlunit/plugin.xml
===================================================================
--- src/plugin/protocol-htmlunit/plugin.xml (revision 0)
+++ src/plugin/protocol-htmlunit/plugin.xml (working copy)
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Property changes on: src/plugin/protocol-htmlunit/plugin.xml
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/Http.java
===================================================================
--- src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/Http.java (revision 0)
+++ src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/Http.java (working copy)
@@ -0,0 +1,67 @@
+/**
+ * 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.nutch.protocol.htmlunit;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.apache.hadoop.conf.Configuration;
+
+import org.apache.nutch.crawl.CrawlDatum;
+import org.apache.nutch.net.protocols.Response;
+import org.apache.nutch.protocol.ProtocolException;
+import org.apache.nutch.protocol.http.api.HttpBase;
+import org.apache.nutch.util.NutchConfiguration;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ *
+ */
+public class Http extends HttpBase {
+
+ public static final Logger LOG = LoggerFactory.getLogger(Http.class);
+
+ /**
+ * Default constructor.
+ */
+ public Http() {
+ super(LOG);
+ }
+
+ /**
+ * Set the {@link org.apache.hadoop.conf.Configuration} object.
+ *
+ * @param conf
+ */
+ public void setConf(Configuration conf) {
+ super.setConf(conf);
+ }
+
+ public static void main(String[] args) throws Exception {
+ Http http = new Http();
+ http.setConf(NutchConfiguration.create());
+ main(http, args);
+ }
+
+ protected Response getResponse(URL url, CrawlDatum datum, boolean redirect)
+ throws ProtocolException, IOException {
+ return new HttpResponse(this, url, datum);
+ }
+}
Property changes on: src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/Http.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/HttpResponse.java
===================================================================
--- src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/HttpResponse.java (revision 0)
+++ src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/HttpResponse.java (working copy)
@@ -0,0 +1,138 @@
+/**
+ * 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.nutch.protocol.htmlunit;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.List;
+
+import com.gargoylesoftware.htmlunit.BrowserVersion;
+import com.gargoylesoftware.htmlunit.javascript.JavaScriptEngine;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController;
+import com.gargoylesoftware.htmlunit.OnbeforeunloadHandler;
+import com.gargoylesoftware.htmlunit.ScriptResult;
+import com.gargoylesoftware.htmlunit.StringWebResponse;
+import com.gargoylesoftware.htmlunit.TopLevelWindow;
+import com.gargoylesoftware.htmlunit.util.NameValuePair;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.WebRequest;
+import com.gargoylesoftware.htmlunit.WebResponse;
+import com.gargoylesoftware.htmlunit.WebResponseData;
+import com.gargoylesoftware.htmlunit.WebWindow;
+import com.gargoylesoftware.htmlunit.WebClient;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.nutch.crawl.CrawlDatum;
+import org.apache.nutch.metadata.Metadata;
+import org.apache.nutch.metadata.SpellCheckedMetadata;
+import org.apache.nutch.net.protocols.HttpDateFormat;
+import org.apache.nutch.net.protocols.Response;
+import org.apache.nutch.protocol.ProtocolException;
+import org.apache.nutch.protocol.http.api.HttpBase;
+import org.apache.nutch.protocol.http.api.HttpException;
+
+/**
+ * An HTTP response.
+ *
+ *
+ *
+ * TODO needs to remove http* and jetty* or jersey* from nutch/lib directory otherwise everything
+ * goes crazy! IndexChecker works sofar.
+ *
+ */
+public class HttpResponse implements Response {
+
+ private Configuration conf;
+ private HttpBase http;
+ private URL url;
+ private byte[] content;
+ private int code;
+ private Metadata headers = new SpellCheckedMetadata();
+
+ private WebClient client = new WebClient(BrowserVersion.FIREFOX_38);
+
+ private HtmlPage page;
+ private WebResponse webResponse;
+
+ /**
+ * Default public constructor.
+ *
+ * @param http
+ * @param url
+ * @param datum
+ * @throws ProtocolException
+ * @throws IOException
+ */
+ public HttpResponse(HttpBase http, URL url, CrawlDatum datum) throws ProtocolException, IOException {
+ conf = http.getConf();
+ this.url = url;
+
+ // Don't throw Java exception for script errors
+ client.getOptions().setThrowExceptionOnScriptError(false);
+
+ // Enable CSS parsing, but it is enabled by default
+ client.getOptions().setCssEnabled(true);
+ client.getOptions().setJavaScriptEnabled(true);
+
+ // Do not follow redirects so we can check response from outlinks
+ // If we don't follow redirects, we get an exception FailingHttpStatusCodeException: 302 Moved Temporarily
+ client.getOptions().setRedirectEnabled(true); // If we disable this, the referenced hyperlinks are not followed, causing trouble loading JS, assets and stuff, but this also allows the input URL to be redirected without Nutch knowing it
+
+ client.setJavaScriptTimeout(3500);
+ client.setAjaxController(new NicelyResynchronizingAjaxController());
+ client.waitForBackgroundJavaScriptStartingBefore(500);
+
+ System.out.println("isCssEnabled: " + client.getOptions().isCssEnabled());
+ System.out.println("isJavaScriptEnabled: " + client.getOptions().isJavaScriptEnabled());
+
+ page = client.getPage(url);
+
+ //client.waitForBackgroundJavaScript(10000);
+ webResponse = page.getWebResponse();
+
+ // Parse the headers
+ List headerList = webResponse.getResponseHeaders();
+ for (int i = 0; i < headerList.size(); i++) {
+ headers.add(headerList.get(i).getName(), headerList.get(i).getValue());
+ }
+ }
+
+ public URL getUrl() {
+ return url;
+ }
+
+ public int getCode() {
+ return webResponse.getStatusCode();
+ }
+
+ public String getHeader(String name) {
+ return headers.get(name);
+ }
+
+ public Metadata getHeaders() {
+ return headers;
+ }
+
+ public byte[] getContent() {
+ try {
+ return page.asXml().getBytes("UTF8");
+ } catch (Exception e) { }
+
+ return null;
+ }
+}
\ No newline at end of file
Index: src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/package.html
===================================================================
--- src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/package.html (revision 0)
+++ src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/package.html (working copy)
@@ -0,0 +1,5 @@
+
+
+Protocol plugin which supports retrieving documents via the http protocol.
+
+