Author: snagel
Date: Mon Sep 21 21:14:55 2015
New Revision: 1704425
URL: http://svn.apache.org/viewvc?rev=1704425&view=rev
Log:
NUTCH-2106 Runtime to contain Selenium and dependencies only once
Modified:
nutch/trunk/CHANGES.txt
nutch/trunk/src/plugin/lib-selenium/build-ivy.xml
nutch/trunk/src/plugin/lib-selenium/howto_upgrade_selenium.txt
nutch/trunk/src/plugin/lib-selenium/ivy.xml
nutch/trunk/src/plugin/lib-selenium/plugin.xml
nutch/trunk/src/plugin/protocol-interactiveselenium/build-ivy.xml
nutch/trunk/src/plugin/protocol-interactiveselenium/ivy.xml
nutch/trunk/src/plugin/protocol-interactiveselenium/plugin.xml
nutch/trunk/src/plugin/protocol-selenium/build-ivy.xml
nutch/trunk/src/plugin/protocol-selenium/ivy.xml
nutch/trunk/src/plugin/protocol-selenium/plugin.xml
Modified: nutch/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1704425&r1=1704424&r2=1704425&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Mon Sep 21 21:14:55 2015
@@ -2,6 +2,8 @@ Nutch Change Log
Nutch Current Development 1.11-SNAPSHOT
+* NUTCH-2106 Runtime to contain Selenium and dependencies only once (snagel)
+
* NUTCH-2104 Add documentation to the protocol-selenium plugin Readme file
re: selenium grid implementation (Kim Whitehall via mattmann)
Modified: nutch/trunk/src/plugin/lib-selenium/build-ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-selenium/build-ivy.xml?rev=1704425&r1=1704424&r2=1704425&view=diff
==============================================================================
--- nutch/trunk/src/plugin/lib-selenium/build-ivy.xml (original)
+++ nutch/trunk/src/plugin/lib-selenium/build-ivy.xml Mon Sep 21 21:14:55 2015
@@ -48,7 +48,7 @@
</target>
<target name="deps-jar" depends="init-ivy">
- <ivy:retrieve pattern="lib/[artifact]-[revision].[ext]"/>
+ <ivy:retrieve pattern="lib/[artifact]-[revision].[ext]" sync="true"/>
</target>
</project>
Modified: nutch/trunk/src/plugin/lib-selenium/howto_upgrade_selenium.txt
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-selenium/howto_upgrade_selenium.txt?rev=1704425&r1=1704424&r2=1704425&view=diff
==============================================================================
--- nutch/trunk/src/plugin/lib-selenium/howto_upgrade_selenium.txt (original)
+++ nutch/trunk/src/plugin/lib-selenium/howto_upgrade_selenium.txt Mon Sep 21
21:14:55 2015
@@ -1,6 +1,9 @@
1. Upgrade various driver versions dependency in
src/plugin/lib-selenium/ivy.xml
-2. Upgrade Tika's own dependencies in src/plugin/lib-selenium/plugin.xml
- To get the list of dependencies and their versions execute:
- $ ant -f ./build-ivy.xml
- $ ls lib | sed 's/^/ <library name="/g' | sed 's/$/"\/>/g'
+2. Upgrade Selenium's own dependencies in src/plugin/lib-selenium/plugin.xml
+
+ To get a list of dependencies and their versions execute:
+ $ ant -f ./build-ivy.xml
+ $ ls lib | sed 's/^/ <library name="/g' | sed 's/$/">\n <export
name="*"\/>\n <\/library>/g'
+
+ Note that all dependent libraries are exported for a "library" plugin
("lib-selenium").
Modified: nutch/trunk/src/plugin/lib-selenium/ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-selenium/ivy.xml?rev=1704425&r1=1704424&r2=1704425&view=diff
==============================================================================
--- nutch/trunk/src/plugin/lib-selenium/ivy.xml (original)
+++ nutch/trunk/src/plugin/lib-selenium/ivy.xml Mon Sep 21 21:14:55 2015
@@ -27,7 +27,7 @@
</info>
<configurations>
- <include file="../../..//ivy/ivy-configurations.xml"/>
+ <include file="../../../ivy/ivy-configurations.xml"/>
</configurations>
<publications>
Modified: nutch/trunk/src/plugin/lib-selenium/plugin.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-selenium/plugin.xml?rev=1704425&r1=1704424&r2=1704425&view=diff
==============================================================================
--- nutch/trunk/src/plugin/lib-selenium/plugin.xml (original)
+++ nutch/trunk/src/plugin/lib-selenium/plugin.xml Mon Sep 21 21:14:55 2015
@@ -28,58 +28,139 @@
<library name="lib-selenium.jar">
<export name="*"/>
</library>
- <library name="cglib-nodep-2.1_3.jar"/>
- <library name="commons-codec-1.9.jar"/>
- <library name="commons-collections-3.2.1.jar"/>
- <library name="commons-exec-1.1.jar"/>
- <library name="commons-io-2.4.jar"/>
- <library name="commons-jxpath-1.3.jar"/>
- <library name="commons-lang3-3.3.2.jar"/>
- <library name="commons-logging-1.1.3.jar"/>
- <library name="cssparser-0.9.14.jar"/>
- <library name="gson-2.3.jar"/>
- <library name="guava-18.0.jar"/>
- <library name="htmlunit-2.15.jar"/>
- <library name="htmlunit-core-js-2.15.jar"/>
- <library name="httpclient-4.3.4.jar"/>
- <library name="httpcore-4.3.2.jar"/>
- <library name="httpmime-4.3.3.jar"/>
- <library name="ini4j-0.5.2.jar"/>
- <library name="jetty-http-8.1.15.v20140411.jar"/>
- <library name="jetty-io-8.1.15.v20140411.jar"/>
- <library name="jetty-util-8.1.15.v20140411.jar"/>
- <library name="jetty-websocket-8.1.15.v20140411.jar"/>
- <library name="jna-3.4.0.jar"/>
- <library name="nekohtml-1.9.21.jar"/>
- <library name="netty-3.5.2.Final.jar"/>
- <library name="operadriver-1.5.jar"/>
- <library name="operalaunchers-1.1.jar"/>
- <library name="platform-3.4.0.jar"/>
- <library name="protobuf-java-2.4.1.jar"/>
- <library name="sac-1.3.jar"/>
- <library name="selenium-api-2.44.0.jar"/>
- <library name="selenium-chrome-driver-2.44.0.jar"/>
- <library name="selenium-firefox-driver-2.44.0.jar"/>
- <library name="selenium-htmlunit-driver-2.44.0.jar"/>
- <library name="selenium-ie-driver-2.44.0.jar"/>
- <library name="selenium-java-2.44.0.jar"/>
- <library name="selenium-remote-driver-2.44.0.jar"/>
- <library name="selenium-safari-driver-2.44.0.jar"/>
- <library name="selenium-support-2.44.0.jar"/>
- <library name="serializer-2.7.1.jar"/>
- <library name="webbit-0.4.14.jar"/>
- <library name="xalan-2.7.1.jar"/>
- <library name="xercesImpl-2.11.0.jar"/>
- <library name="xml-apis-1.4.01.jar"/>
- </runtime>
-
- <requires>
- <library name="selenium-java-2.44.0.jar">
+ <!-- all classes from dependent libraries are exported -->
+ <library name="cglib-nodep-2.1_3.jar">
+ <export name="*"/>
+ </library>
+ <library name="commons-codec-1.9.jar">
+ <export name="*"/>
+ </library>
+ <library name="commons-collections-3.2.1.jar">
+ <export name="*"/>
+ </library>
+ <library name="commons-exec-1.1.jar">
+ <export name="*"/>
+ </library>
+ <library name="commons-io-2.4.jar">
+ <export name="*"/>
+ </library>
+ <library name="commons-jxpath-1.3.jar">
+ <export name="*"/>
+ </library>
+ <library name="commons-lang3-3.3.2.jar">
+ <export name="*"/>
+ </library>
+ <library name="commons-logging-1.1.3.jar">
+ <export name="*"/>
+ </library>
+ <library name="cssparser-0.9.14.jar">
+ <export name="*"/>
+ </library>
+ <library name="gson-2.3.jar">
+ <export name="*"/>
+ </library>
+ <library name="guava-18.0.jar">
+ <export name="*"/>
+ </library>
+ <library name="htmlunit-2.15.jar">
+ <export name="*"/>
+ </library>
+ <library name="htmlunit-core-js-2.15.jar">
+ <export name="*"/>
+ </library>
+ <library name="httpclient-4.3.4.jar">
+ <export name="*"/>
+ </library>
+ <library name="httpcore-4.3.2.jar">
+ <export name="*"/>
+ </library>
+ <library name="httpmime-4.3.3.jar">
+ <export name="*"/>
+ </library>
+ <library name="ini4j-0.5.2.jar">
+ <export name="*"/>
+ </library>
+ <library name="jetty-http-8.1.15.v20140411.jar">
+ <export name="*"/>
+ </library>
+ <library name="jetty-io-8.1.15.v20140411.jar">
+ <export name="*"/>
+ </library>
+ <library name="jetty-util-8.1.15.v20140411.jar">
+ <export name="*"/>
+ </library>
+ <library name="jetty-websocket-8.1.15.v20140411.jar">
+ <export name="*"/>
+ </library>
+ <library name="jna-3.4.0.jar">
+ <export name="*"/>
+ </library>
+ <library name="nekohtml-1.9.21.jar">
+ <export name="*"/>
+ </library>
+ <library name="netty-3.5.2.Final.jar">
<export name="*"/>
</library>
<library name="operadriver-1.5.jar">
<export name="*"/>
- <exclude name="selenium-remote-driver" />
</library>
- </requires>
+ <library name="operalaunchers-1.1.jar">
+ <export name="*"/>
+ </library>
+ <library name="phantomjsdriver-1.2.1.jar">
+ <export name="*"/>
+ </library>
+ <library name="platform-3.4.0.jar">
+ <export name="*"/>
+ </library>
+ <library name="protobuf-java-2.4.1.jar">
+ <export name="*"/>
+ </library>
+ <library name="sac-1.3.jar">
+ <export name="*"/>
+ </library>
+ <library name="selenium-api-2.44.0.jar">
+ <export name="*"/>
+ </library>
+ <library name="selenium-chrome-driver-2.44.0.jar">
+ <export name="*"/>
+ </library>
+ <library name="selenium-firefox-driver-2.44.0.jar">
+ <export name="*"/>
+ </library>
+ <library name="selenium-htmlunit-driver-2.44.0.jar">
+ <export name="*"/>
+ </library>
+ <library name="selenium-ie-driver-2.44.0.jar">
+ <export name="*"/>
+ </library>
+ <library name="selenium-java-2.44.0.jar">
+ <export name="*"/>
+ </library>
+ <library name="selenium-remote-driver-2.44.0.jar">
+ <export name="*"/>
+ </library>
+ <library name="selenium-safari-driver-2.44.0.jar">
+ <export name="*"/>
+ </library>
+ <library name="selenium-support-2.44.0.jar">
+ <export name="*"/>
+ </library>
+ <library name="serializer-2.7.1.jar">
+ <export name="*"/>
+ </library>
+ <library name="webbit-0.4.14.jar">
+ <export name="*"/>
+ </library>
+ <library name="xalan-2.7.1.jar">
+ <export name="*"/>
+ </library>
+ <library name="xercesImpl-2.11.0.jar">
+ <export name="*"/>
+ </library>
+ <library name="xml-apis-1.4.01.jar">
+ <export name="*"/>
+ </library>
+ </runtime>
+
</plugin>
Modified: nutch/trunk/src/plugin/protocol-interactiveselenium/build-ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-interactiveselenium/build-ivy.xml?rev=1704425&r1=1704424&r2=1704425&view=diff
==============================================================================
--- nutch/trunk/src/plugin/protocol-interactiveselenium/build-ivy.xml (original)
+++ nutch/trunk/src/plugin/protocol-interactiveselenium/build-ivy.xml Mon Sep
21 21:14:55 2015
@@ -48,7 +48,7 @@
</target>
<target name="deps-jar" depends="init-ivy">
- <ivy:retrieve pattern="lib/[artifact]-[revision].[ext]"/>
+ <ivy:retrieve pattern="lib/[artifact]-[revision].[ext]" sync="true"/>
</target>
</project>
Modified: nutch/trunk/src/plugin/protocol-interactiveselenium/ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-interactiveselenium/ivy.xml?rev=1704425&r1=1704424&r2=1704425&view=diff
==============================================================================
--- nutch/trunk/src/plugin/protocol-interactiveselenium/ivy.xml (original)
+++ nutch/trunk/src/plugin/protocol-interactiveselenium/ivy.xml Mon Sep 21
21:14:55 2015
@@ -27,7 +27,7 @@
</info>
<configurations>
- <include file="../../..//ivy/ivy-configurations.xml"/>
+ <include file="../../../ivy/ivy-configurations.xml"/>
</configurations>
<publications>
@@ -36,13 +36,7 @@
</publications>
<dependencies>
- <!-- begin selenium dependencies -->
- <dependency org="org.seleniumhq.selenium" name="selenium-java"
rev="2.44.0" />
-
- <dependency org="com.opera" name="operadriver" rev="1.5">
- <exclude org="org.seleniumhq.selenium" name="selenium-remote-driver" />
- </dependency>
- <!-- end selenium dependencies -->
+ <!-- Note: only dependencies which are not contained in lib-selenium have
to be listed here! -->
</dependencies>
</ivy-module>
Modified: nutch/trunk/src/plugin/protocol-interactiveselenium/plugin.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-interactiveselenium/plugin.xml?rev=1704425&r1=1704424&r2=1704425&view=diff
==============================================================================
--- nutch/trunk/src/plugin/protocol-interactiveselenium/plugin.xml (original)
+++ nutch/trunk/src/plugin/protocol-interactiveselenium/plugin.xml Mon Sep 21
21:14:55 2015
@@ -25,49 +25,6 @@
<library name="protocol-interactiveselenium.jar">
<export name="*"/>
</library>
- <library name="cglib-nodep-2.1_3.jar"/>
- <library name="commons-codec-1.9.jar"/>
- <library name="commons-collections-3.2.1.jar"/>
- <library name="commons-exec-1.1.jar"/>
- <library name="commons-io-2.4.jar"/>
- <library name="commons-jxpath-1.3.jar"/>
- <library name="commons-lang3-3.3.2.jar"/>
- <library name="commons-logging-1.1.3.jar"/>
- <library name="cssparser-0.9.14.jar"/>
- <library name="gson-2.3.jar"/>
- <library name="guava-18.0.jar"/>
- <library name="htmlunit-2.15.jar"/>
- <library name="htmlunit-core-js-2.15.jar"/>
- <library name="httpclient-4.3.4.jar"/>
- <library name="httpcore-4.3.2.jar"/>
- <library name="httpmime-4.3.3.jar"/>
- <library name="ini4j-0.5.2.jar"/>
- <library name="jetty-http-8.1.15.v20140411.jar"/>
- <library name="jetty-io-8.1.15.v20140411.jar"/>
- <library name="jetty-util-8.1.15.v20140411.jar"/>
- <library name="jetty-websocket-8.1.15.v20140411.jar"/>
- <library name="jna-3.4.0.jar"/>
- <library name="nekohtml-1.9.21.jar"/>
- <library name="netty-3.5.2.Final.jar"/>
- <library name="operadriver-1.5.jar"/>
- <library name="operalaunchers-1.1.jar"/>
- <library name="platform-3.4.0.jar"/>
- <library name="protobuf-java-2.4.1.jar"/>
- <library name="sac-1.3.jar"/>
- <library name="selenium-api-2.44.0.jar"/>
- <library name="selenium-chrome-driver-2.44.0.jar"/>
- <library name="selenium-firefox-driver-2.44.0.jar"/>
- <library name="selenium-htmlunit-driver-2.44.0.jar"/>
- <library name="selenium-ie-driver-2.44.0.jar"/>
- <library name="selenium-java-2.44.0.jar"/>
- <library name="selenium-remote-driver-2.44.0.jar"/>
- <library name="selenium-safari-driver-2.44.0.jar"/>
- <library name="selenium-support-2.44.0.jar"/>
- <library name="serializer-2.7.1.jar"/>
- <library name="webbit-0.4.14.jar"/>
- <library name="xalan-2.7.1.jar"/>
- <library name="xercesImpl-2.11.0.jar"/>
- <library name="xml-apis-1.4.01.jar"/>
</runtime>
<requires>
Modified: nutch/trunk/src/plugin/protocol-selenium/build-ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-selenium/build-ivy.xml?rev=1704425&r1=1704424&r2=1704425&view=diff
==============================================================================
--- nutch/trunk/src/plugin/protocol-selenium/build-ivy.xml (original)
+++ nutch/trunk/src/plugin/protocol-selenium/build-ivy.xml Mon Sep 21 21:14:55
2015
@@ -48,7 +48,7 @@
</target>
<target name="deps-jar" depends="init-ivy">
- <ivy:retrieve pattern="lib/[artifact]-[revision].[ext]"/>
+ <ivy:retrieve pattern="lib/[artifact]-[revision].[ext]" sync="true"/>
</target>
</project>
Modified: nutch/trunk/src/plugin/protocol-selenium/ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-selenium/ivy.xml?rev=1704425&r1=1704424&r2=1704425&view=diff
==============================================================================
--- nutch/trunk/src/plugin/protocol-selenium/ivy.xml (original)
+++ nutch/trunk/src/plugin/protocol-selenium/ivy.xml Mon Sep 21 21:14:55 2015
@@ -27,7 +27,7 @@
</info>
<configurations>
- <include file="../../..//ivy/ivy-configurations.xml"/>
+ <include file="../../../ivy/ivy-configurations.xml"/>
</configurations>
<publications>
@@ -36,17 +36,7 @@
</publications>
<dependencies>
- <!-- begin selenium dependencies -->
- <dependency org="org.seleniumhq.selenium" name="selenium-java"
rev="2.44.0" />
-
- <dependency org="com.opera" name="operadriver" rev="1.5">
- <exclude org="org.seleniumhq.selenium" name="selenium-remote-driver" />
- </dependency>
- <dependency org="com.codeborne" name="phantomjsdriver" rev="1.2.1" >
- <exclude org="org.seleniumhq.selenium" name="selenium-remote-driver" />
- <exclude org="org.seleniumhq.selenium" name="selenium-java" />
- </dependency>
- <!-- end selenium dependencies -->
+ <!-- Note: only dependencies which are not contained in lib-selenium have
to be listed here! -->
</dependencies>
</ivy-module>
Modified: nutch/trunk/src/plugin/protocol-selenium/plugin.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-selenium/plugin.xml?rev=1704425&r1=1704424&r2=1704425&view=diff
==============================================================================
--- nutch/trunk/src/plugin/protocol-selenium/plugin.xml (original)
+++ nutch/trunk/src/plugin/protocol-selenium/plugin.xml Mon Sep 21 21:14:55 2015
@@ -25,49 +25,6 @@
<library name="protocol-selenium.jar">
<export name="*"/>
</library>
- <library name="cglib-nodep-2.1_3.jar"/>
- <library name="commons-codec-1.9.jar"/>
- <library name="commons-collections-3.2.1.jar"/>
- <library name="commons-exec-1.1.jar"/>
- <library name="commons-io-2.4.jar"/>
- <library name="commons-jxpath-1.3.jar"/>
- <library name="commons-lang3-3.3.2.jar"/>
- <library name="commons-logging-1.1.3.jar"/>
- <library name="cssparser-0.9.14.jar"/>
- <library name="gson-2.3.jar"/>
- <library name="guava-18.0.jar"/>
- <library name="htmlunit-2.15.jar"/>
- <library name="htmlunit-core-js-2.15.jar"/>
- <library name="httpclient-4.3.4.jar"/>
- <library name="httpcore-4.3.2.jar"/>
- <library name="httpmime-4.3.3.jar"/>
- <library name="ini4j-0.5.2.jar"/>
- <library name="jetty-http-8.1.15.v20140411.jar"/>
- <library name="jetty-io-8.1.15.v20140411.jar"/>
- <library name="jetty-util-8.1.15.v20140411.jar"/>
- <library name="jetty-websocket-8.1.15.v20140411.jar"/>
- <library name="jna-3.4.0.jar"/>
- <library name="nekohtml-1.9.21.jar"/>
- <library name="netty-3.5.2.Final.jar"/>
- <library name="operadriver-1.5.jar"/>
- <library name="operalaunchers-1.1.jar"/>
- <library name="platform-3.4.0.jar"/>
- <library name="protobuf-java-2.4.1.jar"/>
- <library name="sac-1.3.jar"/>
- <library name="selenium-api-2.44.0.jar"/>
- <library name="selenium-chrome-driver-2.44.0.jar"/>
- <library name="selenium-firefox-driver-2.44.0.jar"/>
- <library name="selenium-htmlunit-driver-2.44.0.jar"/>
- <library name="selenium-ie-driver-2.44.0.jar"/>
- <library name="selenium-java-2.44.0.jar"/>
- <library name="selenium-remote-driver-2.44.0.jar"/>
- <library name="selenium-safari-driver-2.44.0.jar"/>
- <library name="selenium-support-2.44.0.jar"/>
- <library name="serializer-2.7.1.jar"/>
- <library name="webbit-0.4.14.jar"/>
- <library name="xalan-2.7.1.jar"/>
- <library name="xercesImpl-2.11.0.jar"/>
- <library name="xml-apis-1.4.01.jar"/>
</runtime>
<requires>
