Skip to content
This repository was archived by the owner on Apr 7, 2022. It is now read-only.

Commit 4bfbb3a

Browse files
henryjuhenryju
committed
Removed Clover2 stuff because they don't host their artifacts on Central.
Updated some plugins versions. Updated documentation.
1 parent 89dd5f9 commit 4bfbb3a

4 files changed

Lines changed: 24 additions & 102 deletions

File tree

‎pom.xml‎

Lines changed: 13 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<module>jwebunit-core</module>
2424
<module>jwebunit-commons-tests</module>
2525
<module>jwebunit-htmlunit-plugin</module>
26-
<module>jwebunit-selenium-plugin</module>
26+
<module>jwebunit-selenium-plugin</module>
2727
</modules>
2828
<mailingLists>
2929
<mailingList>
@@ -145,75 +145,27 @@
145145
</license>
146146
</licenses>
147147
<scm>
148-
<connection>scm:svn:https://jwebunit.svn.sourceforge.net/svnroot/jwebunit/trunk</connection>
148+
<connection>scm:svn:http://jwebunit.svn.sourceforge.net/svnroot/jwebunit/trunk</connection>
149149
<developerConnection>scm:svn:https://jwebunit.svn.sourceforge.net/svnroot/jwebunit/trunk</developerConnection>
150-
<url>http://svn.sourceforge.net/viewcvs.cgi/jwebunit/trunk</url>
150+
<url>http://jwebunit.svn.sourceforge.net/viewvc/jwebunit/trunk</url>
151151
</scm>
152152
<organization>
153153
<name>SourceForge</name>
154154
<url>http://sourceforge.net</url>
155155
</organization>
156156
<repositories>
157-
<repository>
158-
<id>Codehaus</id>
159-
<name>Mojo Codehaus Repository</name>
160-
<url>http://repository.codehaus.org/</url>
161-
</repository>
162157
<repository>
163158
<id>selenium</id>
164-
<name>Selenium repository</name>
165-
<url>http://maven.openqa.org/</url>
159+
<name>Selenium release repository</name>
160+
<url>http://archiva.openqa.org/repository/releases/</url>
166161
</repository>
167162
</repositories>
168-
<pluginRepositories>
169-
<pluginRepository>
170-
<id>atlassian-m2-repository</id>
171-
<name>Atlassian Maven 2.x Repository</name>
172-
<url>http://repository.atlassian.com/maven2</url>
173-
</pluginRepository>
174-
</pluginRepositories>
175163
<build>
176164
<plugins>
177-
<plugin>
178-
<groupId>com.atlassian.maven.plugins</groupId>
179-
<artifactId>maven-clover-plugin</artifactId>
180-
<configuration>
181-
<flushPolicy>threaded</flushPolicy>
182-
<flushInterval>100</flushInterval>
183-
<targetPercentage>0%</targetPercentage>
184-
<licenseLocation>
185-
${basedir}/${topDirectoryLocation}/src/test/clover/clover.license
186-
</licenseLocation>
187-
</configuration>
188-
<executions>
189-
<execution>
190-
<id>main</id>
191-
<phase>verify</phase>
192-
<goals>
193-
<goal>instrument</goal>
194-
<goal>aggregate</goal>
195-
<goal>check</goal>
196-
<goal>log</goal>
197-
</goals>
198-
</execution>
199-
<execution>
200-
<id>site</id>
201-
<phase>pre-site</phase>
202-
<goals>
203-
<goal>instrument</goal>
204-
<goal>aggregate</goal>
205-
206-
<!-- We save a history point in order to have data to generate a historical report -->
207-
<goal>save-history</goal>
208-
209-
</goals>
210-
</execution>
211-
</executions>
212-
</plugin>
213165
<plugin>
214166
<groupId>org.apache.maven.plugins</groupId>
215167
<artifactId>maven-assembly-plugin</artifactId>
216-
<version>2.2-beta-1</version>
168+
<version>2.2-beta-2</version>
217169
<configuration>
218170
<attach>false</attach>
219171
<descriptors>
@@ -238,13 +190,14 @@
238190
<artifactId>maven-eclipse-plugin</artifactId>
239191
<configuration>
240192
<downloadSources>true</downloadSources>
193+
<downloadJavadoc>true</downloadJavadoc>
241194
</configuration>
242195
</plugin>
243196
<plugin>
244197
<inherited>true</inherited>
245198
<groupId>org.codehaus.mojo</groupId>
246199
<artifactId>javacc-maven-plugin</artifactId>
247-
<version>2.3-SNAPSHOT</version>
200+
<version>2.4</version>
248201
</plugin>
249202
<plugin>
250203
<inherited>true</inherited>
@@ -256,7 +209,7 @@
256209
<inherited>true</inherited>
257210
<groupId>org.apache.maven.plugins</groupId>
258211
<artifactId>maven-javadoc-plugin</artifactId>
259-
<version>2.3</version>
212+
<version>2.4</version>
260213
</plugin>
261214
</plugins>
262215
</pluginManagement>
@@ -279,7 +232,7 @@
279232
<dependency>
280233
<groupId>org.mortbay.jetty</groupId>
281234
<artifactId>jetty</artifactId>
282-
<version>6.1.6</version>
235+
<version>6.1.9</version>
283236
</dependency>
284237
<dependency>
285238
<groupId>commons-fileupload</groupId>
@@ -299,7 +252,7 @@
299252
<dependency>
300253
<groupId>org.openqa.selenium.client-drivers</groupId>
301254
<artifactId>selenium-java-client-driver</artifactId>
302-
<version>0.9.2</version>
255+
<version>1.0-beta-1</version>
303256
</dependency>
304257
<dependency>
305258
<groupId>regexp</groupId>
@@ -314,12 +267,12 @@
314267
<dependency>
315268
<groupId>org.slf4j</groupId>
316269
<artifactId>slf4j-api</artifactId>
317-
<version>1.3.0</version>
270+
<version>1.5.0</version>
318271
</dependency>
319272
<dependency>
320273
<groupId>org.slf4j</groupId>
321274
<artifactId>slf4j-log4j12</artifactId>
322-
<version>1.3.0</version>
275+
<version>1.5.0</version>
323276
<scope>optional</scope>
324277
</dependency>
325278
</dependencies>
@@ -351,16 +304,6 @@
351304
<groupId>org.codehaus.mojo</groupId>
352305
<artifactId>taglist-maven-plugin</artifactId>
353306
</plugin>
354-
<plugin>
355-
<groupId>com.atlassian.maven.plugins</groupId>
356-
<artifactId>maven-clover-plugin</artifactId>
357-
<configuration>
358-
<generateHistorical>true</generateHistorical>
359-
<licenseLocation>
360-
${basedir}/${topDirectoryLocation}/src/test/clover/clover.license
361-
</licenseLocation>
362-
</configuration>
363-
</plugin>
364307
<plugin>
365308
<groupId>org.apache.maven.plugins</groupId>
366309
<artifactId>maven-changes-plugin</artifactId>

