修复seleniumDownloader配置文件写死的问题 #475

webmagic-selenium/pom.xml

@@ -13,7 +13,7 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-java</artifactId>
-			<version>2.46.0</version>
+			<version>2.41.0</version>
 		</dependency>
 		<dependency>
 			<groupId>us.codecraft</groupId>

webmagic-selenium/src/main/java/us/codecraft/webmagic/downloader/selenium/WebDriverPool.java

@@ -45,7 +45,7 @@ class WebDriverPool {
 	private WebDriver mDriver = null;
 	private boolean mAutoQuitDriver = true;
 
-	private static final String CONFIG_FILE = "/Users/Bingo/Documents/workspace/webmagic/webmagic-selenium/config.ini";
+	private static final String DEFAULT_CONFIG_FILE = "/data/webmagic/webmagic-selenium/config.ini";
 	private static final String DRIVER_FIREFOX = "firefox";
 	private static final String DRIVER_CHROME = "chrome";
 	private static final String DRIVER_PHANTOMJS = "phantomjs";
@@ -64,7 +64,11 @@ class WebDriverPool {
 	public void configure() throws IOException {
 		// Read config file
 		sConfig = new Properties();
-		sConfig.load(new FileReader(CONFIG_FILE));
+		String configFile = DEFAULT_CONFIG_FILE;
+		if (System.getProperty("selenuim_config")!=null){
+			configFile = System.getProperty("selenuim_config");
+		}
+		sConfig.load(new FileReader(configFile));
 
 		// Prepare capabilities
 		sCaps = new DesiredCapabilities();

webmagic-selenium/src/test/resources/config.ini

@@ -0,0 +1,11 @@
+#driver=phantomjs
+driver=firefox
+driver=chrome
+#driver=http://localhost:8910
+driver=http://localhost:4444/wd/hub
+
+# PhantomJS specific config (change according to your installation)
+#phantomjs_exec_path=/Users/detro/bin/phantomjs-qt5
+phantomjs_exec_path=/Users/detro/bin/phantomjs-upstream
+phantomjs_driver_path=../../src/main.js
+phantomjs_driver_loglevel=DEBUG