Revision: 846
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=846&view=rev
Author: henryju
Date: 2010-10-05 10:30:48 +0000 (Tue, 05 Oct 2010)
Log Message:
-----------
Updated to HtmlUnit 2.8 and to slf4j 1.6.1.
Modified Paths:
--------------
trunk/jwebunit-commons-tests/src/main/resources/log4j.properties
trunk/jwebunit-htmlunit-plugin/pom.xml
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
trunk/pom.xml
trunk/src/changes/changes.xml
Modified: trunk/jwebunit-commons-tests/src/main/resources/log4j.properties
===================================================================
--- trunk/jwebunit-commons-tests/src/main/resources/log4j.properties
2010-10-05 10:13:43 UTC (rev 845)
+++ trunk/jwebunit-commons-tests/src/main/resources/log4j.properties
2010-10-05 10:30:48 UTC (rev 846)
@@ -35,7 +35,11 @@
#httpclient
log4j.logger.org.apache.commons.httpclient=ERROR
-log4j.logger.httpclient.wire=ERROR
+log4j.logger.org.apache.http=ERROR
+#mime4j
+log4j.logger.org.apache.james.mime4j=ERROR
+
+
#Jetty
log4j.logger.org.mortbay=ERROR
Modified: trunk/jwebunit-htmlunit-plugin/pom.xml
===================================================================
--- trunk/jwebunit-htmlunit-plugin/pom.xml 2010-10-05 10:13:43 UTC (rev
845)
+++ trunk/jwebunit-htmlunit-plugin/pom.xml 2010-10-05 10:30:48 UTC (rev
846)
@@ -43,6 +43,12 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>net.sourceforge.jwebunit</groupId>
@@ -61,6 +67,10 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
Modified:
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
===================================================================
---
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
2010-10-05 10:13:43 UTC (rev 845)
+++
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
2010-10-05 10:30:48 UTC (rev 846)
@@ -300,7 +300,7 @@
c.setMaxAge(second.intValue());
}
c.setPath(cookie.getPath());
- c.setSecure(cookie.toHttpClient().getSecure());
+ c.setSecure(cookie.toHttpClient().isSecure());
c.setVersion(cookie.toHttpClient().getVersion());
result.add(c);
}
@@ -735,12 +735,8 @@
}
public InputStream getInputStream() {
- try {
- return wc.getCurrentWindow().getEnclosedPage().getWebResponse()
- .getContentAsStream();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ return wc.getCurrentWindow().getEnclosedPage().getWebResponse()
+ .getContentAsStream();
}
public InputStream getInputStream(URL resourceUrl)
@@ -755,9 +751,6 @@
} catch (FailingHttpStatusCodeException aException) {
throw new TestingEngineResponseException(
aException.getStatusCode(), aException);
-
- } catch (IOException aException) {
- throw new RuntimeException(aException);
} finally {
if (imageWindow != null) {
wc.deregisterWebWindow(imageWindow);
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-10-05 10:13:43 UTC (rev 845)
+++ trunk/pom.xml 2010-10-05 10:30:48 UTC (rev 846)
@@ -337,7 +337,7 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium.client-drivers</groupId>
@@ -357,12 +357,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.0</version>
+ <version>1.6.1</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.0</version>
+ <version>1.6.1</version>
<optional>true</optional>
</dependency>
</dependencies>
Modified: trunk/src/changes/changes.xml
===================================================================
--- trunk/src/changes/changes.xml 2010-10-05 10:13:43 UTC (rev 845)
+++ trunk/src/changes/changes.xml 2010-10-05 10:30:48 UTC (rev 846)
@@ -30,6 +30,12 @@
<body>
<release version="2.5" date="UNKNOW" description="">
<action type="update" dev="henryju">
+ Updated to slf4j 1.6.1.
+ </action>
+ <action type="update" dev="henryju">
+ Updated to HtmlUnit 2.8.
+ </action>
+ <action type="update" dev="henryju">
Updated to JUnit 4.8.2.
</action>
<action type="add" dev="henryju" issue="1864365" due-to="Jason
McSwain">
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
JWebUnit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
