diff --git a/cactus/xdocs/features.xml b/cactus/xdocs/features.xml index 5b7f3749..0d1657a3 100644 --- a/cactus/xdocs/features.xml +++ b/cactus/xdocs/features.xml @@ -10,40 +10,8 @@
diff --git a/cactus/xdocs/goals.xml b/cactus/xdocs/goals.xml index 6555bbc0..f274ed17 100644 --- a/cactus/xdocs/goals.xml +++ b/cactus/xdocs/goals.xml @@ -8,44 +8,11 @@ - cactus:compile - Compile Cactus tests - - - cactus:generate - Generate HTML report - - - cactus:init - Creates objects useful for several goals - - - cactus:merge-webxml - Generate a web.xml which is the merge betweem the user project web.xml and the webapp elements needed by Cactus - - - cactus:single - Execute a single test defined using the 'testcase' variable - - - cactus:test-init - Test initialization - - - cactus:test-swing - Start the tests using the swing runner - - - cactus:test-text - Start the tests using the text runner - - - cactus:webapp - Create the Cactus webapp - - - cactus:webapp-update - Generate an expanded Cactus webapp from a project expanded webapp + cactus:test + + Run the Cactus tests on the containers for which you have defined + a cactus.home.[container name] property. + diff --git a/cactus/xdocs/index.xml b/cactus/xdocs/index.xml index ba7e63b4..1ccaa20f 100644 --- a/cactus/xdocs/index.xml +++ b/cactus/xdocs/index.xml @@ -54,11 +54,6 @@ Then, you should read the Quick Start page which provides details about how to use the plugin.

-

- A sample application using Cactus is packaged within the Cactus plugin. - Go to where you installed Maven and look into the - plugins/maven-cactus-plugin-*/sample directory. -

The latest changes are available here.

diff --git a/cactus/xdocs/properties.xml b/cactus/xdocs/properties.xml index 41044b16..9dfc90e4 100644 --- a/cactus/xdocs/properties.xml +++ b/cactus/xdocs/properties.xml @@ -14,148 +14,77 @@ Description - maven.cactus.test.fileset.exclude - Yes + cactus.home.[container name] + At least one container -

Default value is - - .

+

+ Home directory of where you have installed the container on + which you wish to run the Cactus tests. Valid container + names are: tomcat4x, resin2x, + orion1x, weblogic6x, + weblogic7x and jboss3x. +

- maven.cactus.testrunner.swing.excluded + cactus.src.dir Yes -

Default value is - ${plugin.dir}/conf/excluded.properties.

+

+ Location of the Cactus test cases. Default value is + src/test-cactus. +

- maven.cactus.build.dir + cactus.port Yes -

Default value is - ${maven.build.dir}/cactus.

+

+ Port on which to start the containers. Default value is + 8080. +

- maven.cactus.src.dir + cactus.target.dir Yes -

Default value is - src/test-cactus.

+

+ Location where the plugins puts temporary build-generated + files. Default value is ${maven.build.dir}. +

- maven.cactus.classes.dir + cactus.src.includes Yes -

Default value is - ${maven.cactus.build.dir}/classes.

+

+ Lists of test classes that will be executed. Default value is + **/*Test*.java. +

- maven.cactus.scripts.dir + cactus.src.excludes Yes -

Default value is - ${plugin.dir}/scripts.

+

+ Lists of classes that will be excluded in the tests. Default + value is **/AllTests.java,**/Test*All.java. +

- maven.cactus.webxml.dvsl + cactus.context Yes -

Default value is - ${plugin.dir}/conf/web.xml.dvsl.

- - - - maven.cactus.test.reportsDirectory - Yes - -

Default value is - ${maven.cactus.build.dir}/test-reports.

- - - - maven.cactus.build.resources.dir - Yes - -

Default value is - ${maven.cactus.build.dir}/resources.

- - - - maven.cactus.jspRedirector - Yes - -

Default value is - ${plugin.dir}/conf/web/jspRedirector.jsp.

- - - - maven.cactus.configFile - Yes - -

Default value is - ${plugin.dir}/conf/cactus.properties.

- - - - maven.cactus.junit.usefile - Yes - -

Default value is - true.

- - - - maven.cactus.test.fileset.include - Yes - -

Default value is - **/*.class.

- - - - maven.cactus.prewar.dir - Yes - -

Default value is - ${maven.war.build.dir}.

- - - - maven.cactus.emptywebxml - Yes - -

Default value is - ${plugin.dir}/conf/web.xml.

- - - - maven.cactus.port - Yes - -

Default value is - 8080.

- - - - maven.cactus.conf.containers.dir - Yes - -

Default value is - ${plugin.dir}/conf/containers.

- - - - maven.cactus.testrunner - Yes - -

Default value is - text.

+

+ Name of the webapp context under which the application will be + deployed for executing the Cactus tests. Default + value is cactustest. +

diff --git a/cactus/xdocs/tasks.xml b/cactus/xdocs/tasks.xml index a1e3f6d4..a39557cc 100644 --- a/cactus/xdocs/tasks.xml +++ b/cactus/xdocs/tasks.xml @@ -14,35 +14,6 @@

-

diff --git a/cactus/xdocs/using.xml b/cactus/xdocs/using.xml index 2b6a2010..d8dd6333 100644 --- a/cactus/xdocs/using.xml +++ b/cactus/xdocs/using.xml @@ -13,7 +13,7 @@ Create a src/test-cactus directory in your project and put your Cactus test classes in it (with the normal package directory structure). Note that the location of the Cactus test sources can be - configured through the maven.cactus.src.dir property. + configured through the cactus.src.dir property.
  • Create a build.properties file in your project root @@ -24,44 +24,16 @@
  • - Call the - War - plugin's goals to generate a war for your webapp. For example: - maven war. Note that in the future you would also be - able to call the Ear plugin if your application is an EAR. -
    • -
  • - Then, simply run the Cactus goal for your container. For example, - type maven cactus:test-tomcat-4x to run the tests with - Tomcat 4.x. You can type maven -g for a full list of the - available goals. -
    • -
  • - If you wish to generate Cactus HTML test reports, type - maven cactus:generate site. + Then, simply type maven cactus:test to run the Cactus + tests.
    • -

    - The plugin will automatically add what is needed for the Cactus tests - to your application WAR/webapp by repackaging it. In detail, it will - add the Cactus test classes, Cactus configuration files and Cactus jars - to your WAR/webapp. It will then deploy it, configure the container you - have chosen, start it, run the Cactus tests and stop the container. -

    -

    - It is possible (and recommended for performance reasons) to run all the - goals in one Maven invocation. For example: - maven war cactus:test-tomcat-4x cactus:generate site. You - can also put that sequence in your project's maven.xml - file. -

    -