Revision: 821
          http://jwebunit.svn.sourceforge.net/jwebunit/?rev=821&view=rev
Author:   henryju
Date:     2010-02-24 13:35:53 +0000 (Wed, 24 Feb 2010)

Log Message:
-----------
Updated build and release documentation. Some plugin updates for Maven 3 (site 
is still not supported so the release will be done with Maven 2.2.1).

Modified Paths:
--------------
    trunk/pom.xml
    trunk/src/site/xdoc/building-maven.xml
    trunk/src/site/xdoc/how-to-release.xml
    trunk/src/site/xdoc/installation.xml

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml       2010-02-10 09:29:00 UTC (rev 820)
+++ trunk/pom.xml       2010-02-24 13:35:53 UTC (rev 821)
@@ -213,7 +213,7 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-release-plugin</artifactId>
-                               <version>2.0-beta-9</version>
+                               <version>2.0</version>
                                <configuration>
                                        
<autoVersionSubmodules>true</autoVersionSubmodules>
                                        <preparationGoals>clean 
install</preparationGoals>
@@ -222,12 +222,33 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-compiler-plugin</artifactId>
-                               <version>2.0.2</version>
+                               <version>2.1</version>
                                <configuration>
                                        <source>1.5</source>
                                        <target>1.5</target>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-toolchains-plugin</artifactId>
+                               <version>1.0</version>
+                               <executions>
+                                       <execution>
+                                               <phase>validate</phase>
+                                               <goals>
+                                                       <goal>toolchain</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                               <configuration>
+                                       <toolchains>
+                                               <jdk>
+                                                       <version>1.5</version>
+                                                       <vendor>sun</vendor>
+                                               </jdk>
+                                       </toolchains>
+                               </configuration>
+                       </plugin>
                </plugins>
                <pluginManagement>
                        <plugins>
@@ -247,7 +268,7 @@
                                        <inherited>true</inherited>
                                        
<groupId>org.apache.maven.plugins</groupId>
                                        
<artifactId>maven-site-plugin</artifactId>
-                                       <version>2.0-beta-7</version>
+                                       <version>2.1</version>
                                </plugin>
                        </plugins>
                </pluginManagement>

Modified: trunk/src/site/xdoc/building-maven.xml
===================================================================
--- trunk/src/site/xdoc/building-maven.xml      2010-02-10 09:29:00 UTC (rev 
820)
+++ trunk/src/site/xdoc/building-maven.xml      2010-02-24 13:35:53 UTC (rev 
821)
@@ -18,20 +18,30 @@
                 difficult than installing ant. We've included a best
                 practise installation and configuration for Maven.
             </p>
+            <subsection name="Installing Sun JDK 1.5">
+                <p>
+                    JWebUnit is compiled with JDK 1.5 to ensure compatibility.
+                </p>
+                <p>
+                    You need to download and install latest Sun JDK 1.5 for 
your platform. 
+                    Let's say the JDK location is: 
+                    <source>/opt/jdk1.5.0_15</source>
+                </p>
+            </subsection>
             <subsection name="Installing Maven">
                 <p>
                     First you need to download the latest Maven 2, which
                     currently is
                     <a href="http://maven.apache.org";>
-                        <tt>Maven-2.0.9</tt>
+                        <tt>Maven-2.2.1</tt>
                     </a>
                     , make sure you download the binary archive
-                    (e.g. apache-maven-2.0.9-bin.tar.bz2).
+                    (e.g. apache-maven-2.2.1-bin.tar.bz2).
                 </p>
                 <p>
                     Installing Maven should be easy: unzip the file to
                     any directory you like, let's say:
-                    <source>/opt/apache-maven-2.0.9</source>
+                    <source>/opt/apache-maven-2.2.1</source>
                 </p>
                 <p>
                     Next you need to do 2 things:
@@ -39,7 +49,7 @@
                         <li>
                             add an environment variable MAVEN_HOME which
                             points to the install directory of Maven,
-                            i.e. /opt/apache-maven-2.0.9
+                            i.e. /opt/apache-maven-2.2.1
                         </li>
                         <li>
                             add
@@ -50,7 +60,39 @@
                         </li>
                     </ul>
                 </p>
+                <p>
+                    You can test that Maven is correctly installed by running 
in a shell:
+                    <tt>mvn -v</tt>
+                </p>
             </subsection>
