You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by ku...@apache.org on 2009/12/01 15:57:38 UTC
svn commit: r885778 - in /lucene/nutch/trunk: ./ bin/ conf/ lib/
lib/jetty-ext/ lib/jsp-2.1/ lib/native/Linux-amd64-64/
lib/native/Linux-i386-32/ src/java/org/apache/nutch/searcher/
src/plugin/lib-xml/lib/ src/plugin/protocol-httpclient/
Author: kubes
Date: Tue Dec 1 14:57:35 2009
New Revision: 885778
URL: http://svn.apache.org/viewvc?rev=885778&view=rev
Log:
NUTCH-768 - Upgrade Nutch to use Hadoop 0.20.1 and Xerces 2.9.1
Added:
lucene/nutch/trunk/conf/capacity-scheduler.xml.template
lucene/nutch/trunk/conf/core-site.xml.template
lucene/nutch/trunk/conf/hadoop-metrics.properties
lucene/nutch/trunk/conf/hadoop-policy.xml.template
lucene/nutch/trunk/conf/hdfs-site.xml.template
lucene/nutch/trunk/conf/mapred-site.xml.template
lucene/nutch/trunk/lib/commons-cli-1.2.jar (with props)
lucene/nutch/trunk/lib/commons-el-1.0.jar (with props)
lucene/nutch/trunk/lib/commons-net-1.4.1.jar (with props)
lucene/nutch/trunk/lib/core-3.1.1.jar (with props)
lucene/nutch/trunk/lib/hadoop-0.20.1-core.jar (with props)
lucene/nutch/trunk/lib/hadoop-0.20.1-tools.jar (with props)
lucene/nutch/trunk/lib/hsqldb-1.8.0.10.LICENSE.txt
lucene/nutch/trunk/lib/hsqldb-1.8.0.10.jar (with props)
lucene/nutch/trunk/lib/jasper-compiler-5.5.12.jar (with props)
lucene/nutch/trunk/lib/jasper-runtime-5.5.12.jar (with props)
lucene/nutch/trunk/lib/jetty-6.1.14.jar (with props)
lucene/nutch/trunk/lib/jetty-util-6.1.14.jar (with props)
lucene/nutch/trunk/lib/jsp-2.1/
lucene/nutch/trunk/lib/jsp-2.1/jsp-2.1.jar (with props)
lucene/nutch/trunk/lib/jsp-2.1/jsp-api-2.1.jar (with props)
lucene/nutch/trunk/lib/kfs-0.2.2.jar (with props)
lucene/nutch/trunk/lib/kfs-0.2.LICENSE.txt
lucene/nutch/trunk/lib/oro-2.0.8.jar (with props)
lucene/nutch/trunk/lib/resolver.jar (with props)
lucene/nutch/trunk/lib/serializer.jar (with props)
lucene/nutch/trunk/lib/servlet-api-2.5-6.1.14.jar (with props)
lucene/nutch/trunk/lib/slf4j-api-1.4.3.jar (with props)
lucene/nutch/trunk/lib/slf4j-log4j12-1.4.3.jar (with props)
lucene/nutch/trunk/lib/xercesImpl.jar (with props)
lucene/nutch/trunk/lib/xml-apis.jar (with props)
lucene/nutch/trunk/lib/xmlenc-0.52.jar (with props)
Removed:
lucene/nutch/trunk/conf/hadoop-site.xml.template
lucene/nutch/trunk/lib/commons-cli-2.0-SNAPSHOT.jar
lucene/nutch/trunk/lib/hadoop-0.19.1-core.jar
lucene/nutch/trunk/lib/jetty-ext/
lucene/nutch/trunk/lib/servlet-api.jar
lucene/nutch/trunk/lib/xerces-2_6_2-apis.jar
lucene/nutch/trunk/lib/xerces-2_6_2.jar
Modified:
lucene/nutch/trunk/CHANGES.txt
lucene/nutch/trunk/bin/nutch
lucene/nutch/trunk/lib/commons-logging-1.0.4.jar
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/java/org/apache/nutch/searcher/NutchBean.java
lucene/nutch/trunk/src/plugin/lib-xml/lib/xercesImpl.jar
lucene/nutch/trunk/src/plugin/protocol-httpclient/build.xml
Modified: lucene/nutch/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/CHANGES.txt?rev=885778&r1=885777&r2=885778&view=diff
==============================================================================
--- lucene/nutch/trunk/CHANGES.txt (original)
+++ lucene/nutch/trunk/CHANGES.txt Tue Dec 1 14:57:35 2009
@@ -2,6 +2,9 @@
Unreleased Changes
+* NUTCH-768 - Upgrade Nutch 1.0 to use Hadoop 0.20.1, also upgrades Xerces to
+ version 2.9.1. (kubes)
+
* NUTCH-712 ParseOutputFormat should catch java.net.MalformedURLException
coming from normalizers (Julien Nioche via ab)
Modified: lucene/nutch/trunk/bin/nutch
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/bin/nutch?rev=885778&r1=885777&r2=885778&view=diff
==============================================================================
--- lucene/nutch/trunk/bin/nutch (original)
+++ lucene/nutch/trunk/bin/nutch Tue Dec 1 14:57:35 2009
@@ -139,7 +139,7 @@
CLASSPATH=${CLASSPATH}:$f;
done
-for f in $NUTCH_HOME/lib/jetty-ext/*.jar; do
+for f in $NUTCH_HOME/lib/jsp-2.1/*.jar; do
CLASSPATH=${CLASSPATH}:$f;
done
Added: lucene/nutch/trunk/conf/capacity-scheduler.xml.template
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/conf/capacity-scheduler.xml.template?rev=885778&view=auto
==============================================================================
--- lucene/nutch/trunk/conf/capacity-scheduler.xml.template (added)
+++ lucene/nutch/trunk/conf/capacity-scheduler.xml.template Tue Dec 1 14:57:35 2009
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+
+<!-- This is the configuration file for the resource manager in Hadoop. -->
+<!-- You can configure various scheduling parameters related to queues. -->
+<!-- The properties for a queue follow a naming convention,such as, -->
+<!-- mapred.capacity-scheduler.queue.<queue-name>.property-name. -->
+
+<configuration>
+
+ <property>
+ <name>mapred.capacity-scheduler.queue.default.capacity</name>
+ <value>100</value>
+ <description>Percentage of the number of slots in the cluster that are
+ to be available for jobs in this queue.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.queue.default.supports-priority</name>
+ <value>false</value>
+ <description>If true, priorities of jobs will be taken into
+ account in scheduling decisions.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.queue.default.minimum-user-limit-percent</name>
+ <value>100</value>
+ <description> Each queue enforces a limit on the percentage of resources
+ allocated to a user at any given time, if there is competition for them.
+ This user limit can vary between a minimum and maximum value. The former
+ depends on the number of users who have submitted jobs, and the latter is
+ set to this property value. For example, suppose the value of this
+ property is 25. If two users have submitted jobs to a queue, no single
+ user can use more than 50% of the queue resources. If a third user submits
+ a job, no single user can use more than 33% of the queue resources. With 4
+ or more users, no user can use more than 25% of the queue's resources. A
+ value of 100 implies no user limits are imposed.
+ </description>
+ </property>
+ <property>
+ <name>mapred.capacity-scheduler.queue.default.maximum-initialized-jobs-per-user</name>
+ <value>2</value>
+ <description>The maximum number of jobs to be pre-initialized for a user
+ of the job queue.
+ </description>
+ </property>
+
+ <!-- The default configuration settings for the capacity task scheduler -->
+ <!-- The default values would be applied to all the queues which don't have -->
+ <!-- the appropriate property for the particular queue -->
+ <property>
+ <name>mapred.capacity-scheduler.default-supports-priority</name>
+ <value>false</value>
+ <description>If true, priorities of jobs will be taken into
+ account in scheduling decisions by default in a job queue.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.default-minimum-user-limit-percent</name>
+ <value>100</value>
+ <description>The percentage of the resources limited to a particular user
+ for the job queue at any given point of time by default.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.default-maximum-initialized-jobs-per-user</name>
+ <value>2</value>
+ <description>The maximum number of jobs to be pre-initialized for a user
+ of the job queue.
+ </description>
+ </property>
+
+
+ <!-- Capacity scheduler Job Initialization configuration parameters -->
+ <property>
+ <name>mapred.capacity-scheduler.init-poll-interval</name>
+ <value>5000</value>
+ <description>The amount of time in miliseconds which is used to poll
+ the job queues for jobs to initialize.
+ </description>
+ </property>
+ <property>
+ <name>mapred.capacity-scheduler.init-worker-threads</name>
+ <value>5</value>
+ <description>Number of worker threads which would be used by
+ Initialization poller to initialize jobs in a set of queue.
+ If number mentioned in property is equal to number of job queues
+ then a single thread would initialize jobs in a queue. If lesser
+ then a thread would get a set of queues assigned. If the number
+ is greater then number of threads would be equal to number of
+ job queues.
+ </description>
+ </property>
+
+</configuration>
Added: lucene/nutch/trunk/conf/core-site.xml.template
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/conf/core-site.xml.template?rev=885778&view=auto
==============================================================================
--- lucene/nutch/trunk/conf/core-site.xml.template (added)
+++ lucene/nutch/trunk/conf/core-site.xml.template Tue Dec 1 14:57:35 2009
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<!-- Put site-specific property overrides in this file. -->
+
+<configuration>
+
+</configuration>
Added: lucene/nutch/trunk/conf/hadoop-metrics.properties
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/conf/hadoop-metrics.properties?rev=885778&view=auto
==============================================================================
--- lucene/nutch/trunk/conf/hadoop-metrics.properties (added)
+++ lucene/nutch/trunk/conf/hadoop-metrics.properties Tue Dec 1 14:57:35 2009
@@ -0,0 +1,40 @@
+# Configuration of the "dfs" context for null
+dfs.class=org.apache.hadoop.metrics.spi.NullContext
+
+# Configuration of the "dfs" context for file
+#dfs.class=org.apache.hadoop.metrics.file.FileContext
+#dfs.period=10
+#dfs.fileName=/tmp/dfsmetrics.log
+
+# Configuration of the "dfs" context for ganglia
+# dfs.class=org.apache.hadoop.metrics.ganglia.GangliaContext
+# dfs.period=10
+# dfs.servers=localhost:8649
+
+
+# Configuration of the "mapred" context for null
+mapred.class=org.apache.hadoop.metrics.spi.NullContext
+
+# Configuration of the "mapred" context for file
+#mapred.class=org.apache.hadoop.metrics.file.FileContext
+#mapred.period=10
+#mapred.fileName=/tmp/mrmetrics.log
+
+# Configuration of the "mapred" context for ganglia
+# mapred.class=org.apache.hadoop.metrics.ganglia.GangliaContext
+# mapred.period=10
+# mapred.servers=localhost:8649
+
+
+# Configuration of the "jvm" context for null
+jvm.class=org.apache.hadoop.metrics.spi.NullContext
+
+# Configuration of the "jvm" context for file
+#jvm.class=org.apache.hadoop.metrics.file.FileContext
+#jvm.period=10
+#jvm.fileName=/tmp/jvmmetrics.log
+
+# Configuration of the "jvm" context for ganglia
+# jvm.class=org.apache.hadoop.metrics.ganglia.GangliaContext
+# jvm.period=10
+# jvm.servers=localhost:8649
Added: lucene/nutch/trunk/conf/hadoop-policy.xml.template
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/conf/hadoop-policy.xml.template?rev=885778&view=auto
==============================================================================
--- lucene/nutch/trunk/conf/hadoop-policy.xml.template (added)
+++ lucene/nutch/trunk/conf/hadoop-policy.xml.template Tue Dec 1 14:57:35 2009
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<!-- Put site-specific property overrides in this file. -->
+
+<configuration>
+ <property>
+ <name>security.client.protocol.acl</name>
+ <value>*</value>
+ <description>ACL for ClientProtocol, which is used by user code
+ via the DistributedFileSystem.
+ The ACL is a comma-separated list of user and group names. The user and
+ group list is separated by a blank. For e.g. "alice,bob users,wheel".
+ A special value of "*" means all users are allowed.</description>
+ </property>
+
+ <property>
+ <name>security.client.datanode.protocol.acl</name>
+ <value>*</value>
+ <description>ACL for ClientDatanodeProtocol, the client-to-datanode protocol
+ for block recovery.
+ The ACL is a comma-separated list of user and group names. The user and
+ group list is separated by a blank. For e.g. "alice,bob users,wheel".
+ A special value of "*" means all users are allowed.</description>
+ </property>
+
+ <property>
+ <name>security.datanode.protocol.acl</name>
+ <value>*</value>
+ <description>ACL for DatanodeProtocol, which is used by datanodes to
+ communicate with the namenode.
+ The ACL is a comma-separated list of user and group names. The user and
+ group list is separated by a blank. For e.g. "alice,bob users,wheel".
+ A special value of "*" means all users are allowed.</description>
+ </property>
+
+ <property>
+ <name>security.inter.datanode.protocol.acl</name>
+ <value>*</value>
+ <description>ACL for InterDatanodeProtocol, the inter-datanode protocol
+ for updating generation timestamp.
+ The ACL is a comma-separated list of user and group names. The user and
+ group list is separated by a blank. For e.g. "alice,bob users,wheel".
+ A special value of "*" means all users are allowed.</description>
+ </property>
+
+ <property>
+ <name>security.namenode.protocol.acl</name>
+ <value>*</value>
+ <description>ACL for NamenodeProtocol, the protocol used by the secondary
+ namenode to communicate with the namenode.
+ The ACL is a comma-separated list of user and group names. The user and
+ group list is separated by a blank. For e.g. "alice,bob users,wheel".
+ A special value of "*" means all users are allowed.</description>
+ </property>
+
+ <property>
+ <name>security.inter.tracker.protocol.acl</name>
+ <value>*</value>
+ <description>ACL for InterTrackerProtocol, used by the tasktrackers to
+ communicate with the jobtracker.
+ The ACL is a comma-separated list of user and group names. The user and
+ group list is separated by a blank. For e.g. "alice,bob users,wheel".
+ A special value of "*" means all users are allowed.</description>
+ </property>
+
+ <property>
+ <name>security.job.submission.protocol.acl</name>
+ <value>*</value>
+ <description>ACL for JobSubmissionProtocol, used by job clients to
+ communciate with the jobtracker for job submission, querying job status etc.
+ The ACL is a comma-separated list of user and group names. The user and
+ group list is separated by a blank. For e.g. "alice,bob users,wheel".
+ A special value of "*" means all users are allowed.</description>
+ </property>
+
+ <property>
+ <name>security.task.umbilical.protocol.acl</name>
+ <value>*</value>
+ <description>ACL for TaskUmbilicalProtocol, used by the map and reduce
+ tasks to communicate with the parent tasktracker.
+ The ACL is a comma-separated list of user and group names. The user and
+ group list is separated by a blank. For e.g. "alice,bob users,wheel".
+ A special value of "*" means all users are allowed.</description>
+ </property>
+
+ <property>
+ <name>security.refresh.policy.protocol.acl</name>
+ <value>*</value>
+ <description>ACL for RefreshAuthorizationPolicyProtocol, used by the
+ dfsadmin and mradmin commands to refresh the security policy in-effect.
+ The ACL is a comma-separated list of user and group names. The user and
+ group list is separated by a blank. For e.g. "alice,bob users,wheel".
+ A special value of "*" means all users are allowed.</description>
+ </property>
+
+</configuration>
Added: lucene/nutch/trunk/conf/hdfs-site.xml.template
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/conf/hdfs-site.xml.template?rev=885778&view=auto
==============================================================================
--- lucene/nutch/trunk/conf/hdfs-site.xml.template (added)
+++ lucene/nutch/trunk/conf/hdfs-site.xml.template Tue Dec 1 14:57:35 2009
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<!-- Put site-specific property overrides in this file. -->
+
+<configuration>
+
+</configuration>
Added: lucene/nutch/trunk/conf/mapred-site.xml.template
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/conf/mapred-site.xml.template?rev=885778&view=auto
==============================================================================
--- lucene/nutch/trunk/conf/mapred-site.xml.template (added)
+++ lucene/nutch/trunk/conf/mapred-site.xml.template Tue Dec 1 14:57:35 2009
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<!-- Put site-specific property overrides in this file. -->
+
+<configuration>
+
+</configuration>
Added: lucene/nutch/trunk/lib/commons-cli-1.2.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/commons-cli-1.2.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/commons-cli-1.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/commons-el-1.0.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/commons-el-1.0.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/commons-el-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: lucene/nutch/trunk/lib/commons-logging-1.0.4.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/commons-logging-1.0.4.jar?rev=885778&r1=885777&r2=885778&view=diff
==============================================================================
Binary files - no diff available.
Added: lucene/nutch/trunk/lib/commons-net-1.4.1.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/commons-net-1.4.1.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/commons-net-1.4.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/core-3.1.1.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/core-3.1.1.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/core-3.1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/hadoop-0.20.1-core.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/hadoop-0.20.1-core.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/hadoop-0.20.1-core.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/hadoop-0.20.1-tools.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/hadoop-0.20.1-tools.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/hadoop-0.20.1-tools.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/hsqldb-1.8.0.10.LICENSE.txt
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/hsqldb-1.8.0.10.LICENSE.txt?rev=885778&view=auto
==============================================================================
--- lucene/nutch/trunk/lib/hsqldb-1.8.0.10.LICENSE.txt (added)
+++ lucene/nutch/trunk/lib/hsqldb-1.8.0.10.LICENSE.txt Tue Dec 1 14:57:35 2009
@@ -0,0 +1,66 @@
+/* Copyright (c) 1995-2000, The Hypersonic SQL Group.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the Hypersonic SQL Group nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP,
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * on behalf of the Hypersonic SQL Group.
+ *
+ *
+ * For work added by the HSQL Development Group:
+ *
+ * Copyright (c) 2001-2004, The HSQL Development Group
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the HSQL Development Group nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
Added: lucene/nutch/trunk/lib/hsqldb-1.8.0.10.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/hsqldb-1.8.0.10.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/hsqldb-1.8.0.10.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/jasper-compiler-5.5.12.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/jasper-compiler-5.5.12.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/jasper-compiler-5.5.12.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/jasper-runtime-5.5.12.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/jasper-runtime-5.5.12.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/jasper-runtime-5.5.12.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/jetty-6.1.14.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/jetty-6.1.14.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/jetty-6.1.14.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/jetty-util-6.1.14.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/jetty-util-6.1.14.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/jetty-util-6.1.14.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/jsp-2.1/jsp-2.1.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/jsp-2.1/jsp-2.1.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/jsp-2.1/jsp-2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/jsp-2.1/jsp-api-2.1.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/jsp-2.1/jsp-api-2.1.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/jsp-2.1/jsp-api-2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/kfs-0.2.2.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/kfs-0.2.2.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/kfs-0.2.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/kfs-0.2.LICENSE.txt
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/kfs-0.2.LICENSE.txt?rev=885778&view=auto
==============================================================================
--- lucene/nutch/trunk/lib/kfs-0.2.LICENSE.txt (added)
+++ lucene/nutch/trunk/lib/kfs-0.2.LICENSE.txt Tue Dec 1 14:57:35 2009
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
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=885778&r1=885777&r2=885778&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=885778&r1=885777&r2=885778&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=885778&r1=885777&r2=885778&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=885778&r1=885777&r2=885778&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=885778&r1=885777&r2=885778&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=885778&r1=885777&r2=885778&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=885778&r1=885777&r2=885778&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=885778&r1=885777&r2=885778&view=diff
==============================================================================
Binary files - no diff available.
Added: lucene/nutch/trunk/lib/oro-2.0.8.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/oro-2.0.8.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/oro-2.0.8.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/resolver.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/resolver.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/resolver.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/serializer.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/serializer.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/serializer.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/servlet-api-2.5-6.1.14.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/servlet-api-2.5-6.1.14.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/servlet-api-2.5-6.1.14.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/slf4j-api-1.4.3.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/slf4j-api-1.4.3.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/slf4j-api-1.4.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/slf4j-log4j12-1.4.3.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/slf4j-log4j12-1.4.3.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/slf4j-log4j12-1.4.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/xercesImpl.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/xercesImpl.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/xercesImpl.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/xml-apis.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/xml-apis.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/xml-apis.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/nutch/trunk/lib/xmlenc-0.52.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/lib/xmlenc-0.52.jar?rev=885778&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/nutch/trunk/lib/xmlenc-0.52.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: lucene/nutch/trunk/src/java/org/apache/nutch/searcher/NutchBean.java
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/src/java/org/apache/nutch/searcher/NutchBean.java?rev=885778&r1=885777&r2=885778&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/searcher/NutchBean.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/searcher/NutchBean.java Tue Dec 1 14:57:35 2009
@@ -39,7 +39,8 @@
* @version $Id$
*/
public class NutchBean
-implements SearchBean, SegmentBean, HitInlinks, Closeable {
+implements SearchBean, RPCSearchBean, SegmentBean, RPCSegmentBean,
+HitInlinks, Closeable {
public static final Log LOG = LogFactory.getLog(NutchBean.class);
public static final String KEY = "nutchBean";
Modified: lucene/nutch/trunk/src/plugin/lib-xml/lib/xercesImpl.jar
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/src/plugin/lib-xml/lib/xercesImpl.jar?rev=885778&r1=885777&r2=885778&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/nutch/trunk/src/plugin/protocol-httpclient/build.xml
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/src/plugin/protocol-httpclient/build.xml?rev=885778&r1=885777&r2=885778&view=diff
==============================================================================
--- lucene/nutch/trunk/src/plugin/protocol-httpclient/build.xml (original)
+++ lucene/nutch/trunk/src/plugin/protocol-httpclient/build.xml Tue Dec 1 14:57:35 2009
@@ -27,9 +27,8 @@
<fileset dir="${nutch.root}/build">
<include name="**/lib-http/*.jar" />
</fileset>
- <fileset dir="${nutch.root}/lib/jetty-ext">
+ <fileset dir="${nutch.root}/lib/jsp-2.1">
<include name="*.jar"/>
- <exclude name="ant.jar"/>
</fileset>
<pathelement location="${build.dir}/test/conf"/>
</path>