You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by le...@apache.org on 2012/05/22 13:59:27 UTC
svn commit: r1341425 - in /nutch/branches/nutchgora: ./ ivy/
src/java/org/apache/nutch/storage/ src/plugin/creativecommons/src/web/
src/plugin/protocol-httpclient/src/test/conf/
Author: lewismc
Date: Tue May 22 11:59:27 2012
New Revision: 1341425
URL: http://svn.apache.org/viewvc?rev=1341425&view=rev
Log:
commit to bring code up to scratch with trunk w.r.t preparation for the RC
Modified:
nutch/branches/nutchgora/NOTICE.txt
nutch/branches/nutchgora/build.xml
nutch/branches/nutchgora/default.properties
nutch/branches/nutchgora/ivy/mvn.template
nutch/branches/nutchgora/src/java/org/apache/nutch/storage/Host.java
nutch/branches/nutchgora/src/plugin/creativecommons/src/web/search.jsp
nutch/branches/nutchgora/src/plugin/creativecommons/src/web/web.xml
nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/test/conf/httpclient-auth-test.xml
nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/test/conf/nutch-site-test.xml
Modified: nutch/branches/nutchgora/NOTICE.txt
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/NOTICE.txt?rev=1341425&r1=1341424&r2=1341425&view=diff
==============================================================================
--- nutch/branches/nutchgora/NOTICE.txt (original)
+++ nutch/branches/nutchgora/NOTICE.txt Tue May 22 11:59:27 2012
@@ -1,5 +1,5 @@
Apache Nutch
-Copyright 2009 The Apache Software Foundation
+Copyright 2012 The Apache Software Foundation
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
Modified: nutch/branches/nutchgora/build.xml
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/build.xml?rev=1341425&r1=1341424&r2=1341425&view=diff
==============================================================================
--- nutch/branches/nutchgora/build.xml (original)
+++ nutch/branches/nutchgora/build.xml Tue May 22 11:59:27 2012
@@ -144,27 +144,40 @@
<arg value="${javadoc.proxy.host}" />
<arg value="${javadoc.proxy.port}" />
- <packageset dir="${src.dir}" />
- <packageset dir="${plugins.dir}/lib-http/src/java" />
- <packageset dir="${plugins.dir}/lib-regex-filter/src/java" />
- <packageset dir="${plugins.dir}/microformats-reltag/src/java" />
- <packageset dir="${plugins.dir}/protocol-file/src/java" />
- <packageset dir="${plugins.dir}/protocol-ftp/src/java" />
- <packageset dir="${plugins.dir}/protocol-http/src/java" />
- <packageset dir="${plugins.dir}/protocol-httpclient/src/java" />
- <packageset dir="${plugins.dir}/parse-tika/src/java" />
- <packageset dir="${plugins.dir}/parse-ext/src/java" />
- <packageset dir="${plugins.dir}/parse-js/src/java" />
- <packageset dir="${plugins.dir}/parse-swf/src/java" />
- <packageset dir="${plugins.dir}/parse-zip/src/java" />
- <packageset dir="${plugins.dir}/index-basic/src/java" />
- <packageset dir="${plugins.dir}/index-more/src/java" />
- <packageset dir="${plugins.dir}/scoring-opic/src/java" />
- <packageset dir="${plugins.dir}/urlfilter-automaton/src/java" />
- <packageset dir="${plugins.dir}/urlfilter-regex/src/java" />
- <packageset dir="${plugins.dir}/urlfilter-prefix/src/java" />
- <packageset dir="${plugins.dir}/creativecommons/src/java" />
- <packageset dir="${plugins.dir}/language-identifier/src/java" />
+ <packageset dir="${src.dir}"/>
+ <packageset dir="${plugins.dir}/creativecommons/src/java"/>
+ <packageset dir="${plugins.dir}/feed/src/java"/>
+ <packageset dir="${plugins.dir}/index-anchor/src/java"/>
+ <packageset dir="${plugins.dir}/index-basic/src/java"/>
+ <packageset dir="${plugins.dir}/index-more/src/java"/>
+ <packageset dir="${plugins.dir}/language-identifier/src/java"/>
+ <packageset dir="${plugins.dir}/lib-http/src/java"/>
+ <packageset dir="${plugins.dir}/lib-regex-filter/src/java"/>
+ <packageset dir="${plugins.dir}/microformats-reltag/src/java"/>
+ <packageset dir="${plugins.dir}/parse-ext/src/java"/>
+ <packageset dir="${plugins.dir}/parse-html/src/java"/>
+ <packageset dir="${plugins.dir}/parse-js/src/java"/>
+ <packageset dir="${plugins.dir}/parse-swf/src/java"/>
+ <packageset dir="${plugins.dir}/parse-tika/src/java"/>
+ <packageset dir="${plugins.dir}/parse-zip/src/java"/>
+ <packageset dir="${plugins.dir}/protocol-file/src/java"/>
+ <packageset dir="${plugins.dir}/protocol-ftp/src/java"/>
+ <packageset dir="${plugins.dir}/protocol-http/src/java"/>
+ <packageset dir="${plugins.dir}/protocol-httpclient/src/java"/>
+ <packageset dir="${plugins.dir}/protocol-sftp/src/java"/>
+ <packageset dir="${plugins.dir}/scoring-link/src/java"/>
+ <packageset dir="${plugins.dir}/scoring-opic/src/java"/>
+ <packageset dir="${plugins.dir}/subcollection/src/java"/>
+ <packageset dir="${plugins.dir}/tld/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-automaton/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-domain/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-prefix/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-regex/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-suffix/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-validator/src/java"/>
+ <packageset dir="${plugins.dir}/urlnormalizer-basic/src/java"/>
+ <packageset dir="${plugins.dir}/urlnormalizer-pass/src/java"/>
+ <packageset dir="${plugins.dir}/urlnormalizer-regex/src/java"/>
<link href="${javadoc.link.java}" />
<link href="${javadoc.link.lucene}" />
@@ -522,27 +535,40 @@
<arg value="${javadoc.proxy.host}" />
<arg value="${javadoc.proxy.port}" />
- <packageset dir="${src.dir}" />
- <packageset dir="${plugins.dir}/lib-http/src/java" />
- <packageset dir="${plugins.dir}/lib-regex-filter/src/java" />
- <packageset dir="${plugins.dir}/microformats-reltag/src/java" />
- <packageset dir="${plugins.dir}/protocol-file/src/java" />
- <packageset dir="${plugins.dir}/protocol-ftp/src/java" />
- <packageset dir="${plugins.dir}/protocol-http/src/java" />
- <packageset dir="${plugins.dir}/protocol-httpclient/src/java" />
- <packageset dir="${plugins.dir}/parse-tika/src/java" />
- <packageset dir="${plugins.dir}/parse-ext/src/java" />
- <packageset dir="${plugins.dir}/parse-js/src/java" />
- <packageset dir="${plugins.dir}/parse-swf/src/java" />
- <packageset dir="${plugins.dir}/parse-zip/src/java" />
- <packageset dir="${plugins.dir}/index-basic/src/java" />
- <packageset dir="${plugins.dir}/index-more/src/java" />
- <packageset dir="${plugins.dir}/scoring-opic/src/java" />
- <packageset dir="${plugins.dir}/urlfilter-automaton/src/java" />
- <packageset dir="${plugins.dir}/urlfilter-regex/src/java" />
- <packageset dir="${plugins.dir}/urlfilter-prefix/src/java" />
- <packageset dir="${plugins.dir}/creativecommons/src/java" />
- <packageset dir="${plugins.dir}/language-identifier/src/java" />
+ <packageset dir="${src.dir}"/>
+ <packageset dir="${plugins.dir}/creativecommons/src/java"/>
+ <packageset dir="${plugins.dir}/feed/src/java"/>
+ <packageset dir="${plugins.dir}/index-anchor/src/java"/>
+ <packageset dir="${plugins.dir}/index-basic/src/java"/>
+ <packageset dir="${plugins.dir}/index-more/src/java"/>
+ <packageset dir="${plugins.dir}/language-identifier/src/java"/>
+ <packageset dir="${plugins.dir}/lib-http/src/java"/>
+ <packageset dir="${plugins.dir}/lib-regex-filter/src/java"/>
+ <packageset dir="${plugins.dir}/microformats-reltag/src/java"/>
+ <packageset dir="${plugins.dir}/parse-ext/src/java"/>
+ <packageset dir="${plugins.dir}/parse-html/src/java"/>
+ <packageset dir="${plugins.dir}/parse-js/src/java"/>
+ <packageset dir="${plugins.dir}/parse-swf/src/java"/>
+ <packageset dir="${plugins.dir}/parse-tika/src/java"/>
+ <packageset dir="${plugins.dir}/parse-zip/src/java"/>
+ <packageset dir="${plugins.dir}/protocol-file/src/java"/>
+ <packageset dir="${plugins.dir}/protocol-ftp/src/java"/>
+ <packageset dir="${plugins.dir}/protocol-http/src/java"/>
+ <packageset dir="${plugins.dir}/protocol-httpclient/src/java"/>
+ <packageset dir="${plugins.dir}/protocol-sftp/src/java"/>
+ <packageset dir="${plugins.dir}/scoring-link/src/java"/>
+ <packageset dir="${plugins.dir}/scoring-opic/src/java"/>
+ <packageset dir="${plugins.dir}/subcollection/src/java"/>
+ <packageset dir="${plugins.dir}/tld/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-automaton/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-domain/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-prefix/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-regex/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-suffix/src/java"/>
+ <packageset dir="${plugins.dir}/urlfilter-validator/src/java"/>
+ <packageset dir="${plugins.dir}/urlnormalizer-basic/src/java"/>
+ <packageset dir="${plugins.dir}/urlnormalizer-pass/src/java"/>
+ <packageset dir="${plugins.dir}/urlnormalizer-regex/src/java"/>
<link href="${javadoc.link.java}" />
<link href="${javadoc.link.lucene}" />
@@ -626,6 +652,47 @@
<copy todir="${dist.version.dir}/" file="default.properties" />
</target>
+
+ <target name="package-bin" depends="runtime, javadoc">
+ <mkdir dir="${dist.version.dir}-bin"/>
+ <mkdir dir="${dist.version.dir}-bin/lib"/>
+ <mkdir dir="${dist.version.dir}-bin/bin"/>
+ <mkdir dir="${dist.version.dir}-bin/conf"/>
+ <mkdir dir="${dist.version.dir}-bin/docs"/>
+ <mkdir dir="${dist.version.dir}-bin/docs/api"/>
+ <mkdir dir="${dist.version.dir}-bin/plugins"/>
+
+ <copy todir="${dist.version.dir}-bin/lib" includeEmptyDirs="false">
+ <fileset dir="runtime/local/lib"/>
+ </copy>
+
+ <copy todir="${dist.version.dir}-bin/bin">
+ <fileset dir="runtime/local/bin"/>
+ </copy>
+
+ <chmod perm="ugo+x" type="file">
+ <fileset dir="${dist.version.dir}-bin/bin"/>
+ </chmod>
+
+ <copy todir="${dist.version.dir}-bin/conf">
+ <fileset dir="runtime/local/conf" excludes="**/*.template"/>
+ </copy>
+
+ <copy todir="${dist.version.dir}-bin/docs/api">
+ <fileset dir="${build.javadoc}"/>
+ </copy>
+
+ <copy todir="${dist.version.dir}-bin">
+ <fileset dir=".">
+ <include name="*.txt" />
+ </fileset>
+ </copy>
+
+ <copy todir="${dist.version.dir}-bin/plugins" includeEmptyDirs="true">
+ <fileset dir="runtime/local/plugins"/>
+ </copy>
+
+ </target>
<!-- ================================================================== -->
<!-- Make release tarball -->
Modified: nutch/branches/nutchgora/default.properties
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/default.properties?rev=1341425&r1=1341424&r2=1341425&view=diff
==============================================================================
--- nutch/branches/nutchgora/default.properties (original)
+++ nutch/branches/nutchgora/default.properties Tue May 22 11:59:27 2012
@@ -1,3 +1,19 @@
+# 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.
+
+
name=Nutch
version=2.0-dev
final.name=${name}-${version}
Modified: nutch/branches/nutchgora/ivy/mvn.template
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/ivy/mvn.template?rev=1341425&r1=1341424&r2=1341425&view=diff
==============================================================================
--- nutch/branches/nutchgora/ivy/mvn.template (original)
+++ nutch/branches/nutchgora/ivy/mvn.template Tue May 22 11:59:27 2012
@@ -91,7 +91,22 @@
<testResource>
<directory>src/testresources</directory>
</testResource>
+ <testResource>
+ <directory>src/testprocess</directory>
+ </testResource>
</testResources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
Modified: nutch/branches/nutchgora/src/java/org/apache/nutch/storage/Host.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/java/org/apache/nutch/storage/Host.java?rev=1341425&r1=1341424&r2=1341425&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/java/org/apache/nutch/storage/Host.java (original)
+++ nutch/branches/nutchgora/src/java/org/apache/nutch/storage/Host.java Tue May 22 11:59:27 2012
@@ -1,3 +1,19 @@
+/*******************************************************************************
+ * 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.storage;
import java.nio.ByteBuffer;
Modified: nutch/branches/nutchgora/src/plugin/creativecommons/src/web/search.jsp
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/plugin/creativecommons/src/web/search.jsp?rev=1341425&r1=1341424&r2=1341425&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/plugin/creativecommons/src/web/search.jsp (original)
+++ nutch/branches/nutchgora/src/plugin/creativecommons/src/web/search.jsp Tue May 22 11:59:27 2012
@@ -1,3 +1,20 @@
+<%--
+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.
+--%>
+
<%@ page
contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"
Modified: nutch/branches/nutchgora/src/plugin/creativecommons/src/web/web.xml
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/plugin/creativecommons/src/web/web.xml?rev=1341425&r1=1341424&r2=1341425&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/plugin/creativecommons/src/web/web.xml (original)
+++ nutch/branches/nutchgora/src/plugin/creativecommons/src/web/web.xml Tue May 22 11:59:27 2012
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ * 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.
+-->
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
Modified: nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/test/conf/httpclient-auth-test.xml
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/test/conf/httpclient-auth-test.xml?rev=1341425&r1=1341424&r2=1341425&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/test/conf/httpclient-auth-test.xml (original)
+++ nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/test/conf/httpclient-auth-test.xml Tue May 22 11:59:27 2012
@@ -1,5 +1,20 @@
<?xml version="1.0"?>
-
+<!--
+ 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.
+-->
<auth-configuration>
<!-- Default credentials -->
Modified: nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/test/conf/nutch-site-test.xml
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/test/conf/nutch-site-test.xml?rev=1341425&r1=1341424&r2=1341425&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/test/conf/nutch-site-test.xml (original)
+++ nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/test/conf/nutch-site-test.xml Tue May 22 11:59:27 2012
@@ -1,5 +1,21 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+ 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.
+-->
<configuration>