diff --git a/webmagic-selenium/pom.xml b/webmagic-selenium/pom.xml index 6ddc61c..b66ca0c 100644 --- a/webmagic-selenium/pom.xml +++ b/webmagic-selenium/pom.xml @@ -13,7 +13,7 @@ org.seleniumhq.selenium selenium-java - 2.46.0 + 2.41.0 us.codecraft diff --git a/webmagic-selenium/src/main/java/us/codecraft/webmagic/downloader/selenium/WebDriverPool.java b/webmagic-selenium/src/main/java/us/codecraft/webmagic/downloader/selenium/WebDriverPool.java index 59f83ea..1472cb3 100644 --- a/webmagic-selenium/src/main/java/us/codecraft/webmagic/downloader/selenium/WebDriverPool.java +++ b/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(); diff --git a/webmagic-selenium/src/test/resources/config.ini b/webmagic-selenium/src/test/resources/config.ini new file mode 100644 index 0000000..40c8b46 --- /dev/null +++ b/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 \ No newline at end of file