‎src/site/xdoc/building-maven.xml‎

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
First you need to download the latest Maven 2, which
2424
currently is
2525
<a href="http://maven.apache.org">
26-
<tt>Maven-2.0.8</tt>
26+
<tt>Maven-2.0.9</tt>
2727
</a>
2828
, make sure you download the binary archive
29-
(e.g. apache-maven-2.0.8-bin.tar.bz2).
29+
(e.g. apache-maven-2.0.9-bin.tar.bz2).
3030
</p>
3131
<p>
3232
Installing Maven should be easy: unzip the file to
3333
any directory you like, let's say:
34-
<source>/opt/apache-maven-2.0.8</source>
34+
<source>/opt/apache-maven-2.0.9</source>
3535
</p>
3636
<p>
3737
Next you need to do 2 things:
@@ -70,29 +70,6 @@
7070
plugins that are available.
7171
</p>
7272
</subsection>
73-
<subsection
74-
name="Installing not released or snapshot plugins">
75-
<p>
76-
JWebUnit needs some tweak to
77-
build properly under Microsoft Windows.
78-
</p>
79-
<ul>
80-
<li>
81-
javacc-maven-plugin 2.3-SNAPSHOT because of this
82-
<a
83-
href="http://jira.codehaus.org/browse/MJAVACC-29">
84-
issue
85-
</a>
86-
</li>
87-
</ul>
88-
<p>
89-
Windows users will have to checkout sources of javacc-maven-plugin then
90-
apply patch proposed in MJAVACC-29 then build the plugin (should be 2.3-SNAPSHOT)
91-
then alter JWebUnit pom.xml to use your local version.
92-
You can vote for these issues or spam
93-
the Maven mailing list to help. ;)
94-
</p>
95-
</subsection>
9673
<subsection name="Building JWebUnit">
9774
<p>
9875
Building JWebUnit merely consist of running Maven:
@@ -116,7 +93,7 @@
11693
Due to findbugs memory usage, following parameter is required:
11794
<source>export MAVEN_OPTS=-Xmx384M</source>
11895
Now you should be able to generate site:
119-
<source>mvn site:site</source>
96+
<source>mvn site</source>
12097
</p>
12198
<p>The files are in target/site directory of each module.<br/>
12299
If you want to test the final assembled site, just hit:</p>
@@ -125,4 +102,4 @@
125102
</subsection>
126103
</section>
127104
</body>
128-
</document>
105+
</document>

