Update documentation and site.

Author: henryju

src/changes/changes.xml

@@ -10,16 +10,11 @@
 				Refactoring of Table assertions to handle perfectly colspan and rowspan.
 			</action>
 			<action type="add" dev="Julien Henry">
-				Added XPath methods to core API. Only HtmlUnit and Selenium implement it.
-			</action>
-			<action type="add" dev="Julien Henry">
-				Added Selenium plugin module. SeleniumDialog uses Selenium-RC project, that take control of
-				your web browser to execute the tests. Main advantage is perfect Javascript support. Drawbacks are:
-				tests are slow; you need a browser and an X server.
+				Added XPath methods to core API. HttpUnit doesn't support clickElementByXPath().
 			</action>
 			<action type="update" dev="Julien Henry">
 				Split jWebUnit in modules: one for the core (jWebUnit API), one for the tests (that all plugins should pass),
-				and one for each plugin (currently HtmlUnit, HttpUnit and Jacobie). This way, for example,  when you want to use
+				and one for each plugin (currently HtmlUnit and HttpUnit). This way, for example,  when you want to use
 				HtmlUnit plugin, you don't have to include all HttpUnit dependencies.
 			</action>
 			<action type="update" dev="Julien Henry">
@@ -31,9 +26,6 @@
 			<action type="add" dev="Julien Henry">
 				Added Maven 2 support. There are many reports available on the website.
 			</action>
-			<action type="add" dev="Nick Neuberger">
-				Added JacobieDialog.
-			</action>
 			<action type="add" dev="Jim Weaver" issue="1004243" due-to="Srinivasan Ranganthan">
 				Added HttpUnitDialog setter on WebTester in case someone using delegation wants to carry
 				state from one tester to another.  Also made some signatures on WebTester public that 

src/site/resources/images/jwebunit-architecture.odg

@@ -53,94 +53,16 @@
 		<source>mvn package</source>
 		If you build jWebUnit for the first time and you configured Maven as described
 		earlier, you will see the following text:
-<source><![CDATA[
-[INFO] Scanning for projects...
-[INFO] ----------------------------------------------------------------------------
-[INFO] Building jWebUnit
-[INFO]    task-segment: [package]
-[INFO] ----------------------------------------------------------------------------
-[INFO] artifact org.apache.maven.plugins:maven-jar-plugin: checking for updates from Maven CodeHaus Snapshots
-[INFO] snapshot org.apache.maven.plugins:maven-jar-plugin:2.1-SNAPSHOT: checking for updates from Maven CodeHaus Snapshots
-[INFO] [resources:resources]
-[INFO] Using default encoding to copy filtered resources.
-Downloading: file:D:\jhenry\jwebunit\jWebUnit/private-repository/net/sourceforge/jacobie/jacobie/1.3/jacobie-1.3.pom
-612b downloaded
-[WARNING] *** CHECKSUM FAILED - Error retrieving checksum file for net/sourceforge/jacobie/jacobie/1.3/jacobie-1.3.pom - IGNORING
-Downloading: file:D:\jhenry\jwebunit\jWebUnit/private-repository/net/sourceforge/jacob-project/jacob/1.7/jacob-1.7.pom
-423b downloaded
-[WARNING] *** CHECKSUM FAILED - Error retrieving checksum file for net/sourceforge/jacob-project/jacob/1.7/jacob-1.7.pom - IGNORING
-Downloading: file:D:\jhenry\jwebunit\jWebUnit/private-repository/net/sourceforge/htmlunit/htmlunit/1.9-prerelease/htmlunit-1.9-prerelease.pom
-8K downloaded
-[WARNING] *** CHECKSUM FAILED - Error retrieving checksum file for net/sourceforge/htmlunit/htmlunit/1.9-prerelease/htmlunit-1.9-prerelease.pom - IGNORING
-[WARNING]
-        Artifact commons-logging:commons-logging:jar:1.0.4:test retains local scope 'test' overriding broader scope 'compile'
-        given by a dependency. If this is not intended, modify or remove the local scope.
-
-Downloading: file:D:\jhenry\jwebunit\jWebUnit/private-repository/net/sourceforge/httpunit/httpunit/1.6.1-20060101/httpunit-1.6.1-20060101.pom
-1K downloaded
-[WARNING] *** CHECKSUM FAILED - Error retrieving checksum file for net/sourceforge/httpunit/httpunit/1.6.1-20060101/httpunit-1.6.1-20060101.pom - IGNORING
-Downloading: file:D:\jhenry\jwebunit\jWebUnit/private-repository/net/sourceforge/httpunit/httpunit/1.6.1-20060101/httpunit-1.6.1-20060101.jar
-397K downloaded
-[WARNING] *** CHECKSUM FAILED - Error retrieving checksum file for net/sourceforge/httpunit/httpunit/1.6.1-20060101/httpunit-1.6.1-20060101.jar - IGNORING
-Downloading: file:D:\jhenry\jwebunit\jWebUnit/private-repository/net/sourceforge/jacobie/jacobie/1.3/jacobie-1.3.jar
-32K downloaded
-[WARNING] *** CHECKSUM FAILED - Error retrieving checksum file for net/sourceforge/jacobie/jacobie/1.3/jacobie-1.3.jar - IGNORING
-Downloading: file:D:\jhenry\jwebunit\jWebUnit/private-repository/net/sourceforge/htmlunit/htmlunit/1.9-prerelease/htmlunit-1.9-prerelease.jar
-356K downloaded
-[WARNING] *** CHECKSUM FAILED - Error retrieving checksum file for net/sourceforge/htmlunit/htmlunit/1.9-prerelease/htmlunit-1.9-prerelease.jar - IGNORING
-Downloading: file:D:\jhenry\jwebunit\jWebUnit/private-repository/net/sourceforge/jacob-project/jacob/1.7/jacob-1.7.jar
-16K downloaded
-[WARNING] *** CHECKSUM FAILED - Error retrieving checksum file for net/sourceforge/jacob-project/jacob/1.7/jacob-1.7.jar - IGNORING
-[INFO] [compiler:compile]
-Compiling 21 source files to D:\jhenry\jwebunit\jWebUnit\target\classes
-[INFO] [resources:testResources]
-[INFO] Using default encoding to copy filtered resources.
-[INFO] [compiler:testCompile]
-Compiling 25 source files to D:\jhenry\jwebunit\jWebUnit\target\test-classes
-[INFO] [surefire:test]
-[INFO] Setting reports dir: D:\jhenry\jwebunit\jWebUnit\target/surefire-reports
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-[surefire] Running net.sourceforge.jwebunit.AllTests
-log4j:WARN No appenders could be found for logger (org.mortbay.xml.XmlParser).
-log4j:WARN Please initialize the log4j system properly.
-[surefire] Tests run: 151, Failures: 2, Errors: 20, Time elapsed: 15,907 sec <<<<<<<< FAILURE !!
-[ERROR] There are test failures.
-[INFO] [jar:jar]
-[INFO] Building jar: D:\jhenry\jwebunit\jWebUnit\target\jwebunit-1.3-SNAPSHOT.jar
-[INFO] ------------------------------------------------------------------------
-[INFO] BUILD SUCCESSFUL
-[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 27 seconds
-[INFO] Finished at: Mon Apr 24 14:14:52 CEST 2006
-[INFO] Final Memory: 7M/24M
-[INFO] ------------------------------------------------------------------------
-]]></source></p>
+<source><![CDATA[NEED UPDATE]]></source></p>
 	<p>
-		You now have successfully built the <tt>jwebunit-1.3-SNAPSHOT.jar</tt>.
-	</p>
-</subsection>
-<subsection name="Building the site">
-	<p>
-		Generating the jWebUnit website with Maven is also not difficult:
-		<source>mvn site</source>
-		is all there's to it.
-		After downloading lots and lots of jar files, Maven will build the website which 
-		contains junit results, checkstyle results, and the like, just like the website
-		you're now looking at. You can find the website in the 
-		<source>target/site</source> directory.
-	</p>
-	<p>
-		Just open the index.html in your browser.
+		You now have successfully built the <tt>jwebunit-1.3.jar</tt>.
 	</p>
 </subsection>
 <subsection name="Building an assembly">
-	<p>     An assembly is a package for final users.
+	<p>     An assembly is a package for final users, including eventually all dependencies.
 		Building an assembly with Maven consists of executing Maven like this:
 		<source>mvn assembly:assembly -DdescriptorId=XXX</source>
-		Where XXX is:
+		Where XXX is one of :
 		<ul>
 		  <li>bin : Package jwebunit-xx.jar in 3 formats (zip, tar.gz and tar.bz2)</li>
 		  <li>jar-with-dependencies : Create jwebunit-xx-with-dependencies.jar, a big jar with all

src/site/resources/images/jwebunit-architecture.png

@@ -2,19 +2,24 @@
 <document>
     <properties>
         <author email="dashorst.at.users.sourceforge.net">Martijn Dashorst</author>
-        <title>jWebUnit</title>
+        <title>jWebUnit 1.x</title>
     </properties>
     <meta name="keyword" content="jwebunit, java, junit, htmlunit, jacobie, httpunit, integration, test, automated, html, webtest"/>
 	<head>
 		<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
 	</head>
 <body>
+<section name="Welcome">
+    <p>
+        You are on the jWebUnit 1.x website. Current version is 1.3 (will be available in a few days). This is
+        the "stable" version of jWebUnit. You can also consult <a href="2.x/index.html">jWebUnit 2.x website</a>.
+    </p>
+</section>
 <section name="What is jWebUnit?">
     <p>
         jWebUnit is a Java framework that facilitates creation of acceptance tests for web applications. It 
         evolved from a project where we were using <a href="http://www.junit.org">JUnit</a> to create acceptance tests. 
-        Also, we have different testing engines: <a href="jwebunit-httpunit-plugin/index.html">HttpUnit</a>, <a href="jwebunit-htmlunit-plugin/index.html">HtmlUnit</a>, <a href="jwebunit-jacobie-plugin/index.html">Jacobie</a>
-        and <a href="jwebunit-selenium-plugin/index.html">Selenium</a>. 
+        Also, we have different testing engines: <a href="jwebunit-httpunit-plugin/index.html">HttpUnit</a> and <a href="jwebunit-htmlunit-plugin/index.html">HtmlUnit</a>. 
         As the tests were being written, they were continuously refactored to remove duplication and other bad smells in the test 
         code. jWebUnit is the result of these refactorings.
     </p>
@@ -26,7 +31,7 @@
         via links, form entry and submission, validation of table contents, and other
         typical business web application features. This code try to stay independent of the libraries behind
         the scenes. The simple navigation methods and ready-to-use assertions allow for
-        more rapid test creation than using only JUnit and HttpUnit/HtmlUnit/Jacobie/Selenium. And if you want to switch
+        more rapid test creation than using only JUnit and HttpUnit/HtmlUnit. And if you want to switch
         from HttpUnit to HtmlUnit, no need to rewrite your tests.
     </p>
     <img src="images/jwebunit-architecture.png" alt="JWebUnit architecture"/>

src/site/resources/licenses/Rhino_license.txt

@@ -6,32 +6,67 @@
 	</properties>
 <body class="default">
 <section name="jWebUnit Installation">
-	<subsection name="Download">
+	<subsection name="Using Maven">
 		<p>
-			First download latest stable version of jWebUnit from the <a href="http://sourceforge.net/projects/jwebunit/files">files area</a>
-			and expand to a local directory.
+			If your project use Maven 2, it's very simple. Just add jwebunit maven repository to your pom,
+			and add the plugin you want as dependency:
 		</p>
+		<source>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.compagny.myproject</groupId>
+    <artifactId>myproject</artifactId>
+    <version>0.0.1</version>
+    <description>A wonderful project using jWebUnit</description>
+    <repositories>
+        <repository>
+            <releases />
+            <id>jwebunit-m2-repo-web</id>
+            <name>jWebUnit private repository</name>
+            <url>http://jwebunit.sourceforge.net/m2-repo</url>
+        </repository>
+    </repositories>
+    <dependencies>
+        <dependency>
+            <groupId>net.sourceforge.jwebunit</groupId>
+            <artifactId>jwebunit-htmlunit-plugin</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
+		</source>
+	</subsection>
+	<subsection name="Download">
 		<p>
-			NB : We are currently performing great improvements to jWebUnit. If you want to get the
-			latest, you can either get it from SVN, or download it from our 
-			<a href="http://jwebunit.sourceforge.net/m2-repo-snapshots/net/sourceforge/jwebunit/">private Maven 2 snapshots repository</a>.
+			If you don't want to use Maven, you can download files manually.
+			First download latest stable version of jWebUnit core and the plugin 
+			you want from the <a href="http://sourceforge.net/projects/jwebunit/files">files area</a>
+			and expand to a local directory.
+			You will also need all the dependencies of the plugin you choose. Please consult each
+			plugin page to know what are these dependencies.
 		</p>
 	</subsection>
 	<subsection name="Choose what plugin you want to use">
 		<p>
-			There are currently 4 available plugins (certain are still in development):
+			There are currently 2 available plugins:
 			<ul>
-				<li>HttpUnit: Was the first supported plugin. Javascript support is very basic.</li>
-				<li>HtmlUnit: A real solution if you want better Javascript support.</li>
-				<li>Jacobie: You can run your tests directly in Ms Internet Explorer (Windows Only).</li>
-				<li>Selenium: You can run your tests directly in your favorite browser.</li>
+				<li>HttpUnit: Was the first supported plugin. Javascript support is very basic. Will not be supported in jWebUnit 2.x</li>
+				<li>HtmlUnit: A good choice if you want better Javascript support.</li>
 			</ul>
 		</p>
 	</subsection>
 	<subsection name="Integrate with IDE">
 		<p>
-			The simplest way to manage dependencies is to use Maven 2. If you don't want to
-			migrate to Maven, make sure you add the jwebunit-XXX-plugin (where XXX is the plugin you choose) and jwebunit-core jar files to your classpath in your IDE.
+			The simplest way to manage dependencies is to use Maven 2. If your POM is well
+			configured, just run:
+			<source>mvn eclipse:eclipse</source>
+			This will create the .project and the .classpath for your eclipse project.
+		</p>
+		<p>			
+			If you don't want to migrate to Maven, 
+			make sure you add the jwebunit-XXX-plugin (where XXX is the plugin you choose) and jwebunit-core jar files to your classpath in your IDE.
 			You will also need numerous additionnal dependencies, depending on what plugin you choose.
 			Please refer to each plugin page to know the dependencies they need.
 		</p>

src/site/resources/licenses/httpunit_license.txt

@@ -9,7 +9,7 @@
 <p>
     The QuickStart contains sample code and guidance to get you started with jWebUnit.  To see all
     of the methods available, consult the a <a href="apidocs/index.html">Javadocs</a> - particularly
-    the WebTester class.
+    the WebTestCase class.
 </p>
 <subsection name="Creating a TestCase">
 <p>
@@ -54,10 +54,11 @@ public class ExampleWebTestCase extends WebTestCase {
         super(name);
         setTestingEngineKey(TestingEngineRegistry.TESTING_ENGINE_HTTPUNIT);
         // or setTestingEngineKey(TestingEngineRegistry.TESTING_ENGINE_HTMLUNIT);
-        // or setTestingEngineKey(TestingEngineRegistry.TESTING_ENGINE_JACOBIE);
     }
 }
 </source>
+	NB: If you have only one plugin in your classpath, you don't need to explicitly specify
+	to use it, jWebUnit will find and use it.
 </p>
 </subsection>
 <subsection name="Navigating Your Web Application">
@@ -155,10 +156,13 @@ or
         assertWindowPresent("popupWindow");
     }
 </source>
+
     In the above examples, we are working with submit buttons and form elements by their
     name.  For form elements, it is possible to work with them by label (string followed
     by colon before input element).  Before using this approach, consider that the display
     label may change, but the submission name of the element will probably remain static.
+    DEPRECATED: **WithLabel methods are only supported by httpunit plugin, and it's not a
+    good way to identify form elements, as label can easily be localized.
 <source>
     public void testFormSubmission() {
         beginAt("/form.html");
@@ -270,8 +274,8 @@ or
 <source>
     public void testAgeTable() {
         beginAt("/agePage");
-        ExpectedTable ageTable = new ExpectedTable(new Object[][] {
-            {new ExpectedCell("Age Table", 2},
+        ExpectedTable ageTable = new Table(new Object[][] {
+            {new Cell("Age Table", 2, 1)},
             {"Name", "Age"},
             {"Jim", "30ish"},
             {"Wilkes", "20ish"}