[JWebUnit-development] SF.net SVN: jwebunit:[921] trunk
Brought to you by:
henryju
Menu
▾
▴
[JWebUnit-development] SF.net SVN: jwebunit:[921] trunk
|
From: <he...@us...> - 2011-09-23 14:47:01
|
Revision: 921
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=921&view=rev
Author: henryju
Date: 2011-09-23 14:46:55 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Cleanup of pom dependencies. Add WebDriverTestingEngine in the list of available engines.
Modified Paths:
--------------
trunk/jwebunit-core/pom.xml
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/util/TestingEngineRegistry.java
trunk/jwebunit-htmlunit-plugin/pom.xml
trunk/jwebunit-selenium-plugin/pom.xml
trunk/jwebunit-webdriver-plugin/pom.xml
trunk/pom.xml
Property Changed:
----------------
trunk/jwebunit-webdriver-plugin/
Modified: trunk/jwebunit-core/pom.xml
===================================================================
--- trunk/jwebunit-core/pom.xml 2011-09-23 14:44:03 UTC (rev 920)
+++ trunk/jwebunit-core/pom.xml 2011-09-23 14:46:55 UTC (rev 921)
@@ -24,10 +24,12 @@
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
</dependencies>
<properties>
Modified: trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/util/TestingEngineRegistry.java
===================================================================
--- trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/util/TestingEngineRegistry.java 2011-09-23 14:44:03 UTC (rev 920)
+++ trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/util/TestingEngineRegistry.java 2011-09-23 14:46:55 UTC (rev 921)
@@ -40,6 +40,11 @@
*/
public final static String TESTING_ENGINE_SELENIUM = "TestingEngineSelenium";
+ /**
+ * Key of HtmlUnit testing engine.
+ */
+ public final static String TESTING_ENGINE_WEBDRIVER = "TestingEngineWebdriver";
+
private static Hashtable<String,Class<?>> testingEngineMap = new Hashtable<String,Class<?>>();
static {
@@ -57,6 +62,13 @@
} catch (ClassNotFoundException e) {
// Selenium Testing Engine is not present in the classpath. Nothing to do.
}
+ cp = "net.sourceforge.jwebunit.webdriver.WebDriverTestingEngineImpl";
+ // Try to load Webdriver Testing Engine to check if it is present.
+ try {
+ addTestingEngine(TESTING_ENGINE_WEBDRIVER, cp);
+ } catch (ClassNotFoundException e) {
+ // Webdriver Testing Engine is not present in the classpath. Nothing to do.
+ }
}
/**
Modified: trunk/jwebunit-htmlunit-plugin/pom.xml
===================================================================
--- trunk/jwebunit-htmlunit-plugin/pom.xml 2011-09-23 14:44:03 UTC (rev 920)
+++ trunk/jwebunit-htmlunit-plugin/pom.xml 2011-09-23 14:46:55 UTC (rev 921)
@@ -23,6 +23,7 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
+ <version>2.9</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
@@ -56,6 +57,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
</dependencies>
<properties>
Modified: trunk/jwebunit-selenium-plugin/pom.xml
===================================================================
--- trunk/jwebunit-selenium-plugin/pom.xml 2011-09-23 14:44:03 UTC (rev 920)
+++ trunk/jwebunit-selenium-plugin/pom.xml 2011-09-23 14:46:55 UTC (rev 921)
@@ -55,6 +55,7 @@
<dependency>
<groupId>org.seleniumhq.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jwebunit</groupId>
@@ -78,6 +79,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
</dependencies>
<properties>
Property changes on: trunk/jwebunit-webdriver-plugin
___________________________________________________________________
Modified: svn:ignore
- target
+ target
.project
.classpath
.settings
Modified: trunk/jwebunit-webdriver-plugin/pom.xml
===================================================================
--- trunk/jwebunit-webdriver-plugin/pom.xml 2011-09-23 14:44:03 UTC (rev 920)
+++ trunk/jwebunit-webdriver-plugin/pom.xml 2011-09-23 14:46:55 UTC (rev 921)
@@ -1,8 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>jwebunit</artifactId>
<groupId>net.sourceforge.jwebunit</groupId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -30,13 +31,19 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-htmlunit-driver</artifactId>
- <version>2.0b2</version>
- </dependency>
+ <version>2.6.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-support</artifactId>
- <version>2.0b2</version>
- </dependency>
+ <version>2.6.0</version>
+ </dependency>
<dependency>
<groupId>net.sourceforge.jwebunit</groupId>
<artifactId>jwebunit-core</artifactId>
@@ -59,7 +66,27 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
+ <dependency>
+ <groupId>biz.neustar</groupId>
+ <artifactId>browsermob-proxy</artifactId>
+ <version>2.0-beta-3</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>org.apache.commons</artifactId>
+ <groupId>commons-io</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
</dependencies>
<properties>
<topDirectoryLocation>..</topDirectoryLocation>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-09-23 14:44:03 UTC (rev 920)
+++ trunk/pom.xml 2011-09-23 14:46:55 UTC (rev 921)
@@ -25,6 +25,7 @@
<module>jwebunit-commons-tests</module>
<module>jwebunit-htmlunit-plugin</module>
<module>jwebunit-selenium-plugin</module>
+ <module>jwebunit-webdriver-plugin</module>
</modules>
<mailingLists>
<mailingList>
@@ -395,36 +396,6 @@
<version>7.3.1.v20110307</version>
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.9</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