+            <subsection name="Configure Maven toolchains">
+                <p>
+                    You can run Maven with any JDK (let's say JDK 1.6) but 
JWebUnit should be compiled
+                    with JDK 1.5. To achieve this we are using Maven 
toolchains mecanism.
+                </p>
+                <p>
+                    Create a file <tt>~/.m2/toolchains.xml</tt> with the given 
content:                    
+                </p>
+                <source><![CDATA[
+<?xml version="1.0" encoding="UTF8"?>
+<toolchains>
+  <toolchain>
+     <type>jdk</type>
+     <provides>
+         <version>1.5</version>
+         <vendor>sun</vendor>
+         <id>1.5</id>
+     </provides>
+     <configuration>
+        <jdkHome>/opt/jdk1.5.0_15</jdkHome>
+     </configuration>
+  </toolchain>
+</toolchains>]]>                
+                </source>
+                <p>
+                    You should of course define the correct jdkHome for you.   
                 
+                </p>
+            </subsection>
             <subsection name="Using Maven">
                 <p>
                     Maven defines several goals, for creating and
@@ -95,17 +137,8 @@
                 <p>
                        If you are using the <a 
href="http://www.eclipse.org";>Eclipse IDE</a>
                        to develop the JWebUnit plugin,
-                       you can use Maven to create the classpath and .project 
files
-                       of each module:
-                       <source>mvn eclipse:eclipse</source>
-                       (This command will also download the attached source 
files of the
-                       dependencies.)
+                       you can use <a 
href="http://m2eclipse.sonatype.org/";>m2eclipse</a>.
                 </p>
-                <p>
-                       You can then import these modules into your Eclipse 
workspace once
-                       you configure the path to your Maven repository:
-                       <source>M2_REPO=your_home/.m2/repository</source>
-                </p>
             </subsection>
             <subsection name="Building Sourceforge upload bundle">
                 <p>

Modified: trunk/src/site/xdoc/how-to-release.xml
===================================================================
--- trunk/src/site/xdoc/how-to-release.xml      2010-02-10 09:29:00 UTC (rev 
820)
+++ trunk/src/site/xdoc/how-to-release.xml      2010-02-24 13:35:53 UTC (rev 
821)
@@ -15,6 +15,7 @@
                                <li>Ensure you repository is up to date by 
running: <tt>svn update</tt></li>
                                <li>Edit <tt>src/changes/changes.xml</tt> to 
set release date instead of "unknow"</li>
                                <li>Update readme.txt (at least update the 
version number)</li>
+                               <li>Update JWebUnit latest version in 
src/site/xdoc/index.xml</li>
                                <li>Commit the changes</li>
                        </ul>
                 </p>
@@ -36,13 +37,6 @@
 ]]></source>
                     Don't forget to put your own sourceforge account and 
password.
                 </p>
-                <p>
-                    Last operation is to ensure you are running the correct 
JDK for building JWebUnit. Currently it is JDK 1.5.
-                    <source>
-$ mvn -v                    
-Maven version: 2.0.9
-<b>Java version: 1.5.0_15</b></source>
-                </p>
             </subsection>
             <subsection name="Preparing the release (tag and update pom)">
                 <p>
@@ -60,7 +54,12 @@
             <subsection name="Perform the release (deploy artifacts and site)">
                 <p>
                        First you need to activate a time-limited shell in 
Sourceforge to allow upload by SCP.
+                       On Linux you can use:
                        <source>ssh henryju,[email protected] 
create</source>
+                       On Windows you can use:
+                       <source>plink henryju,[email protected] 
create</source>
+                </p>
+                       <p>
                     Now the process is done by maven-release-plugin.
                     <source>mvn release:perform</source>
                 </p>
@@ -71,7 +70,8 @@
                 </p>
                 <p>
                        Now close your Sourceforge shell:
-                       <source>ssh henryju,[email protected] 
shutdown</source>
+                       <source>ssh henryju,[email protected] 
shutdown</source> (Linux)
+                       <source>plink henryju,[email protected] 
shutdown</source> (Windows)
                 </p>
             </subsection>
             <subsection name="Dealing with non-maven bundle">

Modified: trunk/src/site/xdoc/installation.xml
===================================================================
--- trunk/src/site/xdoc/installation.xml        2010-02-10 09:29:00 UTC (rev 
820)
+++ trunk/src/site/xdoc/installation.xml        2010-02-24 13:35:53 UTC (rev 
821)
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>net.sourceforge.jwebunit</groupId>
             <artifactId>jwebunit-htmlunit-plugin</artifactId>
-            <version>1.5</version>
+            <version>2.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -40,20 +40,17 @@
                <p>
                        There are currently 2 available plugins:
                        <ul>
-                               <li>HtmlUnit: A good choice if you want 
rapidity and good Javascript support.</li>
+                               <li>HtmlUnit: A good choice if you want fast 
tests and good Javascript support.</li>
                                <li>Selenium: BETA quality (not all the 
JWebUnit API could be executed with Selenium)</li>
                        </ul>
                </p>
        </subsection>
        <subsection name="Integrate with IDE">
                <p>
-                       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.
+                       The simplest way to manage dependencies in Eclipse when 
you use Maven 2 is to use m2eclipse plugin.
                </p>
                <p>                     
-                       If you don't want to migrate to Maven, 
+                       If you don't want to use Maven, 
                        make sure you add the jwebunit-htmlunit-plugin-XX.jar, 
jwebunit-core-XX.jar and all HtmlUnit dependencies
 (these files are in lib/ folder of the JWebUnit package) to your classpath in 
your IDE.
                </p>


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
JWebUnit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development

Reply via email to