Author: kubes
Date: Thu Feb 14 14:21:50 2008
New Revision: 627893
URL: http://svn.apache.org/viewvc?rev=627893&view=rev
Log:
NUTCH-611 - Upgrade Nutch to use Hadoop 0.16. This upgrade removes the
deprecated addDefaultResouce and addFinalResource methods. Should now use
addResource. Two scripts start-balancer.sh and stop-balancer.sh are added to
the bin directory.
Added:
lucene/nutch/trunk/bin/start-balancer.sh (with props)
lucene/nutch/trunk/bin/stop-balancer.sh (with props)
lucene/nutch/trunk/lib/hadoop-0.16.0-core.jar (with props)
Removed:
lucene/nutch/trunk/lib/hadoop-0.15.3-core.jar
Modified:
lucene/nutch/trunk/CHANGES.txt
lucene/nutch/trunk/lib/native/Linux-amd64-64/libhadoop.a
lucene/nutch/trunk/lib/native/Linux-amd64-64/libhadoop.so
lucene/nutch/trunk/lib/native/Linux-amd64-64/libhadoop.so.1
lucene/nutch/trunk/lib/native/Linux-amd64-64/libhadoop.so.1.0.0
lucene/nutch/trunk/lib/native/Linux-i386-32/libhadoop.a
lucene/nutch/trunk/lib/native/Linux-i386-32/libhadoop.so
lucene/nutch/trunk/lib/native/Linux-i386-32/libhadoop.so.1
lucene/nutch/trunk/lib/native/Linux-i386-32/libhadoop.so.1.0.0
lucene/nutch/trunk/src/plugin/protocol-httpclient/src/test/org/apache/nutch/protocol/httpclient/TestProtocolHttpClient.java
Modified: lucene/nutch/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/CHANGES.txt?rev=627893&r1=627892&r2=627893&view=diff
==============================================================================
--- lucene/nutch/trunk/CHANGES.txt (original)
+++ lucene/nutch/trunk/CHANGES.txt Thu Feb 14 14:21:50 2008
@@ -210,6 +210,8 @@
75. NUTCH-603 - Add more default url normalizations (kubes)
+76. NUTCH-611 - Upgrade Nutch to use Hadoop 0.16 (kubes)
+
Release 0.9 - 2007-04-02
1. Changed log4j confiquration to log to stdout on commandline
Added: lucene/nutch/trunk/bin/start-balancer.sh
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/bin/start-balancer.sh?rev=627893&view=auto
==============================================================================
--- lucene/nutch/trunk/bin/start-balancer.sh (added)
+++ lucene/nutch/trunk/bin/start-balancer.sh Thu Feb 14 14:21:50 2008
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# 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.
+
+
+# Start balancer daemon.
+
+hadoop-daemon.sh start balancer $@
Propchange: lucene/nutch/trunk/bin/start-balancer.sh
------------------------------------------------------------------------------
svn:executable = *
Added: lucene/nutch/trunk/bin/stop-balancer.sh
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/bin/stop-balancer.sh?rev=627893&view=auto
==============================================================================
--- lucene/nutch/trunk/bin/stop-balancer.sh (added)
+++ lucene/nutch/trunk/bin/stop-balancer.sh Thu Feb 14 14:21:50 2008
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# 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.
+
+
+# Stop balancer daemon.
+# Run this on the machine where the balancer is running
+
+hadoop-daemon.sh stop balancer
Propchange: lucene/nutch/trunk/bin/stop-balancer.sh
------------------------------------------------------------------------------
svn:executable = *
Added: lucene/nutch/trunk/lib/hadoop-0.16.0-core.jar
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/hadoop-0.16.0-core.jar?rev=627893&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/hadoop-0.16.0-core.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: lucene/nutch/trunk/lib/native/Linux-amd64-64/libhadoop.a
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/native/Linux-amd64-64/libhadoop.a?rev=627893&r1=627892&r2=627893&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/nutch/trunk/lib/native/Linux-amd64-64/libhadoop.so
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/native/Linux-amd64-64/libhadoop.so?rev=627893&r1=627892&r2=627893&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/nutch/trunk/lib/native/Linux-amd64-64/libhadoop.so.1
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/native/Linux-amd64-64/libhadoop.so.1?rev=627893&r1=627892&r2=627893&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/nutch/trunk/lib/native/Linux-amd64-64/libhadoop.so.1.0.0
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/native/Linux-amd64-64/libhadoop.so.1.0.0?rev=627893&r1=627892&r2=627893&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/nutch/trunk/lib/native/Linux-i386-32/libhadoop.a
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/native/Linux-i386-32/libhadoop.a?rev=627893&r1=627892&r2=627893&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/nutch/trunk/lib/native/Linux-i386-32/libhadoop.so
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/native/Linux-i386-32/libhadoop.so?rev=627893&r1=627892&r2=627893&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/nutch/trunk/lib/native/Linux-i386-32/libhadoop.so.1
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/native/Linux-i386-32/libhadoop.so.1?rev=627893&r1=627892&r2=627893&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/nutch/trunk/lib/native/Linux-i386-32/libhadoop.so.1.0.0
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/native/Linux-i386-32/libhadoop.so.1.0.0?rev=627893&r1=627892&r2=627893&view=diff
==============================================================================
Binary files - no diff available.
Modified:
lucene/nutch/trunk/src/plugin/protocol-httpclient/src/test/org/apache/nutch/protocol/httpclient/TestProtocolHttpClient.java
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/src/plugin/protocol-httpclient/src/test/org/apache/nutch/protocol/httpclient/TestProtocolHttpClient.java?rev=627893&r1=627892&r2=627893&view=diff
==============================================================================
---
lucene/nutch/trunk/src/plugin/protocol-httpclient/src/test/org/apache/nutch/protocol/httpclient/TestProtocolHttpClient.java
(original)
+++
lucene/nutch/trunk/src/plugin/protocol-httpclient/src/test/org/apache/nutch/protocol/httpclient/TestProtocolHttpClient.java
Thu Feb 14 14:21:50 2008
@@ -54,7 +54,7 @@
server.addContext(context);
conf = new Configuration();
- conf.addDefaultResource("nutch-default.xml");
+ conf.addResource("nutch-default.xml");
conf.addResource("nutch-site-test.xml");
http = new Http();