‎src/site/xdoc/index.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<body>
1212
<section name="Welcome">
1313
<p>
14-
You are on the JWebUnit 1.x website. Current version is 1.4. This is
14+
You are on the JWebUnit 1.x website. Current version is 1.5. This is
1515
the "stable" version of JWebUnit. You can also consult <a href="2.x/index.html">JWebUnit 2.x website</a>.
1616
</p>
1717
</section>
@@ -20,6 +20,7 @@
2020
JWebUnit is a Java framework that facilitates creation of acceptance tests for web applications. It
2121
evolved from a project where we were using <a href="http://www.junit.org">JUnit</a> to create acceptance tests.
2222
Also, we can have different testing engines. Currently, only <a href="jwebunit-htmlunit-plugin/index.html">HtmlUnit plugin</a> is ready.
23+
Some work is in progress to use Selenium to execute tests.
2324
As the tests were being written, they were continuously refactored to remove duplication and other bad smells in the test
2425
code. JWebUnit is the result of these refactorings.
2526
</p>

‎src/site/xdoc/installation.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>net.sourceforge.jwebunit</groupId>
2424
<artifactId>jwebunit-htmlunit-plugin</artifactId>
25-
<version>1.4</version>
25+
<version>1.5</version>
2626
<scope>test</scope>
2727
</dependency>
2828
</dependencies>
@@ -38,9 +38,10 @@
3838
</subsection>
3939
<subsection name="Choose what plugin you want to use">
4040
<p>
41-
There are currently 1 available plugin:
41+
There are currently 2 available plugins:
4242
<ul>
4343
<li>HtmlUnit: A good choice if you want rapidity and good Javascript support.</li>
44+
<li>Selenium: BETA quality (not all the JWebUnit API could be executed with Selenium)</li>
4445
</ul>
4546
</p>
4647
</subsection>
@@ -53,7 +54,7 @@
5354
</p>
5455
<p>
5556
If you don't want to migrate to Maven,
56-
make sure you add the jwebunit-htmlunit-plugin-1.3.jar, jwebunit-core-1.3.jar and all HtmlUnit dependencies
57+
make sure you add the jwebunit-htmlunit-plugin-XX.jar, jwebunit-core-XX.jar and all HtmlUnit dependencies
5758
(these files are in lib/ folder of the JWebUnit package) to your classpath in your IDE.
5859
</p>
5960
</subsection>

0 commit comments

Comments
 (0)