Revision: 464
Author: henryju
Date: 2006-05-25 11:14:33 -0700 (Thu, 25 May 2006)
ViewCVS: http://svn.sourceforge.net/jwebunit/?rev=464&view=rev
Log Message:
-----------
Replace Log4j dependencies by Commons-Logging
Modified Paths:
--------------
trunk/jwebunit-htmlunit-plugin/pom.xml
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitDialog.java
trunk/jwebunit-selenium-plugin/pom.xml
Modified: trunk/jwebunit-htmlunit-plugin/pom.xml
===================================================================
--- trunk/jwebunit-htmlunit-plugin/pom.xml 2006-05-23 09:04:39 UTC (rev
463)
+++ trunk/jwebunit-htmlunit-plugin/pom.xml 2006-05-25 18:14:33 UTC (rev
464)
@@ -1,74 +1,70 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <parent>
- <artifactId>jwebunit</artifactId>
- <groupId>net.sourceforge.jwebunit</groupId>
- <version>1.3-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jwebunit-htmlunit-plugin</artifactId>
- <name>HtmlUnit Plugin</name>
- <description>HtmlUnit plugin for jWebUnit.</description>
- <repositories>
- <repository>
- <releases />
- <snapshots />
- <id>private</id>
- <name>Private repository</name>
- <url>file:${basedir}/private-repository</url>
- </repository>
- </repositories>
- <properties>
- <topDirectoryLocation>..</topDirectoryLocation>
- </properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>1.9-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jwebunit</groupId>
- <artifactId>jwebunit-core</artifactId>
- <version>1.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jwebunit</groupId>
- <artifactId>jwebunit-commons-tests</artifactId>
- <version>1.3-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- <!-- <forkMode>pertest</forkMode> -->
- <!-- TODO Testcases should all end with Test, not Tests-->
- <includes>
- <include>**/*Test.java</include>
- <include>**/*Tests.java</include>
- </includes>
- <excludes>
- <exclude>**/*AbstractTest.java</exclude>
- <exclude>**/*AbstractTests.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <parent>
+ <artifactId>jwebunit</artifactId>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <version>1.3-SNAPSHOT</version>
+ <relativePath>../</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jwebunit-htmlunit-plugin</artifactId>
+ <name>HtmlUnit Plugin</name>
+ <description>HtmlUnit plugin for jWebUnit.</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/*Tests.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/*AbstractTest.java</exclude>
+ <exclude>**/*AbstractTests.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <releases />
+ <snapshots />
+ <id>private</id>
+ <name>Private repository</name>
+ <url>file:${basedir}/private-repository</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>1.9-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <artifactId>jwebunit-core</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <artifactId>jwebunit-commons-tests</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <topDirectoryLocation>..</topDirectoryLocation>
+ </properties>
+</project>
\ No newline at end of file
Modified:
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitDialog.java
===================================================================
---
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitDialog.java
2006-05-23 09:04:39 UTC (rev 463)
+++
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitDialog.java
2006-05-25 18:14:33 UTC (rev 464)
@@ -8,8 +8,10 @@
import org.apache.commons.httpclient.Cookie;
import org.apache.commons.httpclient.HttpState;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
@@ -19,6 +21,7 @@
import java.util.Arrays;
import java.util.List;
+
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
import org.jaxen.JaxenException;
@@ -72,7 +75,7 @@
/**
* Logger for this class.
*/
- private static final Logger LOGGER =
Logger.getLogger(HtmlUnitDialog.class);
+ private static final Log LOGGER = LogFactory.getLog(HtmlUnitDialog.class);
/**
* Encapsulate browser abilities.
Modified: trunk/jwebunit-selenium-plugin/pom.xml
===================================================================
--- trunk/jwebunit-selenium-plugin/pom.xml 2006-05-23 09:04:39 UTC (rev
463)
+++ trunk/jwebunit-selenium-plugin/pom.xml 2006-05-25 18:14:33 UTC (rev
464)
@@ -24,11 +24,6 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.openqa.selenium.server</groupId>
- <artifactId>selenium-server</artifactId>
- <version>0.7.2-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.openqa.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
<version>0.7.2-SNAPSHOT</version>
@@ -44,11 +39,6 @@
<version>1.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -60,7 +50,7 @@
<include>**/*Test.java</include>
</includes>
<testFailureIgnore>true</testFailureIgnore>
- <skip>true</skip>
+ <skip>false</skip>
</configuration>
</plugin>
</plugins>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
Jwebunit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
